profile: Remove profile D-Bus API

diff --git a/Makefile.am b/Makefile.am
index 2ff5781..23805e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -200,10 +200,10 @@ EXTRA_DIST += $(test_scripts)
 EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
                                doc/ipconfig-api.txt doc/plugin-api.txt \
                                doc/manager-api.txt doc/agent-api.txt \
-                               doc/profile-api.txt doc/service-api.txt \
-                               doc/technology-api.txt doc/counter-api.txt \
-                               doc/advanced-configuration.txt \
-                               doc/config-format.txt
+                               doc/service-api.txt doc/technology-api.txt \
+                               doc/counter-api.txt doc/config-format.txt \
+                               doc/advanced-configuration.txt
+
 
 pkgconfigdir = $(libdir)/pkgconfig
 

diff --git a/doc/profile-api.txt b/doc/profile-api.txt
deleted file mode 100644 (file)
index eba5625..0000000
--- a/doc/profile-api.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Profile hierarchy
-=================
-
-Service                net.connman
-Interface      net.connman.Profile
-Object path    [variable prefix]/{profile0,profile1,...}
-
-Methods                dict GetProperties()
-
-                       Returns properties for the profile object. See
-                       the properties section for available properties.
-
-                       Possible Errors: [service].Error.InvalidArguments
-
-Signals                PropertyChanged(string name, variant value)
-
-                       This signal indicates a changed value of the given
-                       property.
-
-Properties     string Name [readonly]
-
-                       Name of this profile.
-
-               boolean OfflineMode [readwrite]
-
-                       The offline mode indicates the setting for switching
-                       all radios on or off. Changing offline mode to true
-                       results in powering down all devices.
-
-               array{object} Services [readonly]
-
-                       List of service objects.

diff --git a/include/dbus.h b/include/dbus.h
index 33ddb73..0d89456 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -40,7 +40,6 @@ extern "C" {
 #define CONNMAN_MANAGER_PATH           "/"
 
 #define CONNMAN_TASK_INTERFACE         CONNMAN_SERVICE ".Task"
-#define CONNMAN_PROFILE_INTERFACE      CONNMAN_SERVICE ".Profile"
 #define CONNMAN_SERVICE_INTERFACE      CONNMAN_SERVICE ".Service"
 #define CONNMAN_PROVIDER_INTERFACE     CONNMAN_SERVICE ".Provider"
 #define CONNMAN_TECHNOLOGY_INTERFACE   CONNMAN_SERVICE ".Technology"

diff --git a/src/profile.c b/src/profile.c
index fd72e8b..a16336e 100644 (file)
--- a/src/profile.c
+++ b/src/profile.c
@@ -43,22 +43,8 @@ static struct connman_profile *default_profile = NULL;
 
 static DBusConnection *connection = NULL;
 
-static void name_changed(struct connman_profile *profile)
-{
-       connman_dbus_property_changed_basic(profile->path,
-                               CONNMAN_PROFILE_INTERFACE, "Name",
-                                       DBUS_TYPE_STRING, &profile->name);
-}
-
 static void offlinemode_changed(struct connman_profile *profile)
 {
-       connman_dbus_property_changed_basic(profile->path,
-                               CONNMAN_PROFILE_INTERFACE, "OfflineMode",
-                               DBUS_TYPE_BOOLEAN, &profile->offlinemode);
-
-       if (profile != default_profile)
-               return;
-
        connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH,
                                CONNMAN_MANAGER_INTERFACE, "OfflineMode",
                                DBUS_TYPE_BOOLEAN, &profile->offlinemode);
@@ -135,11 +121,6 @@ static gboolean services_changed(gpointer user_data)
                                DBUS_TYPE_OBJECT_PATH, __connman_service_list,
                                NULL);
 
-       connman_dbus_property_changed_array(default_profile->path,
-                               CONNMAN_PROFILE_INTERFACE, "Services",
-                               DBUS_TYPE_OBJECT_PATH, __connman_service_list,
-                               NULL);
-
        return FALSE;
 }
 
@@ -165,104 +146,6 @@ void __connman_profile_changed(gboolean delayed)
        changed_timeout = g_timeout_add_seconds(1, services_changed, NULL);
 }
 
-static DBusMessage *get_properties(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
-{
-       struct connman_profile *profile = data;
-       DBusMessage *reply;
-       DBusMessageIter array, dict;
-
-       DBG("conn %p", conn);
-
-       reply = dbus_message_new_method_return(msg);
-       if (reply == NULL)
-               return NULL;
-
-       dbus_message_iter_init_append(reply, &array);
-
-       connman_dbus_dict_open(&array, &dict);
-
-       if (profile->name != NULL)
-               connman_dbus_dict_append_basic(&dict, "Name",
-                                       DBUS_TYPE_STRING, &profile->name);
-
-       connman_dbus_dict_append_basic(&dict, "OfflineMode",
-                               DBUS_TYPE_BOOLEAN, &profile->offlinemode);
-
-       connman_dbus_dict_append_array(&dict, "Services",
-                       DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL);
-
-       connman_dbus_dict_close(&array, &dict);
-
-       return reply;
-}
-
-static DBusMessage *set_property(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
-{
-       struct connman_profile *profile = data;
-       DBusMessageIter iter, value;
-       const char *name;
-       int type;
-
-       DBG("conn %p", conn);
-
-       if (dbus_message_iter_init(msg, &iter) == FALSE)
-               return __connman_error_invalid_arguments(msg);
-
-       dbus_message_iter_get_basic(&iter, &name);
-       dbus_message_iter_next(&iter);
-       dbus_message_iter_recurse(&iter, &value);
-
-       type = dbus_message_iter_get_arg_type(&value);
-
-       if (g_str_equal(name, "Name") == TRUE) {
-               const char *name;
-
-               if (type != DBUS_TYPE_STRING)
-                       return __connman_error_invalid_arguments(msg);
-
-               dbus_message_iter_get_basic(&value, &name);
-
-               g_free(profile->name);
-               profile->name = g_strdup(name);
-
-               if (profile->name != NULL)
-                       name_changed(profile);
-
-               __connman_storage_save_profile(profile);
-       } else if (g_str_equal(name, "OfflineMode") == TRUE) {
-               connman_bool_t offlinemode;
-
-               if (type != DBUS_TYPE_BOOLEAN)
-                       return __connman_error_invalid_arguments(msg);
-
-               dbus_message_iter_get_basic(&value, &offlinemode);
-
-               if (profile->offlinemode == offlinemode)
-                       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
-               profile->offlinemode = offlinemode;
-               offlinemode_changed(profile);
-
-               __connman_storage_save_profile(profile);
-       } else
-               return __connman_error_invalid_property(msg);
-
-       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static GDBusMethodTable profile_methods[] = {
-       { "GetProperties", "",   "a{sv}", get_properties },
-       { "SetProperty",   "sv", "",      set_property   },
-       { },
-};
-
-static GDBusSignalTable profile_signals[] = {
-       { "PropertyChanged", "sv" },
-       { },
-};
-
 static void free_profile(struct connman_profile *profile)
 {
        g_free(profile->name);
@@ -294,12 +177,6 @@ static int profile_init(void)
 
        connman_info("Adding default profile");
 
-       g_dbus_register_interface(connection, default_profile->path,
-                                       CONNMAN_PROFILE_INTERFACE,
-                                       profile_methods, profile_signals,
-                                               NULL, default_profile, NULL);
-
-
        DBG("profile %p path %s", default_profile, default_profile->path);
 
        return 0;