StateChange -> StateChanged

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@35576 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/nm/E_Nm.h b/src/lib/nm/E_Nm.h
index 223b738..d7f95d6 100644 (file)
--- a/src/lib/nm/E_Nm.h
+++ b/src/lib/nm/E_Nm.h
@@ -121,7 +121,7 @@ struct E_NM_Manager
   uint state;
 };
 
-typedef void (*E_NM_Cb_Manager_State_Change) (void *data, int state);
+typedef void (*E_NM_Cb_Manager_State_Changed) (void *data, int state);
 typedef void (*E_NM_Cb_Manager_Device_Added) (void *data, const char *device);
 typedef void (*E_NM_Cb_Manager_Device_Removed) (void *data, const char *device);
 
@@ -150,7 +150,7 @@ extern "C" {
    EAPI int e_nm_status(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void *data);
 /* signals */
 /* TODO: These have changed! */
-   /* deprecated */EAPI void e_nm_callback_manager_state_change_set(E_NM_Context *ctx, E_NM_Cb_Manager_State_Change cb_func, void *user_data);
+   /* deprecated */EAPI void e_nm_callback_manager_state_changed_set(E_NM_Context *ctx, E_NM_Cb_Manager_State_Changed cb_func, void *user_data);
    /* deprecated */EAPI void e_nm_callback_manager_device_added_set(E_NM_Context *ctx, E_NM_Cb_Manager_Device_Added cb_func, void *user_data);
    /* deprecated */EAPI void e_nm_callback_manager_device_removed_set(E_NM_Context *ctx, E_NM_Cb_Manager_Device_Removed cb_func, void *user_data);
 /* TODO: EAPI void e_nm_callback_device_no_longer_active() */

diff --git a/src/lib/nm/e_nm.c b/src/lib/nm/e_nm.c
index 82da6f1..114e738 100644 (file)
--- a/src/lib/nm/e_nm.c
+++ b/src/lib/nm/e_nm.c
@@ -29,7 +29,7 @@ e_nm_free(E_NM_Context *ctx)
 }
 
 static void
-cb_signal_manager_state_change(void *data, DBusMessage *msg)
+cb_signal_manager_state_changed(void *data, DBusMessage *msg)
 {
   E_NM_Context *ctx;
   dbus_uint32_t state;
@@ -45,8 +45,8 @@ cb_signal_manager_state_change(void *data, DBusMessage *msg)
     return;
   }
 
-  if (ctx->cb_manager_state_change)
-    ctx->cb_manager_state_change(ctx->data_manager_state_change, (int)state);
+  if (ctx->cb_manager_state_changed)
+    ctx->cb_manager_state_changed(ctx->data_manager_state_changed, (int)state);
 }
 
 static void
@@ -93,12 +93,12 @@ cb_signal_manager_device_removed(void *data, DBusMessage *msg)
 
 
 EAPI void
-e_nm_callback_manager_state_change_set(E_NM_Context *ctx, E_NM_Cb_Manager_State_Change cb_func, void *user_data)
+e_nm_callback_manager_state_changed_set(E_NM_Context *ctx, E_NM_Cb_Manager_State_Changed cb_func, void *user_data)
 {
-  ctx->cb_manager_state_change = cb_func;
-  ctx->data_manager_state_change = user_data;
+  ctx->cb_manager_state_changed = cb_func;
+  ctx->data_manager_state_changed = user_data;
 
-  e_dbus_signal_handler_add(ctx->conn, E_NM_SERVICE, E_NM_PATH_NETWORK_MANAGER, E_NM_INTERFACE_NETWORK_MANAGER, "StateChange", cb_signal_manager_state_change, ctx);
+  e_dbus_signal_handler_add(ctx->conn, E_NM_SERVICE, E_NM_PATH_NETWORK_MANAGER, E_NM_INTERFACE_NETWORK_MANAGER, "StateChanged", cb_signal_manager_state_changed, ctx);
 }
 
 EAPI void

diff --git a/src/lib/nm/e_nm_private.h b/src/lib/nm/e_nm_private.h
index b7970c9..98ceabd 100644 (file)
--- a/src/lib/nm/e_nm_private.h
+++ b/src/lib/nm/e_nm_private.h
@@ -22,8 +22,8 @@ struct E_NM_Context
 {
   E_DBus_Connection *conn;
 
-  E_NM_Cb_Manager_State_Change cb_manager_state_change;
-  void *data_manager_state_change;
+  E_NM_Cb_Manager_State_Changed cb_manager_state_changed;
+  void *data_manager_state_changed;
 
   E_NM_Cb_Manager_Device_Added cb_manager_device_added;
   void *data_manager_device_added;