[tizen_2.1] merge with private

[apps/core/preloaded/my-account.git] / src / myaccount_ug_common.c

diff --git a/src/myaccount_ug_common.c b/src/myaccount_ug_common.c
index 85b7e7a..e46b205 100755 (executable)
--- a/src/myaccount_ug_common.c
+++ b/src/myaccount_ug_common.c
@@ -137,6 +137,7 @@ void myaccount_destroy_appdata()
        g_myaccount_appdata->sorted_sp_list= NULL;\r
 \r
        MA_MEMFREE(g_myaccount_appdata->caller_userdata);\r
+       MA_MEMFREE(g_myaccount_appdata->called_from);\r
        MA_MEMFREE(g_myaccount_appdata);\r
 \r
        MYACCOUNT_VERBOSE("myaccount_destroy_appdata END \n");\r
@@ -199,9 +200,11 @@ void myaccount_common_get_icon_by_name(char *domain_name,
                                        "01_samsungaccount.png");\r
        } else if (!strcmp(tmp_domain_name, "youtube")) {\r
                MA_SNPRINTF(icon_path, BUFSIZE, "%s", "youtube.png");\r
+       } else if (!strcmp(tmp_domain_name, "others")) {\r
+               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_others.png");\r
        }else {\r
                MYACCOUNT_VERBOSE("Default icon\n");\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "99_email.png");\r
+               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_default.png");\r
        }\r
 }\r
 \r
@@ -222,7 +225,7 @@ void myaccount_common_lowercase(char *src, char *dest)
        dest[i] = '\0';\r
 }\r
 \r
-void myaccount_common_handle_notification()\r
+void myaccount_common_handle_notification(const char* event_type)\r
 {\r
        myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();\r
 \r
@@ -262,9 +265,6 @@ void myaccount_common_handle_notification()
                                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
@@ -277,19 +277,21 @@ void myaccount_common_handle_notification()
                        }\r
                }\r
        } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) {\r
-               if (appdata->ug) {\r
-                       service_h service = NULL;\r
-                       int ret = -1;\r
-\r
-                       ret = service_create(&service);\r
-                       MYACCOUNT_VERBOSE("service_create ret (%x)\n", ret);\r
-                       ret = service_add_extra_data(service, "account_noti", noti_name);\r
-                       MYACCOUNT_VERBOSE("service_add_extra_data ret (%x)\n", ret);\r
-                       error_code = ug_send_result(appdata->ug, service);\r
-                       MYACCOUNT_VERBOSE("ug_send_result ret (%x)\n", error_code);\r
-                       error_code = ug_destroy_me(appdata->ug);\r
-                       MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n",\r
-                                                               error_code);\r
+               if(event_type){\r
+                       if (!strcmp(event_type, ACCOUNT_NOTI_NAME_INSERT) && appdata->ug) {\r
+                               service_h service = NULL;\r
+                               int ret = -1;\r
+\r
+                               ret = service_create(&service);\r
+                               MYACCOUNT_VERBOSE("service_create ret (%x)\n", ret);\r
+                               ret = service_add_extra_data(service, "account_noti", noti_name);\r
+                               MYACCOUNT_VERBOSE("service_add_extra_data ret (%x)\n", ret);\r
+                               error_code = ug_send_result(appdata->ug, service);\r
+                               MYACCOUNT_VERBOSE("ug_send_result ret (%x)\n", error_code);\r
+                               error_code = ug_destroy_me(appdata->ug);\r
+                               MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n",\r
+                                                                       error_code);\r
+                       }\r
                }\r
        } else {\r
                MYACCOUNT_WARNING("Unknown mode !!!");\r
@@ -340,6 +342,7 @@ int  myaccount_common_launch_application(MyAccountRequestViewType
                                                                                                                char *username,\r
                                                                                                                char *email_sp,\r
                                                                                                                int account_id,\r
+                                                                                                               MyAccountProviderType sp_type,\r
                                                                                                                void *data )\r
 {\r
        int ret = SERVICE_ERROR_NONE;\r
@@ -550,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