Merge branch 'master' into tizen_2.1

[apps/core/preloaded/settings.git] / src / setting-more-menu.c

diff --git a/src/setting-more-menu.c b/src/setting-more-menu.c
index d1dac6e..bbabcac 100755 (executable)
--- a/src/setting-more-menu.c
+++ b/src/setting-more-menu.c
@@ -1,21 +1,20 @@
 /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-#include "setting-more-menu.h"
+ * setting
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <setting-more-menu.h>
 
 static int setting_more_menu_create(void *cb);
 static int setting_more_menu_destroy(void *cb);
@@ -35,7 +34,7 @@ setting_view setting_view_more_menu = {
  *
  ***************************************************/
 const static Elm_Genlist_Item_Class itc_sep = {
-       .item_style = "dialogue/separator/21/with_line",
+       .item_style = "dialogue/separator",
        .func.text_get = NULL,
        .func.content_get = NULL,
        .func.state_get = NULL,
@@ -73,12 +72,19 @@ static int setting_more_menu_create(void *cb)
                                     setting_more_menu_click_softkey_cancel_cb,
                                     NULL, ad, &scroller, ad->navibar_main);
 
+       evas_object_smart_callback_add(scroller, "realized", __gl_realized, ad);
+
        Elm_Object_Item *item = elm_genlist_item_append(scroller, &(itc_sep),
                                       NULL, NULL,
                                       ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        load_fn(ad, Cfg_Item_Pos_Level1, scroller);
+
+       item = elm_genlist_item_append(scroller, &itc_bottom_seperator, NULL, NULL,
+                                   ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
        ad->genlist_load = scroller;
        setting_view_more_menu.is_create = 1;
        return SETTING_RETURN_SUCCESS;
@@ -97,6 +103,7 @@ static int setting_more_menu_destroy(void *cb)
                return SETTING_RETURN_SUCCESS;
        }
 
+       evas_object_smart_callback_del(ad->genlist_load, "realized", __gl_realized);
 
        elm_naviframe_item_pop(ad->navibar_main);
        ad->view_load = SETTING_VIEW_MAIN;