File nm-applet-disconnect-on-exit.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-applet-disconnect-on-exit.patch of Package NetworkManager (Revision 7ca71142064717198964912c9218cc52)

Currently displaying revision 7ca71142064717198964912c9218cc52 , Show latest

diff -urN NetworkManager-0.6.4/gnome/applet/applet.c NetworkManager-new/gnome/applet/applet.c
--- NetworkManager-0.6.4/gnome/applet/applet.c	2006-11-10 13:25:14.000000000 +0200
+++ NetworkManager-new/gnome/applet/applet.c	2006-11-10 13:24:22.000000000 +0200
@@ -1195,6 +1195,48 @@
 }
 
 
+gboolean nma_get_disconnect_wireless_on_exit (NMApplet *applet)
+{
+	GConfValue *value;
+	gboolean ret = FALSE;
+
+	g_return_val_if_fail (applet != NULL, FALSE);
+	g_return_val_if_fail (applet->gconf_client != NULL, FALSE);
+
+	value = gconf_client_get (applet->gconf_client,
+						 GCONF_PATH_PREFS "/disconnect_wireless_on_exit",
+						 NULL);
+
+	if (value)
+	{
+		if (value->type == GCONF_VALUE_BOOL)
+			ret = gconf_value_get_bool (value);
+
+		gconf_value_free (value);
+	}
+
+	return ret;
+}
+
+
+void nma_set_disconnect_wireless_on_exit (NMApplet *applet, gboolean disconnect)
+{
+	gboolean current;
+
+	g_return_if_fail (applet != NULL);
+	g_return_if_fail (applet->gconf_client != NULL);
+
+	current = nma_get_disconnect_wireless_on_exit (applet);
+	if (current != disconnect)
+	{
+		gconf_client_set_bool (applet->gconf_client,
+						   GCONF_PATH_PREFS "/disconnect_wireless_on_exit",
+						   disconnect,
+						   NULL);
+	}
+}
+
+
 /*
  * nma_redraw_timeout
  *
@@ -1984,7 +2026,13 @@
 
 	state = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
 	if (applet->wireless_enabled != state)
+	{
+		gconf_client_set_bool (applet->gconf_client,
+						   GCONF_PATH_PREFS "/wireless_enabled",
+						   state,
+						   NULL);
 		nma_dbus_enable_wireless (applet, state);
+	}
 }
 
 
@@ -1996,7 +2044,13 @@
 
 	state = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
 	if ((applet->nm_state == NM_STATE_ASLEEP && state) || (applet->nm_state != NM_STATE_ASLEEP && !state))
+	{
+		gconf_client_set_bool (applet->gconf_client,
+						   GCONF_PATH_PREFS "/networking_enabled",
+						   state,
+						   NULL);
 		nma_dbus_enable_networking (applet, state);
+	}
 }
 
 
@@ -2574,6 +2628,36 @@
 }
 
 
+static gboolean
+update_network_state (gpointer data)
+{
+	NMApplet *applet = data;
+	GConfValue *value;
+
+	value = gconf_client_get (applet->gconf_client,
+						 GCONF_PATH_PREFS "/networking_enabled",
+						 NULL);
+	if (value)
+	{
+		if (value->type == GCONF_VALUE_BOOL)
+			nma_dbus_enable_networking (applet, gconf_value_get_bool (value));
+		gconf_value_free (value);
+	}
+
+	value = gconf_client_get (applet->gconf_client,
+						 GCONF_PATH_PREFS "/wireless_enabled",
+						 NULL);
+	if (value)
+	{
+		if (value->type == GCONF_VALUE_BOOL)
+			nma_dbus_enable_wireless	(applet, gconf_value_get_bool (value));
+		gconf_value_free (value);
+	}
+
+	return FALSE;
+}
+
+
 /*
  * nma_get_instance
  *
@@ -2645,6 +2729,11 @@
 	if (!applet->connection)
 		nma_start_dbus_connection_watch (applet);
 
+	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+				  update_network_state,
+				  g_object_ref (applet),
+				  (GDestroyNotify) g_object_unref);
+
 	/* Load pixmaps and create applet widgets */
 	nma_setup_widgets (applet);
 
diff -urN NetworkManager-0.6.4/gnome/applet/applet.h NetworkManager-new/gnome/applet/applet.h
--- NetworkManager-0.6.4/gnome/applet/applet.h	2006-11-10 13:25:13.000000000 +0200
+++ NetworkManager-new/gnome/applet/applet.h	2006-11-10 13:18:58.000000000 +0200
@@ -156,6 +156,9 @@
 void				nma_set_running						(NMApplet *applet, gboolean running);
 void				nma_update_state					(NMApplet *applet);
 
+gboolean nma_get_disconnect_wireless_on_exit (NMApplet *applet);
+void nma_set_disconnect_wireless_on_exit (NMApplet *applet, gboolean disconnect);
+
 int				nm_null_safe_strcmp					(const char *s1, const char *s2);
 
 #endif
diff -urN NetworkManager-0.6.4/gnome/applet/main.c NetworkManager-new/gnome/applet/main.c
--- NetworkManager-0.6.4/gnome/applet/main.c	2006-11-10 13:25:14.000000000 +0200
+++ NetworkManager-new/gnome/applet/main.c	2006-11-10 13:18:48.000000000 +0200
@@ -36,7 +36,14 @@
 static void session_die (GnomeClient *client, gpointer client_data)
 {
 	NMApplet *applet = client_data;
+
+	/* Deactivate VPN */
 	nma_dbus_vpn_deactivate_connection (applet->connection);
+
+	/* Deactivate wireless devices if required */
+	if (nma_get_disconnect_wireless_on_exit (applet))
+		nma_dbus_enable_wireless (applet, FALSE);
+
 	gtk_main_quit ();
 }

Places

File nm-applet-disconnect-on-exit.patch of Package NetworkManager (Revision 7ca71142064717198964912c9218cc52)

Places