tizen 2.4 release

[apps/home/settings.git] / setting-appmgr / src / setting-appmgr-utils.c

diff --git a/setting-appmgr/src/setting-appmgr-utils.c b/setting-appmgr/src/setting-appmgr-utils.c
index 6e749ab..2520ce1 100644 (file)
--- a/setting-appmgr/src/setting-appmgr-utils.c
+++ b/setting-appmgr/src/setting-appmgr-utils.c
@@ -20,6 +20,7 @@
 /*#include <resourced.h> */
 /*#include <data_usage.h> */
 #include <app_manager.h>
+#include <app_manager_extension.h>
 
 #include "setting-appmgr-main.h"
 #include "setting-appmgr-runinfo.h"
@@ -27,6 +28,7 @@
 #include "setting-appmgr-async-worker.h"
 #include "setting-appmgr-utils.h"
 
+
 extern void appmgrUg_pkg_uninstall_click(void *data, Evas_Object *obj, void *event_info);
 extern void appmgrUg_pkg_clear_cache_click(void *data, Evas_Object *obj, void *event_info);
 extern void appmgrUg_pkg_moveto_cb(void *data, Evas_Object *obj, void *event_info);
@@ -91,8 +93,9 @@ void appmgrUg_fail_popup(char *str, SettingAppMgrUG *ad)
                ad->popup = NULL;
        }
 
-       ad->popup = setting_create_popup_with_btn(ad, ad->win, NULL,
-                                                 str, appmgrUg_popup_del, 0, 1, MGRAPP_STR_OK);
+       ad->popup = setting_create_popup(ad, ad->win, NULL,
+                                                                        str, appmgrUg_popup_del, 0, FALSE, FALSE,
+                                                                        1, MGRAPP_STR_OK);
 }
 
 static void appmgrUg_update_listinfos(SettingAppMgrUG *ad)
@@ -146,9 +149,9 @@ static int appmgrUg_pkgmgr_changed_cb(int req_id, const char *pkg_type,
 
                                if (ad->popup)
                                        evas_object_del(ad->popup);
-                               ad->popup = setting_create_popup_with_btn(ad, ad->win, NULL,
-                                                                         MGRAPP_STR_UNINSTALL_COMPLETE, appmgrUg_popup_del, 0,
-                                                                         1, MGRAPP_STR_OK);
+                               ad->popup = setting_create_popup(ad, ad->win, NULL,
+                                                                                                MGRAPP_STR_UNINSTALL_COMPLETE, appmgrUg_popup_del, 0, FALSE, FALSE,
+                                                                                                1, MGRAPP_STR_OK);
 
                                ad->pkg_request = APPMGRUG_PKG_REQUEST_NONE;
                        } else if (APPMGRUG_PKG_REQUEST_MOVE == ad->pkg_request) {
@@ -247,7 +250,6 @@ Elm_Object_Item *appmgrUg_append_separator(Evas_Object *genlist,
        item = elm_genlist_item_append(genlist, &ad->itc_sep, NULL, NULL,
                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
        return item;
 }
 
@@ -454,8 +456,8 @@ static int appmgrUg_get_all_pkg_size(int req_id, const char *pkg_type,
                                ecore_idler_del(ad->size_idler);
                        ad->size_idler = ecore_idler_add(appmgrUg_get_all_pkg_sizesort, ad);
                } else {
-                       elm_genlist_item_fields_update(info->item, "elm.text.sub.left.bottom",
-                                                      ELM_GENLIST_ITEM_FIELD_TEXT);
+                       if (info->item)
+                               elm_genlist_item_fields_update(info->item, "elm.text.sub", ELM_GENLIST_ITEM_FIELD_TEXT);
                }
        }
 
@@ -621,63 +623,6 @@ void appmgrUg_pkgmgr_deinit(SettingAppMgrUG *ad)
        }
 }
 
-static void appmgrUg_del_def_list(gpointer data, gpointer user_data)
-{
-       appmgr_listinfo *info = data;
-
-       ret_if(NULL == data);
-
-       g_list_free_full(info->def_appids, free);
-       info->def_appids = NULL;
-}
-
-static int appmgrUg_get_default_list_iter(const char *appid, void *data)
-{
-       int ret;
-       GList *list;
-       char *pkgid = NULL;
-       pkgmgrinfo_appinfo_h handle;
-       SettingAppMgrUG *ad = data;
-
-       retv_if(NULL == ad, 0);
-       retv_if(NULL == appid, 0);
-
-       ret = pkgmgrinfo_appinfo_get_appinfo(appid, &handle);
-       if (PMINFO_R_OK != ret) {
-               SETTING_TRACE_ERROR("pkgmgrinfo_appinfo_get_appinfo() Fail(%d)", ret);
-               return 0;
-       }
-
-       ret = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgid);
-       if (PMINFO_R_OK != ret) {
-               SETTING_TRACE_ERROR("pkgmgrinfo_appinfo_get_pkgid() Fail(%d)", ret);
-               pkgmgrinfo_appinfo_destroy_appinfo(handle);
-               return 0;
-       }
-
-       list = g_list_find_custom(ad->pkg_list, pkgid, appmgrUg_compare_pkgname);
-       if (list) {
-               appmgr_listinfo *info = list->data;
-               info->def_appids = g_list_append(info->def_appids, strdup(appid));
-       }
-
-       pkgmgrinfo_appinfo_destroy_appinfo(handle);
-
-       return 0;
-}
-
-void appmgrUg_get_default_list(SettingAppMgrUG *ad)
-{
-       int ret;
-
-       ret_if(ad == NULL);
-
-       g_list_foreach(ad->pkg_list, appmgrUg_del_def_list, NULL);
-
-       ret = appsvc_get_all_defapps(appmgrUg_get_default_list_iter, ad);
-       warn_if(AUL_R_OK != ret, "aul_app_get_running_app_info() Fail", ret);
-}
-
 static void appmgrUg_free_listinfo(gpointer data)
 {
        appmgr_listinfo *info = data;
@@ -968,9 +913,9 @@ char *appmgrUg_info_title_gl_label_get(void *data, Evas_Object *obj,
 
        retv_if(data == NULL, NULL);
 
-       if (0 == strcmp(part, "elm.text.main.left.top")) {
+       if (0 == strcmp(part, "elm.text")) {
                label = SAFE_STRDUP(ad->sel_label);
-       } else if (0 == strcmp(part, "elm.text.sub.left.bottom")) {
+       } else if (0 == strcmp(part, "elm.text.sub")) {
                char desc[APPMGRUG_MAX_STR_LEN] = {0};
 
                if (APPMGRUG_TAB_RUNNING == ad->tabtype) {
@@ -1011,9 +956,6 @@ static void _reset_app_settings_cb(int fn_result, SettingAppMgrUG *ad)
        if (fn_result) {
                SETTING_TRACE_ERROR("_reset_app_setting_fn() Fail(%d)", fn_result);
                appmgrUg_fail_popup(MGRAPP_STR_ERROR, ad);
-       } else {
-               if (APPMGRUG_TAB_DEFAULT == ad->tabtype)
-                       setting_view_update(ad->main_view, ad);
        }
        ad->reset_worker = NULL;
 }
@@ -1040,7 +982,7 @@ int appmgrUg_reset_app_settings(SettingAppMgrUG *ad)
                evas_object_del(ad->popup);
        /* do not show popup
        ad->popup = setting_create_popup_with_progressbar(ad, ad->win, PROGRESSBAR_STYLE,
-                       NULL, NULL, appmgrUg_popup_del, 0, TRUE, TRUE);
+                       NULL, NULL, appmgrUg_popup_del, 0, TRUE, TRUE, 0);
        */
        ad->pkg_request = APPMGRUG_PKG_REQUEST_RESET;