Fix prevent issues

[apps/core/preloaded/settings.git] / setting-display / src / setting-display-wallpaper.c

diff --git a/setting-display/src/setting-display-wallpaper.c b/setting-display/src/setting-display-wallpaper.c
index 8bcd99f..df03f38 100755 (executable)
--- a/setting-display/src/setting-display-wallpaper.c
+++ b/setting-display/src/setting-display-wallpaper.c
@@ -145,47 +145,6 @@ static void __setting_display_wallpaper_imageviewer_ug_result_cb(ui_gadget_h ug,
 
                ad->wallpaper_changed = EINA_TRUE;
        }
-
-       if (ug) {
-               ug_destroy(ug);
-               ad->ug_imageviewer = NULL;
-       }
-
-       if (ad->ug_gallery) {
-               ug_destroy(ad->ug_gallery);
-               ad->ug_gallery = NULL;
-       }
-
-       if (ad->wallpaper_changed == EINA_FALSE) {
-               SETTING_TRACE("wallpaper not changed");
-               return;
-       }
-
-       char text[MAX_DISPLAY_NAME_LEN_ON_UI +1] = {0, };
-       SETTING_TRACE("cur_sel = %d", ad->cur_sel);
-       switch(ad->cur_sel) {
-       case WALLPAPER_CUR_SEL_HOME_SCREEN:
-               snprintf(text, MAX_DISPLAY_NAME_LEN_ON_UI, "%s", SETTING_WALLPAPER_HOME_SCREEN_CHANGED);
-               break;
-       case WALLPAPER_CUR_SEL_LOCK_SCREEN:
-               snprintf(text, MAX_DISPLAY_NAME_LEN_ON_UI, "%s", SETTING_WALLPAPER_LOCK_SCREEN_CHANGED);
-               break;
-       case WALLPAPER_CUR_SEL_HOME_AND_LOCK_SCREEN:
-               snprintf(text, MAX_DISPLAY_NAME_LEN_ON_UI, "%s", SETTING_WALLPAPER_HOME_AND_LOCK_SCREEN_CHANGED);
-               break;
-       default:
-               ad->cur_sel = WALLPAPER_CUR_SEL_NONE;
-               return;
-       }
-
-       setting_create_sel_info_popup(ad->view_layout,
-                                     &(ad->selInfoPop_layout),
-                                     &(ad->selInfoPop));
-       elm_notify_timeout_set(ad->selInfoPop, SETTING_WALLPAPER_POPUP_TIMER);
-
-       edje_object_part_text_set(_EDJ(ad->selInfoPop_layout), "elm.text", text);
-       ad->cur_sel = WALLPAPER_CUR_SEL_NONE;
-       ad->wallpaper_changed = EINA_FALSE;
 }
 
 static void __setting_display_wallpaper_imageviewer_ug_destroy_cb(ui_gadget_h ug, void *priv)
@@ -198,6 +157,42 @@ static void __setting_display_wallpaper_imageviewer_ug_destroy_cb(ui_gadget_h ug
                ug_destroy(ug);
                ad->ug_imageviewer = NULL;
        }
+
+       if (ad->wallpaper_changed) {
+               if (ad->ug_gallery) {
+                       ug_destroy(ad->ug_gallery);
+                       ad->ug_gallery = NULL;
+               }
+
+               char text[MAX_DISPLAY_NAME_LEN_ON_UI +1] = {0, };
+               SETTING_TRACE("cur_sel = %d", ad->cur_sel);
+
+               switch(ad->cur_sel) {
+               case WALLPAPER_CUR_SEL_HOME_SCREEN:
+                       snprintf(text, MAX_DISPLAY_NAME_LEN_ON_UI, "%s", SETTING_WALLPAPER_HOME_SCREEN_CHANGED);
+                       break;
+               case WALLPAPER_CUR_SEL_LOCK_SCREEN:
+                       snprintf(text, MAX_DISPLAY_NAME_LEN_ON_UI, "%s", SETTING_WALLPAPER_LOCK_SCREEN_CHANGED);
+                       break;
+               case WALLPAPER_CUR_SEL_HOME_AND_LOCK_SCREEN:
+                       snprintf(text, MAX_DISPLAY_NAME_LEN_ON_UI, "%s", SETTING_WALLPAPER_HOME_AND_LOCK_SCREEN_CHANGED);
+                       break;
+               default:
+                       ad->cur_sel = WALLPAPER_CUR_SEL_NONE;
+                       return;
+               }
+
+               setting_create_sel_info_popup(ad->view_layout,
+                                             &(ad->selInfoPop_layout),
+                                             &(ad->selInfoPop));
+               elm_notify_timeout_set(ad->selInfoPop, SETTING_WALLPAPER_POPUP_TIMER);
+
+               edje_object_part_text_set(_EDJ(ad->selInfoPop_layout), "elm.text", text);
+               ad->cur_sel = WALLPAPER_CUR_SEL_NONE;
+               ad->wallpaper_changed = EINA_FALSE;
+       } else {
+               SETTING_TRACE("wallpaper not changed");
+       }
 }
 
 static void __setting_display_wallpaper_gallery_ug_result_cb(ui_gadget_h ug, service_h result, void *priv)
@@ -240,14 +235,17 @@ static void __setting_display_wallpaper_gallery_ug_result_cb(ui_gadget_h ug, ser
                }
 
                struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
-               setting_retm_if(cbs == NULL, "calloc failed");
+               if (!cbs) {
+                       service_destroy(service);
+                       return;
+               }
 
                cbs->layout_cb = setting_display_layout_ug_cb;
                cbs->result_cb = __setting_display_wallpaper_imageviewer_ug_result_cb;
                cbs->destroy_cb = __setting_display_wallpaper_imageviewer_ug_destroy_cb;
                cbs->priv = (void *)ad;
 
-               ad->ug_imageviewer = ug_create(ad->ug_gallery, "image-viewer-efl", UG_MODE_FULLVIEW, service, cbs);
+               ad->ug_imageviewer = ug_create(ad->ug, "image-viewer-efl", UG_MODE_FULLVIEW, service, cbs);
 
                if (NULL == ad->ug_imageviewer) {       /* error handling */
                        SETTING_TRACE_ERROR("NULL == ad->ug_imageviewer");
@@ -353,27 +351,20 @@ static int setting_display_wallpaper_create(void *cb)
        SettingDisplayUG *ad = (SettingDisplayUG *) cb; /* ad is point to cb */
        ad->cur_sel = WALLPAPER_CUR_SEL_NONE;
 
-       Evas_Object *view_layout = elm_layout_add(ad->win_main_layout);
-       elm_layout_file_set(view_layout, SETTING_THEME_EDJ_NAME, "selinfo_bottom");
-       evas_object_size_hint_weight_set(view_layout, EVAS_HINT_EXPAND, 0.0);
-       ad->view_layout = view_layout;
-
        Evas_Object *controllbar = NULL;
        Evas_Object *scroller = NULL;
+       scroller = elm_genlist_add(ad->win_main_layout);
+       elm_object_style_set(scroller, "dialogue");
+       retvm_if(scroller == NULL, SETTING_RETURN_FAIL, "Cannot set scroller object as contento of layout");
+       elm_genlist_clear(scroller);    /* first to clear list */
 
        ad->ly_wall = setting_create_layout_navi_bar(ad->win_main_layout, ad->win_get,
                                           _(KeyStr_Wallpaper),
                                           _("IDS_COM_BODY_BACK"), NULL, NULL,
                                           setting_display_wallpaper_click_softkey_cancel_cb,
-                                          NULL, NULL, ad, view_layout,
+                                          NULL, NULL, ad, scroller,
                                           &ad->navi_bar, &controllbar);
 
-       scroller = elm_genlist_add(ad->navi_bar);
-       elm_object_style_set(scroller, "dialogue");
-       retvm_if(scroller == NULL, SETTING_RETURN_FAIL, "Cannot set scroller object as contento of layout");
-       elm_genlist_clear(scroller);    /* first to clear list */
-       elm_object_part_content_set(view_layout, "elm.swallow.contents", scroller);
-
        Elm_Object_Item *item = NULL;
        item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL,
                                ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -418,6 +409,7 @@ static int setting_display_wallpaper_create(void *cb)
                return SETTING_RETURN_FAIL;
        }
 
+       ad->wallpaper_changed = EINA_FALSE;
        setting_view_display_wallpaper.is_create = 1;
 #if DISABLED_CODE
        __setting_display_wallpaper_listen_vconf_change(ad);