Simplify.

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

diff --git a/src/lib/nm/e_nm_private.h b/src/lib/nm/e_nm_private.h
index 60a321c..58eca6f 100644 (file)
--- a/src/lib/nm/e_nm_private.h
+++ b/src/lib/nm/e_nm_private.h
@@ -11,14 +11,14 @@
 #define _E_NM_INTERFACE_IP4CONFIG "org.freedesktop.NetworkManager.IP4Config"
 #define _E_NM_INTERFACE_CONNECTION_ACTIVE "org.freedesktop.NetworkManager.Connection.Active"
 #define _E_NMS_PATH "/org/freedesktop/NetworkManagerSettings"
-#define E_NMS_SERVICE_SYSTEM "org.freedesktop.NetworkManagerSystemSettings"
-#define E_NMS_SERVICE_USER "org.freedesktop.NetworkManagerUserSettings"
+#define _E_NMS_SERVICE_SYSTEM "org.freedesktop.NetworkManagerSystemSettings"
+#define _E_NMS_SERVICE_USER "org.freedesktop.NetworkManagerUserSettings"
 #define _E_NMS_INTERFACE "org.freedesktop.NetworkManagerSettings"
 #define _E_NMS_INTERFACE_CONNECTION "org.freedesktop.NetworkManagerSettings.Connection"
 
 #define e_nm_call_new(member) dbus_message_new_method_call(_E_NM_SERVICE, E_NM_PATH, _E_NM_INTERFACE, member)
-#define e_nms_call_new(service, member) dbus_message_new_method_call(service, _E_NMS_PATH, _E_NMS_INTERFACE, member)
-#define e_nms_connection_call_new(service, conn, member) dbus_message_new_method_call(service, conn, _E_NMS_INTERFACE_CONNECTION, member)
+#define e_nms_call_new(ctxt, member) ctxt == E_NMS_CONTEXT_USER ? dbus_message_new_method_call(_E_NMS_SERVICE_USER, _E_NMS_PATH, _E_NMS_INTERFACE, member) : dbus_message_new_method_call(_E_NMS_SERVICE_SYSTEM, _E_NMS_PATH, _E_NMS_INTERFACE, member);
+#define e_nms_connection_call_new(ctxt, conn, member) ctxt == E_NMS_CONTEXT_USER ? dbus_message_new_method_call(_E_NMS_SERVICE_USER, conn, _E_NMS_INTERFACE_CONNECTION, member) : dbus_message_new_method_call(_E_NMS_SERVICE_SYSTEM, conn, _E_NMS_INTERFACE_CONNECTION, member);
 
 #define e_nm_properties_get(con, prop, cb, data) e_dbus_properties_get(con, _E_NM_SERVICE, E_NM_PATH, _E_NM_INTERFACE, prop, (E_DBus_Method_Return_Cb) cb, data)
 #define e_nm_access_point_properties_get(con, dev, prop, cb, data) e_dbus_properties_get(con, _E_NM_SERVICE, dev, _E_NM_INTERFACE_ACCESSPOINT, prop, (E_DBus_Method_Return_Cb) cb, data)
@@ -34,7 +34,7 @@
 #define e_nm_device_wired_signal_handler_add(con, dev, sig, cb, data) e_dbus_signal_handler_add(con, _E_NM_SERVICE, dev, _E_NM_INTERFACE_DEVICE_WIRED, sig, cb, data)
 #define e_nm_device_wireless_signal_handler_add(con, dev, sig, cb, data) e_dbus_signal_handler_add(con, _E_NM_SERVICE, dev, _E_NM_INTERFACE_DEVICE_WIRELESS, sig, cb, data)
 
-#define e_nms_signal_handler_add(con, service, sig, cb, data) e_dbus_signal_handler_add(con, service, _E_NMS_PATH, _E_NMS_INTERFACE, sig, cb, data)
+#define e_nms_signal_handler_add(con, ctxt, sig, cb, data) ctxt == E_NMS_CONTEXT_USER ? e_dbus_signal_handler_add(con, _E_NMS_SERVICE_USER, _E_NMS_PATH, _E_NMS_INTERFACE, sig, cb, data) : e_dbus_signal_handler_add(con, _E_NMS_SERVICE_SYSTEM, _E_NMS_PATH, _E_NMS_INTERFACE, sig, cb, data)
 
 typedef struct E_NM_Internal E_NM_Internal;
 struct E_NM_Internal

diff --git a/src/lib/nm/e_nms.c b/src/lib/nm/e_nms.c
index 895a16b..b64475e 100644 (file)
--- a/src/lib/nm/e_nms.c
+++ b/src/lib/nm/e_nms.c
@@ -108,7 +108,7 @@ cb_nms_system_connections(void *data, void *reply, DBusError *err)
   while ((conn = ecore_list_next(connections)))
     ecore_list_append(list, strdup(conn));
 
-  msg = e_nms_call_new(E_NMS_SERVICE_USER, "ListConnections");
+  msg = e_nms_call_new(E_NMS_CONTEXT_USER, "ListConnections");
 
   e_dbus_method_call_send(nmsi->nmi->conn, msg, cb_nm_object_path_list, cb_nms_user_connections, free_nm_object_path_list, -1, d);
   dbus_message_unref(msg);
@@ -155,8 +155,8 @@ e_nms_get(E_NM *nm, int (*cb_func)(void *data, E_NMS *nms), void *data)
   nmsi = calloc(1, sizeof(E_NMS_Internal));
   nmsi->nmi = (E_NM_Internal *)nm;
   nmsi->handlers = ecore_list_new();
-  ecore_list_append(nmsi->handlers, e_nms_signal_handler_add(nmsi->nmi->conn, E_NMS_SERVICE_SYSTEM, "NewConnection", cb_new_system_connection, nmsi));
-  ecore_list_append(nmsi->handlers, e_nms_signal_handler_add(nmsi->nmi->conn, E_NMS_SERVICE_USER, "NewConnection", cb_new_user_connection, nmsi));
+  ecore_list_append(nmsi->handlers, e_nms_signal_handler_add(nmsi->nmi->conn, E_NMS_CONTEXT_SYSTEM, "NewConnection", cb_new_system_connection, nmsi));
+  ecore_list_append(nmsi->handlers, e_nms_signal_handler_add(nmsi->nmi->conn, E_NMS_CONTEXT_USER, "NewConnection", cb_new_user_connection, nmsi));
 
   (*cb_func)(data, (E_NMS *)nmsi);
   return 1;
@@ -202,7 +202,7 @@ e_nms_list_connections(E_NMS *nms, int (*cb_func)(void *data, Ecore_List *list),
   d->data = data;
   d->object = nmsi;
 
-  msg = e_nms_call_new(E_NMS_SERVICE_SYSTEM, "ListConnections");
+  msg = e_nms_call_new(E_NMS_CONTEXT_SYSTEM, "ListConnections");
 
   ret = e_dbus_method_call_send(nmsi->nmi->conn, msg, cb_nm_object_path_list, cb_nms_system_connections, free_nm_object_path_list, -1, d) ? 1 : 0;
   dbus_message_unref(msg);

diff --git a/src/lib/nm/e_nms_connection.c b/src/lib/nm/e_nms_connection.c
index 5a8a88d..fd203b6 100644 (file)
--- a/src/lib/nm/e_nms_connection.c
+++ b/src/lib/nm/e_nms_connection.c
@@ -83,16 +83,7 @@ e_nms_connection_get_settings(E_NMS_Connection *connection, int (*cb_func)(void
   d->cb_func = OBJECT_CB(cb_func);
   d->data = data;
 
-  switch (conn->context)
-  {
-    case E_NMS_CONTEXT_USER:
-      msg = e_nms_connection_call_new(E_NMS_SERVICE_USER, conn->path, "GetSettings");
-      break;
-    case E_NMS_CONTEXT_SYSTEM:
-    default:
-      msg = e_nms_connection_call_new(E_NMS_SERVICE_SYSTEM, conn->path, "GetSettings");
-      break;
-  }
+  msg = e_nms_connection_call_new(conn->context, conn->path, "GetSettings");
 
   ret = e_dbus_method_call_send(conn->nmi->conn, msg, cb_nm_settings, cb_nms_settings, free_nm_settings, -1, d) ? 1 : 0;
   dbus_message_unref(msg);