2005-06-15 Dan Williams <dcbw@redhat.com>

Patches from Robert Love:
	* gnome/applet/wireless-applet.glade
		- Tighten up wording

	* src/NetworkManagerDevice.c
		- Remove misplaced ';'

	* configure.in
	  initscript/Makefile.am
	  initscript/SUSE/Makefile.am
	  initscript/SUSE/networkmanager
		- Add SUSE initscript


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@669 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

ChangeLog

@@ -1,3 +1,18 @@
+2005-06-15  Dan Williams <dcbw@redhat.com>
+
+	Patches from Robert Love:
+	* gnome/applet/wireless-applet.glade
+		- Tighten up wording
+
+	* src/NetworkManagerDevice.c
+		- Remove misplaced ';'
+
+	* configure.in
+	  initscript/Makefile.am
+	  initscript/SUSE/Makefile.am
+	  initscript/SUSE/networkmanager
+		- Add SUSE initscript
+
 2005-06-12  David Zeuthen  <davidz@redhat.com>
 
 	* gnome/vpn-properties/nm-vpn-ui-interface.h: New file

configure.in

@@ -288,6 +288,7 @@ initscript/RedHat/Makefile
 initscript/Gentoo/Makefile
 initscript/Debian/Makefile
 initscript/Slackware/Makefile
+initscript/SUSE/Makefile
 po/Makefile.in
 NetworkManager.pc
 ])

gnome/applet/wireless-applet.glade

@@ -100,7 +100,7 @@
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;larger&quot;&gt;Wireless Network Login Confirmation&lt;/span&gt;
 
-You have chosen log in to the wireless network '%s'.  If you are sure this wireless network is secure, click the checkbox below and NetworkManager will no longer pester you with stupid questions when you connect to it.</property>
+You have chosen to log in to the wireless network '%s'.  If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins.</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>

initscript/Makefile.am

@@ -11,3 +11,6 @@ endif
 if TARGET_SLACKWARE
 SUBDIRS += Slackware
 endif
+if TARGET_SUSE
+SUBDIRS += SUSE
+endif

initscript/SUSE/Makefile.am

@@ -0,0 +1,4 @@
+EXTRA_DIST = networkmanager
+
+initddir = $(sysconfdir)/init.d
+initd_SCRIPTS = networkmanager

initscript/SUSE/networkmanager

@@ -0,0 +1,47 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:       NetworkManager
+# Required-Start: $network $dbus
+# Default-Start:  3 4 5
+# Default-Stop:   0 1 2 6
+# Description: NetworkManager, a network and wireless connection manager
+### END INIT INFO
+
+NETWORKMANAGER_BIN=/opt/gnome/bin/NetworkManager
+test -x $NETWORKMANAGER_BIN || exit 5
+
+. /etc/rc.status
+rc_reset
+
+case "$1" in
+    start)
+        echo -n "Starting the NetworkManager"
+        startproc $NETWORKMANAGER_BIN
+	rc_status -v
+        ;;
+    stop)
+        echo -n "Shutting down the NetworkManager"
+        killproc -TERM $NETWORKMANAGER_BIN
+	rc_status -v
+        ;;
+    restart)
+        $0 stop
+        $0 start
+	rc_status
+        ;;
+    force-reload|reload)
+        echo -n "Reloading the NetworkManager"
+        killproc -HUP $NETWORKMANAGER_BIN
+	rc_status -v
+        ;;
+    status)
+        echo -n "Checking for the NetworkManager: "
+        checkproc $NETWORKMANAGER_BIN
+        rc_status -v
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+        exit 1
+        ;;
+esac
+

src/NetworkManagerDevice.c

@@ -2540,7 +2540,7 @@ static gboolean nm_device_activate_stage2_device_config (NMActRequest *req)
 	nm_info ("Activation (%s) Stage 2 (Device Configure) starting...", nm_device_get_iface (dev));
 
 	/* Bring the device up */
-	if (!nm_device_is_up (dev));
+	if (!nm_device_is_up (dev))
 		nm_device_bring_up (dev);
 
 	if (nm_device_activation_should_cancel (dev))

src/nm-netlink-monitor.c

@@ -612,6 +612,7 @@ nm_netlink_monitor_event_handler (GIOChannel       *channel,
 	 */
 	num_bytes_to_process = (guint) num_received_bytes;
 
+	/* FIXME: This cannot be true */
 	if (num_bytes_to_process < 0)
 		return TRUE;