iptables: Refactoring how jumps are handled

[framework/connectivity/connman.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 54de643..2b34ea6 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -50,11 +50,6 @@ static DBusMessage *get_properties(DBusConnection *conn,
 
        connman_dbus_dict_open(&array, &dict);
 
-       str = __connman_profile_active_path();
-       if (str != NULL)
-               connman_dbus_dict_append_basic(&dict, "ActiveProfile",
-                                               DBUS_TYPE_OBJECT_PATH, &str);
-
        connman_dbus_dict_append_array(&dict, "Services",
                        DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL);
        connman_dbus_dict_append_array(&dict, "Technologies",
@@ -64,7 +59,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
        connman_dbus_dict_append_basic(&dict, "State",
                                                DBUS_TYPE_STRING, &str);
 
-       offlinemode = __connman_profile_get_offlinemode();
+       offlinemode = __connman_technology_get_offlinemode();
        connman_dbus_dict_append_basic(&dict, "OfflineMode",
                                        DBUS_TYPE_BOOLEAN, &offlinemode);
 
@@ -121,15 +116,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                dbus_message_iter_get_basic(&value, &offlinemode);
 
-               __connman_profile_set_offlinemode(offlinemode, TRUE);
-
-               __connman_profile_save_default();
-       } else if (g_str_equal(name, "ActiveProfile") == TRUE) {
-               const char *str;
-
-               dbus_message_iter_get_basic(&value, &str);
-
-               return __connman_error_not_supported(msg);
+               __connman_technology_set_offlinemode(offlinemode);
        } else if (g_str_equal(name, "SessionMode") == TRUE) {
                connman_bool_t sessionmode;
 
@@ -143,7 +130,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                __connman_session_set_mode(sessionmode);
 
-               if (connman_state_idle == FALSE) {
+               if (sessionmode == TRUE && connman_state_idle == FALSE) {
                        session_mode_pending = msg;
                        return NULL;
                }