Modified genitem update for Tizen Connect status

Change-Id: I9cce1a76ba9c2b76e0c7781d687425dce4165e7c
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/setting-connection.c b/src/setting-connection.c
index dabb762d0a80541b5c7227606bc12e953e0ae12f..b346716e704e6b30c372156613c6c0023681a94a 100644 (file)
--- a/src/setting-connection.c
+++ b/src/setting-connection.c
@@ -35,6 +35,7 @@ static Evas_Object *g_connection_genlist = NULL;
 static Elm_Object_Item *g_BT_item = NULL;
 static Elm_Object_Item *g_WIFI_item = NULL;
 static Elm_Object_Item *g_NFC_item = NULL;
+static Elm_Object_Item *g_TIZEN_CONNECT_item = NULL;
 #define AUDIO_RESOURCE_EXTENSION       ".ogg"
 
 void _bluetooth_cb(void *data, Evas_Object *obj, void *event_info);
@@ -47,6 +48,7 @@ void _tizen_connect_cb(void *data, Evas_Object *obj, void *event_info);
 static void bt_status_vconf_changed_cb(keynode_t *key, void *data);
 static void wifi_status_vconf_changed_cb(keynode_t *key, void *data);
 static void nfc_status_vconf_changed_cb(keynode_t *key, void *data);
+static void d2d_conv_status_vconf_changed_cb(keynode_t *key, void *data);
 
 static struct _connection_menu_item connection_menu_its[] = {
 #ifndef FEATURE_SETTING_EMUL
@@ -98,12 +100,14 @@ void _clear_connection_resource()
        g_BT_item = NULL;
        g_WIFI_item = NULL;
        g_NFC_item = NULL;
+       g_TIZEN_CONNECT_item = NULL;
 
        temp_ad = NULL;
 
        unregister_vconf_changing(VCONFKEY_BT_STATUS, bt_status_vconf_changed_cb);
        unregister_vconf_changing(VCONFKEY_WIFI_STATE, wifi_status_vconf_changed_cb);
        unregister_vconf_changing(VCONFKEY_NFC_STATE, nfc_status_vconf_changed_cb);
+       unregister_vconf_changing(VCONFKEY_SETAPPL_D2D_CONVERGENCE, d2d_conv_status_vconf_changed_cb);
 }
 
 
@@ -300,6 +304,10 @@ void _bluetooth_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
+       if (running_connection) {
+               return;
+       }
+
        app_control_h service;
        app_control_create(&service);
        app_control_set_package(service, "org.tizen.bluetooth");
@@ -329,6 +337,10 @@ void _wifi_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
+       if (running_connection) {
+               return;
+       }
+
        app_control_h service;
        app_control_create(&service);
        app_control_set_package(service, "org.tizen.w-wifi");
@@ -357,6 +369,10 @@ void _nfc_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
+       if (running_connection) {
+               return;
+       }
+
        app_control_h service;
        app_control_create(&service);
        app_control_set_package(service, "org.tizen.nfc-setting-app");
@@ -385,6 +401,10 @@ void _tizen_connect_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
+       if (running_connection) {
+               return;
+       }
+
        app_control_h service;
        app_control_create(&service);
        app_control_set_package(service, "org.tizen.d2d-conv-setting");
@@ -555,6 +575,9 @@ Evas_Object *_create_connection_list(void *data)
                        case SETTING_CONNECTION_NFC:
                                g_NFC_item = id->item;
                                break;
+                       case SETTING_CONNECTION_TIZEN_CONNECT:
+                               g_TIZEN_CONNECT_item = id->item;
+                               break;
                        }
                }
        }
@@ -574,6 +597,7 @@ Evas_Object *_create_connection_list(void *data)
        register_vconf_changing(VCONFKEY_BT_STATUS, bt_status_vconf_changed_cb, ad);
        register_vconf_changing(VCONFKEY_WIFI_STATE, wifi_status_vconf_changed_cb, ad);
        register_vconf_changing(VCONFKEY_NFC_STATE, nfc_status_vconf_changed_cb, ad);
+       register_vconf_changing(VCONFKEY_SETAPPL_D2D_CONVERGENCE, d2d_conv_status_vconf_changed_cb, ad);
        return genlist;
 }
 
@@ -603,3 +627,8 @@ static void nfc_status_vconf_changed_cb(keynode_t *key, void *data)
        _update_connection_list(g_NFC_item);
 }
 
+static void d2d_conv_status_vconf_changed_cb(keynode_t *key, void *data)
+{
+       DBG("Setting - d2d_conv_status_vconf_changed_cb() is called!!");
+       _update_connection_list(g_TIZEN_CONNECT_item);
+}

diff --git a/src/setting.c b/src/setting.c
index 9f8fe84cdeb48b1a6e8ebbfcf02a9516dc708985..a90f5e7a16f84f541768a87341abbeac7915c7a0 100644 (file)
--- a/src/setting.c
+++ b/src/setting.c
@@ -451,6 +451,10 @@ void account_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
+       if (running) {
+               return;
+       }
+
        app_control_h service;
        app_control_create(&service);
        app_control_set_package(service, "org.tizen.my-account");
@@ -479,6 +483,10 @@ void accessiblity_cb(void *data, Evas_Object *obj, void *event_info)
                return;
        }
 
+       if (running) {
+               return;
+       }
+
        app_control_h service;
        app_control_create(&service);
        app_control_set_package(service, "org.tizen.accessibility-setting");