manager: Remove support for GetState method and StateChanged signal
authorMarcel Holtmann <marcel@holtmann.org>
Sat, 10 Dec 2011 10:31:49 +0000 (12:31 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sat, 10 Dec 2011 10:31:49 +0000 (12:31 +0200)
src/manager.c
src/notifier.c

index 528abcb..dd4b93b 100644 (file)
@@ -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"  },
        { },
 };
 
index 37c23a9..3862626 100644 (file)
@@ -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,