From a3c485fb414f50dff42618c33dbe908f6d3e5f57 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 10 Dec 2011 12:31:49 +0200 Subject: [PATCH] manager: Remove support for GetState method and StateChanged signal --- src/manager.c | 15 --------------- src/notifier.c | 11 ----------- 2 files changed, 26 deletions(-) diff --git a/src/manager.c b/src/manager.c index 528abcb..dd4b93b 100644 --- a/src/manager.c +++ b/src/manager.c @@ -141,19 +141,6 @@ static DBusMessage *set_property(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static DBusMessage *get_state(DBusConnection *conn, - DBusMessage *msg, void *data) -{ - const char *str; - - DBG("conn %p", conn); - - str = __connman_notifier_get_state(); - - return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &str, - DBUS_TYPE_INVALID); -} - static DBusMessage *remove_provider(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -516,7 +503,6 @@ static GDBusMethodTable manager_methods[] = { { "GetProperties", "", "a{sv}", get_properties }, { "SetProperty", "sv", "", set_property, G_DBUS_METHOD_FLAG_ASYNC }, - { "GetState", "", "s", get_state }, { "RemoveProvider", "o", "", remove_provider }, { "RequestScan", "s", "", request_scan }, { "EnableTechnology", "s", "", enable_technology, @@ -542,7 +528,6 @@ static GDBusMethodTable manager_methods[] = { static GDBusSignalTable manager_signals[] = { { "PropertyChanged", "sv" }, - { "StateChanged", "s" }, { }, }; diff --git a/src/notifier.c b/src/notifier.c index 37c23a9..3862626 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -184,7 +184,6 @@ static void state_changed(connman_bool_t connected) { unsigned int count = __connman_notifier_count_connected(); char *state = "offline"; - DBusMessage *signal; if (count > 1) return; @@ -199,16 +198,6 @@ static void state_changed(connman_bool_t connected) connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, CONNMAN_MANAGER_INTERFACE, "State", DBUS_TYPE_STRING, &state); - - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "StateChanged"); - if (signal == NULL) - return; - - dbus_message_append_args(signal, DBUS_TYPE_STRING, &state, - DBUS_TYPE_INVALID); - - g_dbus_send_message(connection, signal); } static void technology_connected(enum connman_service_type type, -- 2.7.4