colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-03-07 Dan Williams <dcbw@redhat.com>

Browse Source 
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'



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3393 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-03-07 23:17:48 +00:00
parent de35ef09c8
commit bf974b6aa4
8 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@@ -1,3 +1,28 @@
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'
2008-03-07 Dan Williams <dcbw@redhat.com> 2008-03-07 Dan Williams <dcbw@redhat.com>
First pass of multiple active device support. Expect bugs. First pass of multiple active device support. Expect bugs.

13
introspection/nm-manager.xml
View File

@@ -107,7 +107,7 @@
</tp:docstring> </tp:docstring>
</property> </property>
<signal name="StateChange"> <signal name="StateChanged">
<tp:docstring> <tp:docstring>
NetworkManager's state changed. NetworkManager's state changed.
</tp:docstring> </tp:docstring>
@@ -210,6 +210,17 @@
<!-- Legacy methods to maintain backwards compatibility for 0.6 branch. --> <!-- 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"> <method name="sleep">
<tp:docstring> <tp:docstring>
DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated.

20
libnm-glib/nm-client.c
View File

@@ -41,7 +41,7 @@ enum {
MANAGER_RUNNING, MANAGER_RUNNING,
DEVICE_ADDED, DEVICE_ADDED,
DEVICE_REMOVED, DEVICE_REMOVED,
STATE_CHANGE, STATE_CHANGED,
LAST_SIGNAL LAST_SIGNAL
}; };
@@ -54,7 +54,7 @@ static void proxy_name_owner_changed (DBusGProxy *proxy,
const char *new_owner, const char *new_owner,
gpointer user_data); 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_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data);
static void client_device_removed_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 @@ constructor (GType type,
nm_object_get_path (object), nm_object_get_path (object),
NM_DBUS_INTERFACE); 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, dbus_g_proxy_connect_signal (priv->client_proxy,
"StateChange", "StateChanged",
G_CALLBACK (client_state_change_proxy), G_CALLBACK (client_state_changed_proxy),
object, object,
NULL); NULL);
@@ -299,11 +299,11 @@ nm_client_class_init (NMClientClass *client_class)
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_OBJECT); G_TYPE_OBJECT);
signals[STATE_CHANGE] = signals[STATE_CHANGED] =
g_signal_new ("state-change", g_signal_new ("state-changed",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMClientClass, state_change), G_STRUCT_OFFSET (NMClientClass, state_changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT, g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
@@ -358,14 +358,14 @@ proxy_name_owner_changed (DBusGProxy *proxy,
} }
static void 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); NMClient *client = NM_CLIENT (user_data);
NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client); NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
if (priv->state != state) { if (priv->state != state) {
priv->state = state; priv->state = state;
g_signal_emit (client, signals[STATE_CHANGE], 0, state); g_signal_emit (client, signals[STATE_CHANGED], 0, state);
} }
} }

2
libnm-glib/nm-client.h
View File

@@ -33,7 +33,7 @@ typedef struct {
void (*manager_running) (NMClient *client, gboolean running); void (*manager_running) (NMClient *client, gboolean running);
void (*device_added) (NMClient *client, NMDevice *device); void (*device_added) (NMClient *client, NMDevice *device);
void (*device_removed) (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; } NMClientClass;
GType nm_client_get_type (void); GType nm_client_get_type (void);

2
src/NetworkManagerPolicy.c
View File

@@ -469,7 +469,7 @@ nm_policy_new (NMManager *manager)
policy->manager = g_object_ref (manager); policy->manager = g_object_ref (manager);
policy->update_state_id = 0; 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); G_CALLBACK (global_state_changed), policy);
policy->signal_ids = g_slist_append (policy->signal_ids, (gpointer) id); policy->signal_ids = g_slist_append (policy->signal_ids, (gpointer) id);

2
src/nm-hal-manager.c
View File

@@ -748,7 +748,7 @@ nm_hal_manager_new (NMManager *nm_manager)
manager); manager);
g_signal_connect (nm_manager, g_signal_connect (nm_manager,
"state-change", "state-changed",
G_CALLBACK (nm_manager_state_changed), G_CALLBACK (nm_manager_state_changed),
manager); manager);

23
src/nm-manager.c
View File

@@ -83,7 +83,8 @@ G_DEFINE_TYPE (NMManager, nm_manager, G_TYPE_OBJECT)
enum { enum {
DEVICE_ADDED, DEVICE_ADDED,
DEVICE_REMOVED, DEVICE_REMOVED,
STATE_CHANGE, STATE_CHANGED,
STATE_CHANGE, /* DEPRECATED */
PROPERTIES_CHANGED, PROPERTIES_CHANGED,
CONNECTIONS_ADDED, CONNECTIONS_ADDED,
CONNECTION_ADDED, CONNECTION_ADDED,
@@ -214,6 +215,9 @@ nm_manager_update_state (NMManager *manager)
if (priv->state != new_state) { if (priv->state != new_state) {
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); g_signal_emit (manager, signals[STATE_CHANGE], 0, priv->state);
} }
} }
@@ -365,11 +369,11 @@ nm_manager_class_init (NMManagerClass *manager_class)
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_OBJECT); G_TYPE_OBJECT);
signals[STATE_CHANGE] = signals[STATE_CHANGED] =
g_signal_new ("state-change", g_signal_new ("state-changed",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMManagerClass, state_change), G_STRUCT_OFFSET (NMManagerClass, state_changed),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT, g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
@@ -419,6 +423,17 @@ nm_manager_class_init (NMManagerClass *manager_class)
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_OBJECT, G_TYPE_UINT); 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_g_object_type_install_info (G_TYPE_FROM_CLASS (manager_class),
&dbus_glib_nm_manager_object_info); &dbus_glib_nm_manager_object_info);

2
src/nm-manager.h
View File

@@ -31,7 +31,7 @@ typedef struct {
/* Signals */ /* Signals */
void (*device_added) (NMManager *manager, NMDevice *device); void (*device_added) (NMManager *manager, NMDevice *device);
void (*device_removed) (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 (*properties_changed) (NMManager *manager, GHashTable *properties);
void (*connections_added) (NMManager *manager, NMConnectionScope scope); void (*connections_added) (NMManager *manager, NMConnectionScope scope);