[tizen_2.1] merge with private 2.1b_release accepted/tizen_2.1/20130425.022650 submit/tizen_2.1/20130424.223438
authorsckim <sungchan81.kim@samsung.com>
Fri, 19 Apr 2013 09:20:20 +0000 (18:20 +0900)
committersckim <sungchan81.kim@samsung.com>
Fri, 19 Apr 2013 09:20:20 +0000 (18:20 +0900)
Change-Id: I5780e277e3e3810fd6cdbf33a9302bcbf9355ae9

include/myaccount_ug.h
include/myaccount_ug_account_list.h
packaging/my-account.spec
setting-myaccount-efl.xml
src/myaccount_ug_account_list.c
src/myaccount_ug_common.c

index a2dd4c2..a002a43 100755 (executable)
@@ -44,11 +44,11 @@ extern "C" {
 #endif\r
 \r
 #define MYACCOUNT_VERBOSE(fmt, arg...) \\r
-               LOGV(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
+               LOGD(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
 #define MYACCOUNT_DBUG(fmt, arg...) \\r
                LOGD(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
 #define MYACCOUNT_INFO(fmt, arg...) \\r
-               LOGI(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
+               LOGD(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
 #define MYACCOUNT_WARNING(fmt, arg...) \\r
                LOGW(": [%s (%d)]" fmt "\n",  __FUNCTION__, __LINE__, ##arg);\r
 #define MYACCOUNT_ERROR(fmt, arg...) \\r
index 8cba279..fb4263c 100755 (executable)
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- * http://floralicense.org/license/ \r
+ * http://floralicense.org/license/\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an AS IS BASIS,\r
@@ -32,11 +32,6 @@ void myaccount_ug_account_list_create(void *data);
 void myaccount_account_list_quit_cb( void *data,\r
                                                Evas_Object *obj, void *event_info );\r
 \r
-#ifdef ACCOUNT_SYNC_ALL\r
-void myaccount_check_syncall_finish(myaccount_appdata *ad);\r
-#endif\r
-\r
-\r
 \r
 #endif /* _MYACCOUNT_UG_ACCOUNT_LIST_H_ */\r
 \r
index a732723..dcf7cf5 100755 (executable)
@@ -1,7 +1,7 @@
 #sbs-git:slp/apps/m/my-account my-account 1.5.38 c12e7805519b99951f91c33cc96745c7f36166af
 Name:       my-account
 Summary:    My account application
-Version:    1.8.35
+Version:    1.8.36
 Release:    1
 Group:      main/devel
 License:    TO_BE_FILL
index 6043d52..480b949 100755 (executable)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.34" install-location="internal-only">\r
+<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.36" install-location="internal-only">\r
        <label>my-account</label>\r
        <author email="wy1115.lee@samsung.com" href="www.samsung.com">Wonyoung Lee</author>\r
        <description>My Account Application</description>\r
index 3e32653..06bf8e8 100755 (executable)
@@ -42,9 +42,6 @@ typedef struct __account_list_priv {
 
 static Elm_Genlist_Item_Class account_list_itc;
 static Elm_Genlist_Item_Class account_list_title_itc;
-#ifdef ACCOUNT_SYNC_ALL
-static Elm_Genlist_Item_Class account_auto_sync_itc;
-#endif
 static Elm_Genlist_Item_Class account_list_itc_sep;
 static Elm_Genlist_Item_Class account_list_itc_sep_end;
 static myaccount_list_priv *account_info;
@@ -308,77 +305,6 @@ static void __myaccount_account_list_addaccount_cb( void *data,
        myaccount_addaccount_create_view(priv);
 }
 
-#ifdef ACCOUNT_SYNC_ALL
-static void __myaccount_check_sync_support_active_count(int *active_count)
-{
-       int index = 0;
-       int count = 0, tmp_count = 0;
-
-       if (account_info && account_info->capablity_list) {
-               g_slist_free(account_info->capablity_list);
-               account_info->capablity_list = NULL;
-       }
-       MA_MEMFREE(account_info);
-       account_index = 0;
-       count = __myaccount_account_list_populate_account_info();
-
-       for (index = 0; index < count; index++) {
-               MYACCOUNT_VERBOSE("account_info[%d].sync_status = [%d]",
-                               index, account_info[index].sync_status);
-               if (account_info[index].sync_status  == ACCOUNT_SYNC_STATUS_RUNNING) {
-                       tmp_count++;
-               }
-       }
-       *active_count = tmp_count;
-}
-
-static void __myaccount_account_list_refresh_btn_clicked_cb( void *data,
-                                                                                       Evas_Object *obj, void *event_info )
-{
-       myaccount_appdata *ad = (myaccount_appdata*)data;
-       int ret = -1;
-       int sync_all_status = -1;
-       MYACCOUNT_VERBOSE("__myaccount_account_list_refresh_btn_clicked_cb START");
-       if (vconf_get_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, &sync_all_status) < 0) {
-               MYACCOUNT_ERROR("Fail to get VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT\n");
-               return;
-       }
-       if (sync_all_status == 0) {
-               Evas_Object *tmp = elm_object_part_content_unset(ad->refresh_btn, "icon");
-               evas_object_hide (tmp);
-               elm_object_part_content_set(ad->refresh_btn, "icon", ad->cancel_sync_icon);
-               evas_object_show (ad->cancel_sync_icon);
-               ret = vconf_set_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, 1);
-               if (ret == 0) {
-                       MYACCOUNT_DBUG("vconf_set_int Success  %s \n",
-                                                               VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-               } else {
-                       MYACCOUNT_ERROR("vconf_set_int Failed!!!  %s \n",
-                                                               VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-               }
-               if (ad->account_genlist)
-                       myaccount_list_refresh_item_list(ad);
-       } else if (sync_all_status == 1) {
-               Evas_Object *tmp = elm_object_part_content_unset(ad->refresh_btn, "icon");
-               evas_object_hide (tmp);
-               elm_object_part_content_set(ad->refresh_btn, "icon", ad->refresh_icon);
-               evas_object_show (ad->refresh_icon);
-               ret = vconf_set_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, 0);
-               if (ret == 0) {
-                       MYACCOUNT_DBUG("vconf_set_int Success  %s \n",
-                                                               VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-               } else {
-                       MYACCOUNT_ERROR("vconf_set_int Failed!!!  %s \n",
-                                                               VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-               }
-               if (ad->account_genlist)
-                       myaccount_list_refresh_item_list(ad);
-       } else {
-               MYACCOUNT_INFO("Unkown sync all status(%d) \n", sync_all_status);
-       }
-}
-#endif
-
 static char *__myaccount_account_list_gl_label_get(void *data,
                                                                                Evas_Object *obj, const char *part)
 {
@@ -427,121 +353,11 @@ static char *__myaccount_account_list_title_get(void *data,
        return NULL;
 }
 
-#ifdef ACCOUNT_SYNC_ALL
-static char *__myaccount_account_auto_sync_gl_label_get(void *data,
-                                                                                       Evas_Object *obj, const char *part)
-{
-       MYACCOUNT_VERBOSE("__myaccount_account_auto_sync_gl_label_get data=%p, obj = %p, part=%s\n",
-                                                                       data, obj, part);
-
-       if (!strcmp(part, "elm.text"))
-               return (strdup(dgettext(MA_UG_NAME, "IDS_MA_MBODY_AUTO_SYNC")));
-
-       return NULL;
-}
-
-static void __myaccount_account_auto_sync_gl_sel(void *data,
-                                                                               Evas_Object *obj, void *event_info)
-{
-       if (!data || !obj) {
-               MYACCOUNT_ERROR("__myaccount_account_auto_sync_gl_sel : data or obj is NULL");
-               return;
-       }
-       myaccount_appdata *ad = (myaccount_appdata*)data;
-       int ret = -1;
-
-       Eina_Bool state = elm_check_state_get(ad->auto_sync_check);
-       MYACCOUNT_VERBOSE("__myaccount_account_auto_sync_gl_sel :check state= %d\n", state);
-
-       if (state == 0) {
-               elm_check_state_set(ad->auto_sync_check, EINA_TRUE);
-               ret = vconf_set_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, 1);
-       } else {
-               elm_check_state_set(ad->auto_sync_check, EINA_FALSE);
-               ret = vconf_set_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, 0);
-       }
-
-       if (ret == 0) {
-               MYACCOUNT_DBUG("vconf_set_int Success  %s : %d\n",
-                                                       VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, !state);
-               if (ad->account_genlist)
-                       myaccount_list_refresh_item_list(ad);
-       } else {
-               MYACCOUNT_ERROR("vconf_set_int Failed!!!  %s : %d\n",
-                                                       VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, !state);
-       }
-        elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
-}
-
-static void __myaccount_account_auto_sync_check_clicked_cb(void *data,
-                                                                                       Evas_Object *obj, void *event_info)
-{
-       if (!obj || !data) {
-               MYACCOUNT_ERROR("__myaccount_account_auto_sync_check_clicked_cb : data or obj is NULL");
-               return;
-       }
-
-       myaccount_appdata *ad = (myaccount_appdata*)data;
-
-       Eina_Bool state = elm_check_state_get(obj);
-       MYACCOUNT_VERBOSE("__myaccount_account_auto_sync_check_clicked_cb : %d\n", state);
-
-       int ret = vconf_set_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, (const int)state);
-       if (ret == 0) {
-               MYACCOUNT_DBUG("vconf_set_int Success  %s : %d\n",
-                                                       VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, state);
-               if (ad->account_genlist)
-                       myaccount_list_refresh_item_list(ad);
-       } else {
-               MYACCOUNT_ERROR("vconf_set_int Failed!!!  %s : %d\n",
-                                                       VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, state);
-       }
-
-}
-
-static Evas_Object *__myaccount_account_auto_sync_gl_icon_get(void *data,
-                                                                                       Evas_Object *obj, const char *part)
-{
-       if (!obj || !data)
-               return NULL;
-
-       myaccount_appdata *ad = (myaccount_appdata*)data;
-       int auto_sync_status = -1;
-       MYACCOUNT_VERBOSE("__myaccount_account_auto_sync_gl_icon_get data=%p, obj = %p, part=%s\n",
-                                                                                                       data, obj, part);
-       if (!strcmp(part, "elm.icon")) {
-               if (ad->auto_sync_check) {
-                       evas_object_del(ad->auto_sync_check);
-                       ad->auto_sync_check = NULL;
-               }
-               ad->auto_sync_check = elm_check_add(obj);
-               if (vconf_get_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT,
-                                               &auto_sync_status) < 0) {
-                       MYACCOUNT_ERROR("Fail to getVCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT\n");
-               }
-               if (auto_sync_status == 0)
-                       elm_check_state_set(ad->auto_sync_check, EINA_FALSE);
-               if (auto_sync_status == 1)
-                       elm_check_state_set(ad->auto_sync_check, EINA_TRUE);
-               elm_object_part_content_set(obj, "elm.icon", ad->auto_sync_check);
-               elm_object_style_set(ad->auto_sync_check, "on&off");
-               evas_object_smart_callback_add(ad->auto_sync_check, "changed",
-                                       __myaccount_account_auto_sync_check_clicked_cb,
-                                       (void *)ad);
-               evas_object_show(ad->auto_sync_check);
-               return ad->auto_sync_check;
-       }
-       return NULL;
-}
-#endif
-
-
 static Evas_Object *__myaccount_account_list_gl_icon_get(void *data,
                                                                                        Evas_Object *obj, const char *part)
 {
        char tempbuf[PATH_MAX];
        Evas_Object *icon = NULL;
-       int auto_sync_status = -1;
        myaccount_list_priv *account_info_item = (myaccount_list_priv*)data;
 
        MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get START data=%p, obj = %p, part=%s\n",
@@ -572,32 +388,14 @@ static Evas_Object *__myaccount_account_list_gl_icon_get(void *data,
        if (!strcmp(part, "elm.icon.2")) {
                if (account_info_item->sync_status == ACCOUNT_SYNC_NOT_SUPPORT)
                        return NULL;
-               if (vconf_get_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT,
-                                               &auto_sync_status) < 0) {
-                       MYACCOUNT_ERROR("Fail to getVCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT\n");
-               }
-               if ((strlen(account_info_item->capability) > 0 )
-                       && (auto_sync_status == 1)) {
-                       if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_IDLE) {
-                               MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                                       "66_myaccount_icon_push.png");
-                       } else if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_OFF) {
-                               MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                                       "66_myaccount_icon_push_deactivated.png");
-                       } else if  (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_RUNNING){
-                               MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                                       "66_myaccount_icon_push_press.png");
-                       }
 
-               } else {
-                       if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_IDLE
-                               || account_info_item->sync_status == ACCOUNT_SYNC_STATUS_OFF ) {
-                               MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                                       "66_myaccount_icon_push_deactivated.png");
-                       } else if  (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_RUNNING){
-                               MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
-                                       "66_myaccount_icon_push_press.png");
-                       }
+               if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_IDLE
+                       || account_info_item->sync_status == ACCOUNT_SYNC_STATUS_OFF ) {
+                       MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
+                               "66_myaccount_icon_push_deactivated.png");
+               } else if  (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_RUNNING){
+                       MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s",
+                               "66_myaccount_icon_push_press.png");
                }
 
                MYACCOUNT_DBUG("## icon path (%s)\n", tempbuf);
@@ -617,35 +415,6 @@ static Evas_Object *__myaccount_account_list_gl_icon_get(void *data,
        return icon;
 }
 
-static Evas_Object *__myaccount_account_list_title_progress_get(void *data,
-                                                                                       Evas_Object *obj, const char *part)
-{
-       int sync_all_status;
-
-       if (!obj)
-               return NULL;
-
-       if (vconf_get_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, &sync_all_status) < 0) {
-               MYACCOUNT_ERROR("Fail to get VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT\n");
-               return NULL;
-       }
-
-       if (!strcmp(part, "elm.icon") && (sync_all_status == 1)) {
-               Evas_Object *progressbar = NULL;
-               progressbar = elm_progressbar_add(obj);
-               elm_object_style_set(progressbar, "list_process_small");
-               evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);
-               evas_object_size_hint_weight_set(progressbar,
-                                                       EVAS_HINT_EXPAND,
-                                                       EVAS_HINT_EXPAND);
-               evas_object_show(progressbar);
-               elm_progressbar_pulse(progressbar, EINA_TRUE);
-               return progressbar;
-       }
-
-       return NULL;
-}
-
 static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug,
                                                                                enum ug_mode mode, void *priv)
 {
@@ -773,13 +542,6 @@ static void __myaccount_account_list_append_genlist(myaccount_appdata *ad,
                                                                &account_list_itc_sep, NULL, NULL,
                                                                ELM_GENLIST_ITEM_NONE, NULL, NULL);
                elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-#ifdef ACCOUNT_SYNC_ALL
-               elm_genlist_item_append(ad->account_genlist,
-                                                               &account_auto_sync_itc, (void *)ad, NULL,
-                                                               ELM_GENLIST_ITEM_NONE,
-                                                               __myaccount_account_auto_sync_gl_sel,
-                                                               (void *)ad);
-#endif
                it = elm_genlist_item_append(ad->account_genlist,
                                                                &account_list_title_itc, NULL, NULL,
                                                                ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -852,11 +614,7 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void
        index = elm_genlist_item_index_get(it);
 
        MYACCOUNT_VERBOSE("Total genlist item count(%d)!!! \n", total_count);
-#ifdef ACCOUNT_SYNC_ALL
-       if(index > 3 && index < total_count)
-#else
        if(index > 2 && index < total_count)
-#endif
        {
         /*Add account items. index 1 and last are the seperators*/
                myaccount_list_priv *account_info_item = (myaccount_list_priv*)elm_object_item_data_get(it);
@@ -882,32 +640,18 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void
                ao = elm_object_item_access_object_get(it);
                elm_access_info_set(ao, ELM_ACCESS_INFO, buf);
                }
-       } else if (index == 2) {
-               ao = elm_object_item_access_object_get(it);
-               elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Turn Auto Sync on or off");
-    } else if (index == 3) {
-               ao = elm_object_item_access_object_get(it);
-               elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Below is the list of all logged in accounts");
-       } else {
+       }else {
                /*Remove access for seperators*/
                elm_object_item_access_unregister(ei);
        }
 
-#ifdef ACCOUNT_SYNC_ALL
-       if(total_count <= 5)
-#else
        if(total_count <= 4)
-#endif
        {
                MYACCOUNT_INFO("DO NOTHING only one account exist, total_count(%d) index(%d) !!! \n", total_count, index);
        } else {
                if (index == 1) {
                        MYACCOUNT_VERBOSE("DO NOTHING realized (%d) !!! \n", index);
-#ifdef ACCOUNT_SYNC_ALL
-               } else if (index == 4) {
-#else
                } else if (index == 2) {
-#endif
                        MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,top", "");
                } else if (index == (total_count-2)) {
@@ -941,16 +685,9 @@ static Evas_Object *__myaccount_account_list_create_genlist(
 
        account_list_title_itc.item_style = "dialogue/title";
        account_list_title_itc.func.text_get = __myaccount_account_list_title_get;
-       account_list_title_itc.func.content_get = __myaccount_account_list_title_progress_get;
+       account_list_title_itc.func.content_get = NULL;
        account_list_title_itc.func.state_get = NULL;
        account_list_title_itc.func.del = NULL;
-#ifdef ACCOUNT_SYNC_ALL
-       account_auto_sync_itc.item_style = "dialogue/1text.1icon";
-       account_auto_sync_itc.func.text_get = __myaccount_account_auto_sync_gl_label_get;
-       account_auto_sync_itc.func.content_get = __myaccount_account_auto_sync_gl_icon_get;
-       account_auto_sync_itc.func.state_get = NULL;
-       account_auto_sync_itc.func.del = NULL;
-#endif
 
        /*to add 40 pixel separator*/
        account_list_itc_sep.item_style = "dialogue/separator";
@@ -992,13 +729,6 @@ void myaccount_ug_account_list_create(void *data)
        Evas_Object *layout;
        Evas_Object *l_button;
        Evas_Object *btn;
-#ifdef ACCOUNT_SYNC_ALL
-       int sync_all_status;
-       int active_count = 0;
-       int index = 0;
-       int ret =-1;
-       char buf[BUFSIZE]={0,};
-#endif
 
        if (ad == NULL) {
                MYACCOUNT_ERROR("myaccount_ug_account_list_create myaccount_appdata is null\n");
@@ -1016,60 +746,8 @@ void myaccount_ug_account_list_create(void *data)
        elm_object_style_set(ad->bg, "group_list");
        evas_object_show(layout);
 
-#ifdef ACCOUNT_SYNC_ALL
-       ad->refresh_btn = elm_button_add(ad->navi_bar);
-       elm_object_style_set(ad->refresh_btn, "naviframe/title_icon");
-
-       ad->refresh_icon = elm_icon_add(ad->navi_bar);
-       MA_SNPRINTF(buf, BUFSIZE, "%s", "refresh.png");
-       if (strstr(buf, "/"))
-               elm_image_file_set(ad->refresh_icon, buf, NULL);
-       else
-               elm_image_file_set(ad->refresh_icon, MA_IMAGE_EDJ_NAME, buf);
-       elm_image_no_scale_set(ad->refresh_icon, EINA_FALSE);
-
-       ad->cancel_sync_icon = elm_icon_add(ad->navi_bar);
-       MA_SNPRINTF(buf, BUFSIZE, "%s", "cancel_sync.png");
-       if (strstr(buf, "/"))
-               elm_image_file_set(ad->cancel_sync_icon, buf, NULL);
-       else
-               elm_image_file_set(ad->cancel_sync_icon, MA_IMAGE_EDJ_NAME, buf);
-       elm_image_no_scale_set(ad->cancel_sync_icon, EINA_FALSE);
-#endif
-
        genlist = __myaccount_account_list_create_genlist(ad);
 
-#ifdef ACCOUNT_SYNC_ALL
-
-       if (vconf_get_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, &sync_all_status) < 0) {
-               MYACCOUNT_ERROR("Fail to get VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT\n");
-               return;
-       }
-       if (sync_all_status == 0) {
-               elm_object_part_content_set(ad->refresh_btn, "icon", ad->refresh_icon);
-       } else {
-               for (index = 0; index < account_index; index++) {
-                       if (account_info[index].sync_status  == ACCOUNT_SYNC_STATUS_RUNNING)
-                               active_count++;
-               }
-               if (active_count == 0) {
-                       elm_object_part_content_set(ad->refresh_btn, "icon", ad->refresh_icon);
-                       ret = vconf_set_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, 0);
-                       if (ret == 0) {
-                               MYACCOUNT_VERBOSE("vconf_set_int Success  %s \n",
-                                                                       VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-                       } else {
-                               MYACCOUNT_ERROR("vconf_set_int Failed!!!  %s \n",
-                                                                       VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-                       }
-               } else {
-                       elm_object_part_content_set(ad->refresh_btn, "icon", ad->cancel_sync_icon);
-               }
-       }
-       evas_object_smart_callback_add(ad->refresh_btn,
-                               "clicked", __myaccount_account_list_refresh_btn_clicked_cb, ad);
-#endif
-
        elm_object_part_content_set (layout, "accountlist.genlist", genlist);
        ad->l_title_sk = l_button = elm_button_add(ad->navi_bar);
        evas_object_smart_callback_add(l_button, "clicked",
@@ -1080,10 +758,6 @@ void myaccount_ug_account_list_create(void *data)
                                                        dgettext(MA_UG_NAME,
                                                        "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"),
                                                        l_button, NULL, layout, NULL);
-#ifdef ACCOUNT_SYNC_ALL
-       elm_object_item_part_content_set(ad->navi_it,
-                                       "title_right_btn", ad->refresh_btn);
-#endif
        btn = elm_button_add(ad->navi_bar);
        if (!btn) {
                MYACCOUNT_ERROR("myaccount_ug_account_list_create elm_button_add FAIL\n");
@@ -1201,38 +875,3 @@ void myaccount_list_refresh_item_list(myaccount_appdata *ad)
        return;
 }
 
-#ifdef ACCOUNT_SYNC_ALL
-void myaccount_check_syncall_finish(myaccount_appdata *ad)
-{
-       int ret = -1;
-       int active_count = -1;
-       int sync_all_status = -1;
-
-       MYACCOUNT_VERBOSE("myaccount_check_syncall_finish START\n");
-       if (vconf_get_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, &sync_all_status) < 0) {
-               MYACCOUNT_ERROR("Fail to get VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT\n");
-               return;
-       }
-       if (sync_all_status == 1) {
-               __myaccount_check_sync_support_active_count(&active_count);
-               MYACCOUNT_DBUG("sync_all_status[1], active_count[%d]\n", active_count);
-
-               if ( active_count == 0 ) {
-                       Evas_Object *tmp = elm_object_part_content_unset(ad->refresh_btn, "icon");
-                       evas_object_hide (tmp);
-                       elm_object_part_content_set(ad->refresh_btn, "icon", ad->refresh_icon);
-                       evas_object_show (ad->refresh_icon);
-
-                       ret = vconf_set_int(VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT, 0);
-                       if (ret == 0) {
-                               MYACCOUNT_DBUG("vconf_set_int Success  %s \n",
-                                                                       VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-                       } else {
-                               MYACCOUNT_ERROR("vconf_set_int Failed!!!  %s \n",
-                                                                       VCONFKEY_ACCOUNT_SYNC_ALL_STATUS_INT);
-                       }
-               }
-       }
-}
-#endif
-
index ccc019f..e46b205 100755 (executable)
@@ -265,9 +265,6 @@ void myaccount_common_handle_notification(const char* event_type)
                                elm_naviframe_item_pop(appdata->navi_bar);\r
                        }\r
                        if (appdata->account_genlist) {\r
-#ifdef ACCOUNT_SYNC_ALL\r
-                               myaccount_check_syncall_finish(appdata);\r
-#endif\r
                                myaccount_list_refresh_item_list(appdata);\r
                        } else {\r
                                myaccount_ug_account_list_create((void*)appdata);\r
@@ -556,9 +553,6 @@ static int _myaccount_common_pkmgr_return_cb(int req_id, const char *pkg_type,
                                        elm_naviframe_item_pop(appdata->navi_bar);\r
                                }\r
                                if (appdata->account_genlist) {\r
-#ifdef ACCOUNT_SYNC_ALL\r
-                                       myaccount_check_syncall_finish(appdata);\r
-#endif\r
                                        myaccount_list_refresh_item_list(appdata);\r
                                } else {\r
                                        myaccount_ug_account_list_create((void*)appdata);\r