NetworkManager r3393 - in trunk: . introspection libnm-glib src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Mar  7 23:17:48 2008
New Revision: 3393
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3393&view=rev

Log:
2008-03-07  Dan Williams  <dcbw redhat com>

	Change manager's StateChange signal to StateChanged for consistency.

	* introspection/nm-manager.xml
		- Add 'StateChanged' signal
		- Move 'StateChange' down to the deprecated section

	* src/nm-hal-manager.c
		- (nm_hal_manager_new): connect to 'state-changed' instead

	* src/NetworkManagerPolicy.c
		- (nm_policy_new): connect to 'state-changed' instead

	* src/nm-manager.c
	  src/nm-manager.h
		- (nm_manager_update_state): emit both 'state-changed' and 'state-change'
		- (nm_manager_class_init): add 'state-changed' and not the deprecation
			of 'state-change'

	* libnm-glib/nm-client.c
	  libnm-glib/nm-client.h
		- (constructor, nm_client_class_init, client_state_changed_proxy):
			track and proxy 'state-changed' instead of 'state-change'



Modified:
   trunk/ChangeLog
   trunk/introspection/nm-manager.xml
   trunk/libnm-glib/nm-client.c
   trunk/libnm-glib/nm-client.h
   trunk/src/NetworkManagerPolicy.c
   trunk/src/nm-hal-manager.c
   trunk/src/nm-manager.c
   trunk/src/nm-manager.h

Modified: trunk/introspection/nm-manager.xml
==============================================================================
--- trunk/introspection/nm-manager.xml	(original)
+++ trunk/introspection/nm-manager.xml	Fri Mar  7 23:17:48 2008
@@ -107,7 +107,7 @@
       </tp:docstring>
     </property>
 
-    <signal name="StateChange">
+    <signal name="StateChanged">
       <tp:docstring>
         NetworkManager's state changed.
       </tp:docstring>
@@ -210,6 +210,17 @@
 
     <!-- Legacy methods to maintain backwards compatibility for 0.6 branch. -->
 
+    <signal name="StateChange">
+      <tp:docstring>
+        DEPRECATED.  NetworkManager's state changed.  Use the 'StateChanged' signal instead.
+      </tp:docstring>
+      <arg name="state" type="u" tp:type="NM_STATE">
+        <tp:docstring>
+          The new state of NetworkManager.
+        </tp:docstring>
+      </arg>
+    </signal>
+
     <method name="sleep">
       <tp:docstring>
         DEPRECATED.  Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.

Modified: trunk/libnm-glib/nm-client.c
==============================================================================
--- trunk/libnm-glib/nm-client.c	(original)
+++ trunk/libnm-glib/nm-client.c	Fri Mar  7 23:17:48 2008
@@ -41,7 +41,7 @@
 	MANAGER_RUNNING,
 	DEVICE_ADDED,
 	DEVICE_REMOVED,
-	STATE_CHANGE,
+	STATE_CHANGED,
 
 	LAST_SIGNAL
 };
@@ -54,7 +54,7 @@
 									  const char *new_owner,
 									  gpointer user_data);
 
-static void client_state_change_proxy (DBusGProxy *proxy, guint state, gpointer user_data);
+static void client_state_changed_proxy (DBusGProxy *proxy, guint state, gpointer user_data);
 static void client_device_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data);
 static void client_device_removed_proxy (DBusGProxy *proxy, char *path, gpointer user_data);
 
@@ -108,10 +108,10 @@
 										   nm_object_get_path (object),
 										   NM_DBUS_INTERFACE);
 
-	dbus_g_proxy_add_signal (priv->client_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+	dbus_g_proxy_add_signal (priv->client_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal (priv->client_proxy,
-						    "StateChange",
-						    G_CALLBACK (client_state_change_proxy),
+						    "StateChanged",
+						    G_CALLBACK (client_state_changed_proxy),
 						    object,
 						    NULL);
 
@@ -299,11 +299,11 @@
 					  G_TYPE_NONE, 1,
 					  G_TYPE_OBJECT);
 
-	signals[STATE_CHANGE] =
-		g_signal_new ("state-change",
+	signals[STATE_CHANGED] =
+		g_signal_new ("state-changed",
 					  G_OBJECT_CLASS_TYPE (object_class),
 					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMClientClass, state_change),
+					  G_STRUCT_OFFSET (NMClientClass, state_changed),
 					  NULL, NULL,
 					  g_cclosure_marshal_VOID__UINT,
 					  G_TYPE_NONE, 1,
@@ -358,14 +358,14 @@
 }
 
 static void
-client_state_change_proxy (DBusGProxy *proxy, guint state, gpointer user_data)
+client_state_changed_proxy (DBusGProxy *proxy, guint state, gpointer user_data)
 {
 	NMClient *client = NM_CLIENT (user_data);
 	NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
 
 	if (priv->state != state) {
 		priv->state = state;
-		g_signal_emit (client, signals[STATE_CHANGE], 0, state);
+		g_signal_emit (client, signals[STATE_CHANGED], 0, state);
 	}
 }
 

Modified: trunk/libnm-glib/nm-client.h
==============================================================================
--- trunk/libnm-glib/nm-client.h	(original)
+++ trunk/libnm-glib/nm-client.h	Fri Mar  7 23:17:48 2008
@@ -33,7 +33,7 @@
 	void (*manager_running) (NMClient *client, gboolean running);
 	void (*device_added) (NMClient *client, NMDevice *device);
 	void (*device_removed) (NMClient *client, NMDevice *device);
-	void (*state_change) (NMClient *client, NMState state);
+	void (*state_changed) (NMClient *client, NMState state);
 } NMClientClass;
 
 GType nm_client_get_type (void);

Modified: trunk/src/NetworkManagerPolicy.c
==============================================================================
--- trunk/src/NetworkManagerPolicy.c	(original)
+++ trunk/src/NetworkManagerPolicy.c	Fri Mar  7 23:17:48 2008
@@ -469,7 +469,7 @@
 	policy->manager = g_object_ref (manager);
 	policy->update_state_id = 0;
 
-	id = g_signal_connect (manager, "state-change",
+	id = g_signal_connect (manager, "state-changed",
 	                       G_CALLBACK (global_state_changed), policy);
 	policy->signal_ids = g_slist_append (policy->signal_ids, (gpointer) id);
 

Modified: trunk/src/nm-hal-manager.c
==============================================================================
--- trunk/src/nm-hal-manager.c	(original)
+++ trunk/src/nm-hal-manager.c	Fri Mar  7 23:17:48 2008
@@ -748,7 +748,7 @@
 	                  manager);
 
 	g_signal_connect (nm_manager,
-					  "state-change",
+					  "state-changed",
 					  G_CALLBACK (nm_manager_state_changed),
 					  manager);
 

Modified: trunk/src/nm-manager.c
==============================================================================
--- trunk/src/nm-manager.c	(original)
+++ trunk/src/nm-manager.c	Fri Mar  7 23:17:48 2008
@@ -83,7 +83,8 @@
 enum {
 	DEVICE_ADDED,
 	DEVICE_REMOVED,
-	STATE_CHANGE,
+	STATE_CHANGED,
+	STATE_CHANGE,  /* DEPRECATED */
 	PROPERTIES_CHANGED,
 	CONNECTIONS_ADDED,
 	CONNECTION_ADDED,
@@ -214,6 +215,9 @@
 
 	if (priv->state != new_state) {
 		priv->state = new_state;
+		g_signal_emit (manager, signals[STATE_CHANGED], 0, priv->state);
+
+		/* Emit StateChange too for backwards compatibility */
 		g_signal_emit (manager, signals[STATE_CHANGE], 0, priv->state);
 	}
 }
@@ -365,11 +369,11 @@
 					  G_TYPE_NONE, 1,
 					  G_TYPE_OBJECT);
 
-	signals[STATE_CHANGE] =
-		g_signal_new ("state-change",
+	signals[STATE_CHANGED] =
+		g_signal_new ("state-changed",
 					  G_OBJECT_CLASS_TYPE (object_class),
 					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMManagerClass, state_change),
+					  G_STRUCT_OFFSET (NMManagerClass, state_changed),
 					  NULL, NULL,
 					  g_cclosure_marshal_VOID__UINT,
 					  G_TYPE_NONE, 1,
@@ -419,6 +423,17 @@
 					  G_TYPE_NONE, 2,
 				    G_TYPE_OBJECT, G_TYPE_UINT);
 
+	/* StateChange is DEPRECATED */
+	signals[STATE_CHANGE] =
+		g_signal_new ("state-change",
+					  G_OBJECT_CLASS_TYPE (object_class),
+					  G_SIGNAL_RUN_FIRST,
+					  0, NULL, NULL,
+					  g_cclosure_marshal_VOID__UINT,
+					  G_TYPE_NONE, 1,
+					  G_TYPE_UINT);
+
+
 	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class),
 									 &dbus_glib_nm_manager_object_info);
 

Modified: trunk/src/nm-manager.h
==============================================================================
--- trunk/src/nm-manager.h	(original)
+++ trunk/src/nm-manager.h	Fri Mar  7 23:17:48 2008
@@ -31,7 +31,7 @@
 	/* Signals */
 	void (*device_added) (NMManager *manager, NMDevice *device);
 	void (*device_removed) (NMManager *manager, NMDevice *device);
-	void (*state_change) (NMManager *manager, guint state);
+	void (*state_changed) (NMManager *manager, guint state);
 	void (*properties_changed) (NMManager *manager, GHashTable *properties);
 
 	void (*connections_added) (NMManager *manager, NMConnectionScope scope);