diff options
| author | Tambet Ingo <tambet@ximian.com> | 2007-02-16 11:23:49 +0000 |
|---|---|---|
| committer | Tambet Ingo <tambet@gmail.com> | 2007-02-16 11:23:49 +0000 |
| commit | c40051389cccf8171a26938db7c167b9ca0010cf (patch) | |
| tree | 387d614ac1e9e04dc2034f852af875757950e6d8 /src/nm-dbus-manager.c | |
| parent | 333f46827183b47d3d8b17a3453c9d55fb10f267 (diff) | |
| download | NetworkManager-c40051389cccf8171a26938db7c167b9ca0010cf.tar.gz | |
2007-02-16 Tambet Ingo <tambet@ximian.com>
* introspection/nm-ip4-config.xml: Implement.
* libnm-glib/libnm-glib-test.c: Use new DBUS API in tests.
* libnm-glib/nm-ip4-config.c:
* libnm-glib/nm-ip4-config.c: Implement.
* src/nm-ap-security[-*]: Remove circular dependencies between APs and AP
securities. APs reference security.
* src/nm-device-802-11-wireless.c: Implement missing properties that need to
be exported over DBUS.
* src/nm-device-802-3-ethernet.c: Ditto.
* src/NetworkManagerAP.c:
* src/NetworkManagerAP.h:
- Convert to GObject, export over DBUS.
* src/nm-ip4-config.h:
* src/nm-ip4-config.h:
- Convert to GObject, export over DBUS.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2322 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/nm-dbus-manager.c')
| -rw-r--r-- | src/nm-dbus-manager.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 285f0f27f8..3a241347db 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -109,16 +109,6 @@ nm_dbus_manager_init (NMDBusManager *self) } static void -cleanup_handler_data (gpointer item, gpointer user_data) -{ - MethodHandlerData * data = (MethodHandlerData *) item; - - nm_dbus_method_list_unref (data->list); - memset (data, 0, sizeof (MethodHandlerData)); - g_slice_free (MethodHandlerData, data); -} - -static void free_signal_handler_helper (gpointer item, gpointer user_data) { @@ -529,42 +519,6 @@ nm_dbus_manager_name_has_owner (NMDBusManager *self, return has_owner; } -static DBusHandlerResult -nm_dbus_manager_message_handler (DBusConnection *connection, - DBusMessage *message, - void *user_data) -{ - MethodHandlerData * data = (MethodHandlerData *) user_data; - NMDBusManager * self = data->self; - NMDbusMethodList * list = data->list; - DBusObjectPathMessageFunction custom_handler_func; - gboolean handled = FALSE; - DBusMessage * reply = NULL; - void * hdlr_user_data; - - g_return_val_if_fail (self != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); - g_return_val_if_fail (list != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); - - hdlr_user_data = nm_dbus_method_list_get_user_data (list); - - /* Try the method lists' custom handler first */ - custom_handler_func = nm_dbus_method_list_get_custom_handler_func (list); - if (custom_handler_func) { - handled = (*custom_handler_func) (connection, message, hdlr_user_data); - } else { - /* Generic handler for lists that don't specify a custom handler */ - handled = nm_dbus_method_list_dispatch (list, connection, message, - hdlr_user_data, &reply); - if (reply) { - dbus_connection_send (connection, reply, NULL); - dbus_message_unref (reply); - } - } - - return handled ? DBUS_HANDLER_RESULT_HANDLED - : DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - static void proxy_name_owner_changed (DBusGProxy *proxy, const char *name, |