Apply indicator change

Change-Id: I14f44b73b674740d0fb829decb58a6f0de908548

diff --git a/configure.ac b/configure.ac
index 3210876..c6d1601 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.3.5913, isf@samsung.com)
+AC_INIT(isf, 2.3.5915, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=3
-ISF_MICRO_VERSION=5913
+ISF_MICRO_VERSION=5915
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/debian/changelog b/debian/changelog
index 30df49e..f00dc10 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isf (2.3.5915-1slp2+1) unstable; urgency=low
+
+  * Explicitly unload module before helper ISE process is finished
+  * [isf-demo-efl] Apply indicator change
+  * Git: framework/uifw/isf
+  * Tag: isf_2.3.5915-1slp2+1
+
+ -- Haifeng Deng <haifeng.deng@samsung.com>  Thu, 15 Nov 2012 16:19:00 +0900
+
 isf (2.3.5913-1slp2+1) unstable; urgency=low
 
   * fix PLM P121107-5543 po problem 

diff --git a/ism/demos/Makefile.am b/ism/demos/Makefile.am
index bd7372f..aad1188 100644 (file)
--- a/ism/demos/Makefile.am
+++ b/ism/demos/Makefile.am
@@ -41,11 +41,11 @@ isf_demo_efl_SOURCES  = isf_demo_efl.cpp \
 isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
                         @APPCORE_EFL_CFLAGS@ \
                         @UIGADGET_CFLAGS@ \
-                        @VCONF_CFLAGS@
+                        @VCONF_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@
 
 isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                         @VCONF_LIBS@ \
                         @APPCORE_EFL_LIBS@ \
-                        @UIGADGET_LIBS@
+                        @UIGADGET_LIBS@ @PRIVILEGE_CONTROL_LIBS@
 
 #isf_demo_efl_LDADD    = -lui-gadget

diff --git a/ism/demos/include/isf_demo_efl.h b/ism/demos/include/isf_demo_efl.h
index 5e80762..e0f2d22 100644 (file)
--- a/ism/demos/include/isf_demo_efl.h
+++ b/ism/demos/include/isf_demo_efl.h
@@ -38,20 +38,22 @@ struct appdata {
 
     Evas *evas;
     Evas_Object *win_main;
-    Evas_Object *layout_main;     // layout widget based on EDJ
+    Evas_Object *layout_main;     // Layout widget based on EDJ
     Evas_Object *naviframe;
 
     ui_gadget_h ug;
     int is_frameview;
 
-    // add more variables here
+    // Add more variables here
     Evas_Object *li;
     Evas_Object *ev_li;
     service_h data;
 };
 
-//utility func
-Evas_Object *_create_ef (Evas_Object *parent, const char *label, const char *guide_text);
+// Utility functions
+Evas_Object *create_ef (Evas_Object *parent, const char *label, const char *guide_text);
+void         add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title);
+
 #endif /* __ISF_DEMO_EFL_H */
 
 /*

diff --git a/ism/demos/isf_autocapital_efl.cpp b/ism/demos/isf_autocapital_efl.cpp
index 4f266aa..1728768 100644 (file)
--- a/ism/demos/isf_autocapital_efl.cpp
+++ b/ism/demos/isf_autocapital_efl.cpp
@@ -27,8 +27,7 @@
 
 static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text, Elm_Autocapital_Type autocap, Eina_Bool caps_lock_mode)
 {
-    Evas_Object *ef;
-    ef = _create_ef (parent, label, guide_text);
+    Evas_Object *ef = create_ef (parent, label, guide_text);
     Evas_Object *en = elm_object_part_content_get (ef, "elm.swallow.content");
     elm_entry_autocapital_type_set (en, autocap);
 
@@ -40,34 +39,6 @@ static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, c
     return ef;
 }
 
-static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const char *title)
-{
-    Evas_Object *scroller = NULL;
-    Evas_Object *win = NULL;
-    Evas_Object *conform = NULL;
-    struct appdata *ad = NULL;
-
-    ad = (struct appdata *) data;
-
-    win = ad->win_main;
-    // Enabling illume notification property for window
-    elm_win_conformant_set (win, EINA_TRUE);
-
-    // Creating conformant widget
-    conform = elm_conformant_add (win);
-    evas_object_size_hint_weight_set (conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (conform);
-
-    scroller = elm_scroller_add (ad->naviframe);
-
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
-    evas_object_show (scroller);
-
-    elm_object_content_set (scroller, lay_in);
-    elm_object_content_set (conform, scroller);
-    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL);
-}
-
 static Evas_Object * create_inner_layout (void *data)
 {
     struct appdata *ad = (struct appdata *)data;
@@ -123,7 +94,7 @@ static Evas_Object * create_inner_layout (void *data)
 void ise_autocapital_bt (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *lay_inner = create_inner_layout (data);
-    add_layout_to_conformant (data, lay_inner, _("Autocapital"));
+    add_layout_to_naviframe (data, lay_inner, _("Autocapital"));
 }
 
 /*

diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp
index ee7d486..659dd36 100644 (file)
--- a/ism/demos/isf_demo_efl.cpp
+++ b/ism/demos/isf_demo_efl.cpp
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <Elementary.h>
 #include <Ecore_X.h>
+#include <privilege-control.h>
 #include "isf_demo_efl.h"
 #include "isf_imcontrol_efl.h"
 #include "isf_layout_efl.h"
@@ -38,6 +39,7 @@
 
 #define BASE_THEME_WIDTH 720.0f
 
+
 static void _quit_cb (void *data, Evas_Object *obj, void *event_info)
 {
     elm_exit ();
@@ -99,7 +101,7 @@ static void result_cb (ui_gadget_h ug, service_h s, void *priv)
             free(desp);
     }
     if (name != NULL)
-        free(name);
+        free (name);
 }
 
 static void destroy_cb (ui_gadget_h ug, void *priv)
@@ -139,10 +141,10 @@ static void keyboard_setting_wizard_bt (void *data, Evas_Object *obj, void *even
     cbs.result_cb  = result_cb;
     cbs.destroy_cb = destroy_cb;
     cbs.priv       = ad;
-    service_create(&ad->data);
-    service_add_extra_data(ad->data, "navi_btn_left", _("Previous"));
-    //service_add_extra_data(ad->data, "navi_btn_left", NULL);
-    service_add_extra_data(ad->data, "navi_btn_right", _("Next"));
+    service_create (&ad->data);
+    service_add_extra_data (ad->data, "navi_btn_left", _("Previous"));
+    //service_add_extra_data (ad->data, "navi_btn_left", NULL);
+    service_add_extra_data (ad->data, "navi_btn_right", _("Next"));
     ad->ug = ug_create (NULL, "keyboard-setting-wizard-efl",
                         UG_MODE_FULLVIEW,
                         ad->data, &cbs);
@@ -273,10 +275,19 @@ static Evas_Object* create_layout_main (Evas_Object *parent)
     Evas_Object *layout = elm_layout_add (parent);
     elm_layout_theme_set (layout, "layout", "application", "default");
     evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_win_resize_object_add (parent, layout);
-
+    evas_object_size_hint_align_set (layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show (layout);
 
+    /* Put the layout inside conformant for drawing indicator in app side */
+    Evas_Object *conformant = elm_conformant_add (parent);
+    evas_object_size_hint_weight_set (conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set (conformant, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    elm_win_resize_object_add (parent, conformant);
+    elm_win_conformant_set (parent, EINA_TRUE);
+    evas_object_show (conformant);
+
+    elm_object_content_set (conformant, layout);
+
     return layout;
 }
 
@@ -305,8 +316,7 @@ static Eina_Bool _keydown_event (void *data, int type, void *event)
             bottom_it = elm_naviframe_top_item_get (ad->naviframe);
             if (top_it && bottom_it && (elm_object_item_content_get (top_it) == elm_object_item_content_get (bottom_it))) {
                 elm_exit ();
-            }
-            else {
+            } else {
                 elm_naviframe_item_pop (ad->naviframe);
             }
         }
@@ -399,6 +409,8 @@ static int app_resume (void *data)
 
 int main (int argc, char *argv[])
 {
+    set_app_privilege ("isf", NULL, NULL);
+
     struct appdata ad;
     struct appcore_ops ops;
 
@@ -420,7 +432,7 @@ static void _focused_cb(void *data, Evas_Object *obj, void *event_info)
     elm_object_signal_emit (ly, "elm,state,guidetext,hide", "elm");
 }
 
-static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info)
+static void _unfocused_cb (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *ly = (Evas_Object *)data;
 
@@ -428,8 +440,8 @@ static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info)
         elm_object_signal_emit (ly, "elm,state,guidetext,show", "elm");
 }
 
-//utility func
-Evas_Object *_create_ef (Evas_Object *parent, const char *label, const char *guide_text)
+// Utility functions
+Evas_Object *create_ef (Evas_Object *parent, const char *label, const char *guide_text)
 {
     Evas_Object *ef = NULL;
     Evas_Object *en = NULL;
@@ -450,6 +462,18 @@ Evas_Object *_create_ef (Evas_Object *parent, const char *label, const char *gui
     return ef;
 }
 
+void add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title)
+{
+    struct appdata *ad = (struct appdata *) data;
+
+    Evas_Object *scroller = elm_scroller_add (ad->naviframe);
+    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
+    evas_object_show (scroller);
+
+    elm_object_content_set (scroller, lay_in);
+    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, scroller, NULL);
+}
+
 /*
 vi:ts=4:ai:nowrap:expandtab
 */

diff --git a/ism/demos/isf_imdata_set_efl.cpp b/ism/demos/isf_imdata_set_efl.cpp
index 8cb8738..1e2eeee 100644 (file)
--- a/ism/demos/isf_imdata_set_efl.cpp
+++ b/ism/demos/isf_imdata_set_efl.cpp
@@ -25,38 +25,10 @@
 #include "isf_demo_efl.h"
 #include "isf_imdata_set_efl.h"
 
-static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const char *title)
-{
-    Evas_Object *scroller = NULL;
-    Evas_Object *win = NULL;
-    Evas_Object *conform = NULL;
-    struct appdata *ad = NULL;
-
-    ad = (struct appdata *) data;
-
-    win = ad->win_main;
-    // Enabling illume notification property for window
-    elm_win_conformant_set (win, EINA_TRUE);
-
-    // Creating conformant widget
-    conform = elm_conformant_add (win);
-    evas_object_size_hint_weight_set (conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (conform);
-
-    scroller = elm_scroller_add (ad->naviframe);
-
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
-    evas_object_show (scroller);
-
-    elm_object_content_set (scroller, lay_in);
-    elm_object_content_set (conform, scroller);
-    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL);
-}
 
 static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text)
 {
-    Evas_Object *ef = NULL;
-    ef = _create_ef (parent, label, guide_text);
+    Evas_Object *ef = create_ef (parent, label, guide_text);
     return ef;
 }
 
@@ -78,13 +50,13 @@ static Evas_Object * create_inner_layout (void *data)
 
     ef = _create_ef_layout (parent, _("ko_KR"), _("Korean Layout"));
     elm_box_pack_end (bx, ef);
-    en =  elm_object_part_content_get(ef, "elm.swallow.content");
-    elm_entry_input_panel_imdata_set (en, imdata_ko, strlen(imdata_ko));
+    en =  elm_object_part_content_get (ef, "elm.swallow.content");
+    elm_entry_input_panel_imdata_set (en, imdata_ko, strlen (imdata_ko));
 
     ef = _create_ef_layout (parent, _("en_US"), _("English layout"));
     elm_box_pack_end (bx, ef);
-    en =  elm_object_part_content_get(ef, "elm.swallow.content");
-    elm_entry_input_panel_imdata_set (en, imdata_en, strlen(imdata_en));
+    en =  elm_object_part_content_get (ef, "elm.swallow.content");
+    elm_entry_input_panel_imdata_set (en, imdata_en, strlen (imdata_en));
 
     return bx;
 }
@@ -92,7 +64,7 @@ static Evas_Object * create_inner_layout (void *data)
 void ise_imdata_set_bt (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *lay_inner = create_inner_layout (data);
-    add_layout_to_conformant (data, lay_inner, _("IM Data"));
+    add_layout_to_naviframe (data, lay_inner, _("IM Data"));
 }
 
 /*

diff --git a/ism/demos/isf_layout_efl.cpp b/ism/demos/isf_layout_efl.cpp
index d28690b..c93604a 100644 (file)
--- a/ism/demos/isf_layout_efl.cpp
+++ b/ism/demos/isf_layout_efl.cpp
@@ -150,8 +150,7 @@ _prop_change (void *data, int type, void *event)
             printf ("Keyboard state : ON.\n");
 
         _print_keyboard_geometry (ev->win);
-    }
-    else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY) {
+    } else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY) {
         printf("Keyboard Geometry Changed\n");
         _print_keyboard_geometry (ev->win);
     }
@@ -161,7 +160,7 @@ _prop_change (void *data, int type, void *event)
 
 static Evas_Object *_create_ef_layout(Evas_Object *parent, const char *label, const char *guide_text,Elm_Input_Panel_Layout layout)
 {
-    Evas_Object *ef =  _create_ef (parent, label, guide_text);
+    Evas_Object *ef = create_ef (parent, label, guide_text);
     Ecore_IMF_Context *ic = NULL;
     Evas_Object *en = elm_object_part_content_get (ef, "elm.swallow.content");
     elm_entry_input_panel_layout_set (en, layout);
@@ -183,39 +182,11 @@ static Evas_Object *_create_ef_layout(Evas_Object *parent, const char *label, co
     return ef;
 }
 
-static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const char *title)
-{
-    Evas_Object *scroller = NULL;
-    Evas_Object *win = NULL;
-    Evas_Object *conform = NULL;
-    struct appdata *ad = NULL;
-
-    ad = (struct appdata *) data;
-
-    win = ad->win_main;
-    // Enabling illume notification property for window
-    elm_win_conformant_set (win, EINA_TRUE);
-
-    // Creating conformant widget
-    conform = elm_conformant_add (win);
-    evas_object_size_hint_weight_set (conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (conform);
-
-    scroller = elm_scroller_add (ad->naviframe);
-
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
-    evas_object_show (scroller);
-
-    elm_object_content_set (scroller, lay_in);
-    elm_object_content_set (conform, scroller);
-    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL);
-}
-
 static Evas_Object * create_inner_layout (void *data)
 {
     struct appdata *ad = (struct appdata *)data;
-    Evas_Object *bx = NULL ;
-    Evas_Object *ef = NULL ;
+    Evas_Object *bx = NULL;
+    Evas_Object *ef = NULL;
     Evas_Object *parent = ad->naviframe;
 
     bx = elm_box_add (parent);
@@ -280,7 +251,7 @@ static Evas_Object * create_inner_layout (void *data)
 void ise_layout_bt (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *lay_inner = create_inner_layout (data);
-    add_layout_to_conformant (data, lay_inner, _("Layout"));
+    add_layout_to_naviframe (data, lay_inner, _("Layout"));
 }
 
 /*

diff --git a/ism/demos/isf_prediction_efl.cpp b/ism/demos/isf_prediction_efl.cpp
index ef6e41c..519de10 100644 (file)
--- a/ism/demos/isf_prediction_efl.cpp
+++ b/ism/demos/isf_prediction_efl.cpp
@@ -27,42 +27,13 @@
 
 static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text, Eina_Bool allow)
 {
-    Evas_Object *ef = NULL;
-    ef = _create_ef (parent, label, guide_text);
-    Evas_Object *en = elm_object_part_content_get (ef,"elm.swallow.content");
+    Evas_Object *ef = create_ef (parent, label, guide_text);
+    Evas_Object *en = elm_object_part_content_get (ef, "elm.swallow.content");
     elm_entry_prediction_allow_set (en, allow);
 
     return ef;
 }
 
-static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const char *title)
-{
-    Evas_Object *scroller = NULL;
-    Evas_Object *win = NULL;
-    Evas_Object *conform = NULL;
-    struct appdata *ad = NULL;
-
-    ad = (struct appdata *) data;
-
-    win = ad->win_main;
-    // Enabling illume notification property for window
-    elm_win_conformant_set (win, EINA_TRUE);
-
-    // Creating conformant widget
-    conform = elm_conformant_add (win);
-    evas_object_size_hint_weight_set (conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (conform);
-
-    scroller = elm_scroller_add (ad->naviframe);
-
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
-    evas_object_show (scroller);
-
-    elm_object_content_set (scroller, lay_in);
-    elm_object_content_set (conform, scroller);
-    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL);
-}
-
 static Evas_Object * create_inner_layout (void *data)
 {
     struct appdata *ad = (struct appdata *)data;
@@ -90,7 +61,7 @@ static Evas_Object * create_inner_layout (void *data)
 void ise_prediction_bt (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *lay_inner = create_inner_layout (data);
-    add_layout_to_conformant (data, lay_inner, _("Prediction Allow"));
+    add_layout_to_naviframe (data, lay_inner, _("Prediction Allow"));
 }
 
 /*

diff --git a/ism/demos/isf_return_key_disable_efl.cpp b/ism/demos/isf_return_key_disable_efl.cpp
index 1dd6c6c..332ffa9 100644 (file)
--- a/ism/demos/isf_return_key_disable_efl.cpp
+++ b/ism/demos/isf_return_key_disable_efl.cpp
@@ -42,42 +42,13 @@ _cursor_changed_cb(void *data, Evas_Object *obj, void *event_info)
 
 static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text)
 {
-    Evas_Object *ef = NULL;
-    ef = _create_ef(parent,label,guide_text);
-    Evas_Object *en = elm_object_part_content_get(ef,"elm.swallow.content");
+    Evas_Object *ef = create_ef (parent, label, guide_text);
+    Evas_Object *en = elm_object_part_content_get (ef, "elm.swallow.content");
     evas_object_smart_callback_add (en, "cursor,changed", _cursor_changed_cb, NULL);
 
     return ef;
 }
 
-static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const char *title)
-{
-    Evas_Object *scroller = NULL;
-    Evas_Object *win = NULL;
-    Evas_Object *conform = NULL;
-    struct appdata *ad = NULL;
-
-    ad = (struct appdata *) data;
-
-    win = ad->win_main;
-    // Enabling illume notification property for window
-    elm_win_conformant_set (win, EINA_TRUE);
-
-    // Creating conformant widget
-    conform = elm_conformant_add (win);
-    evas_object_size_hint_weight_set (conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (conform);
-
-    scroller = elm_scroller_add (ad->naviframe);
-
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
-    evas_object_show (scroller);
-
-    elm_object_content_set (scroller, lay_in);
-    elm_object_content_set (conform, scroller);
-    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL);
-}
-
 static Evas_Object * create_inner_layout (void *data)
 {
     struct appdata *ad = (struct appdata *)data;
@@ -101,7 +72,7 @@ static Evas_Object * create_inner_layout (void *data)
 void ise_return_key_disable_bt (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *lay_inner = create_inner_layout (data);
-    add_layout_to_conformant (data, lay_inner, _("Return Key Disable"));
+    add_layout_to_naviframe (data, lay_inner, _("Return Key Disable"));
 }
 
 /*

diff --git a/ism/demos/isf_return_key_type_efl.cpp b/ism/demos/isf_return_key_type_efl.cpp
index cdb4cd2..fa7868e 100644 (file)
--- a/ism/demos/isf_return_key_type_efl.cpp
+++ b/ism/demos/isf_return_key_type_efl.cpp
@@ -28,42 +28,13 @@
 
 static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text, Elm_Input_Panel_Return_Key_Type type)
 {
-    Evas_Object *ef = NULL;
-    ef = _create_ef (parent, label, guide_text);
+    Evas_Object *ef = create_ef (parent, label, guide_text);
     Evas_Object *en = elm_object_part_content_get (ef, "elm.swallow.content");
     elm_entry_input_panel_return_key_type_set (en, type);
 
     return ef;
 }
 
-static void add_layout_to_conformant (void *data, Evas_Object *lay_in, const char *title)
-{
-    Evas_Object *scroller = NULL;
-    Evas_Object *win = NULL;
-    Evas_Object *conform = NULL;
-    struct appdata *ad = NULL;
-
-    ad = (struct appdata *) data;
-
-    win = ad->win_main;
-    // Enabling illume notification property for window
-    elm_win_conformant_set (win, EINA_TRUE);
-
-    // Creating conformant widget
-    conform = elm_conformant_add (win);
-    evas_object_size_hint_weight_set (conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (conform);
-
-    scroller = elm_scroller_add (ad->naviframe);
-
-    elm_scroller_bounce_set (scroller, EINA_FALSE, EINA_TRUE);
-    evas_object_show (scroller);
-
-    elm_object_content_set (scroller, lay_in);
-    elm_object_content_set (conform, scroller);
-    elm_naviframe_item_push (ad->naviframe, title, NULL, NULL, conform, NULL);
-}
-
 static Evas_Object * create_inner_layout (void *data)
 {
     struct appdata *ad = (struct appdata *)data;
@@ -119,7 +90,7 @@ static Evas_Object * create_inner_layout (void *data)
 void ise_return_key_type_bt (void *data, Evas_Object *obj, void *event_info)
 {
     Evas_Object *lay_inner = create_inner_layout (data);
-    add_layout_to_conformant (data, lay_inner, _("Return Key Type"));
+    add_layout_to_naviframe (data, lay_inner, _("Return Key Type"));
 }
 
 /*

diff --git a/packaging/isf.spec b/packaging/isf.spec
index dcd52e3..f91aa6d 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -1,10 +1,10 @@
-#sbs-git:framework/uifw/isf isf 2.3.5913 07f2b65224e6cef5cd6799065bb01fa656bc115e
+#sbs-git:framework/uifw/isf isf 2.3.5915 07f2b65224e6cef5cd6799065bb01fa656bc115e
 %define _usrdir        /usr
 %define _ugdir %{_usrdir}/ug
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.5913
+Version:    2.3.5915
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index 9334e0e..3056a19 100755 (executable)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,8 @@
+ISF 2.3.5915 :
+  1. Explicitly unload module before helper ISE process is finished
+  2. [isf-demo-efl] Apply indicator change
+
+
 ISF 2.3.5913 :
   1.fix PLM P121107-5543 po problem