From f2c07fc5c3b2be43421544a5edfc27d6f9b9a5d9 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 19 Jan 2007 01:05:01 +0000 Subject: Remove not needed generic message handling --- common/dbus.c | 26 -------------------------- common/dbus.h | 12 ------------ 2 files changed, 38 deletions(-) (limited to 'common') diff --git a/common/dbus.c b/common/dbus.c index 63e5e38f..3b211851 100644 --- a/common/dbus.c +++ b/common/dbus.c @@ -635,29 +635,3 @@ DBusHandlerResult simple_introspect(DBusConnection *conn, return send_message_and_unref(conn, reply); } - -static DBusHandlerResult generic_message_function(DBusConnection *conn, - DBusMessage *msg, void *user_data) -{ - struct message_table *table = user_data; - struct message_table *current; - const char *member; - - if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, - "Introspect") == TRUE) - return simple_introspect(conn, msg, user_data); - - member = dbus_message_get_member(msg); - - for (current = table; current->handler; current++) { - if (dbus_message_is_method_call(msg, current->interface, current->member) == TRUE && - dbus_message_has_signature(msg, current->signature) == TRUE) - return current->handler(conn, msg, user_data); - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -DBusObjectPathVTable generic_object_path = { - .message_function = generic_message_function, -}; diff --git a/common/dbus.h b/common/dbus.h index d050237d..801d90c6 100644 --- a/common/dbus.h +++ b/common/dbus.h @@ -28,18 +28,6 @@ DBusConnection *init_dbus(const char *name, void (*disconnect_cb)(void *), void *user_data); -typedef DBusHandlerResult (*message_func_t) (DBusConnection *conn, - DBusMessage *msg, void *user_data); - -struct message_table { - const char *interface; - const char *member; - const char *signature; - message_func_t handler; -}; - -extern DBusObjectPathVTable generic_object_path; - DBusHandlerResult simple_introspect(DBusConnection *conn, DBusMessage *msg, void *user_data); -- cgit