elementary : Backport r82851.

SVN revision: 82852

diff --git a/ChangeLog b/ChangeLog
index f27ea6cd177165b98e82e9477572b25e6dc32dcb..1b118382de39161b065694f6861f89e84ec5e9ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -706,3 +706,7 @@
 2013-01-16  Shilpa Singh <shilpa.singh@samsung.com>, Rajeev Ranjan <rajeev.r@samsung.com>
 
         * Fix "changed" signal being sent twice in case of toggle style when check is clicked.
+
+2013-01-16  WooHyun Jung
+
+        * elm_plug should call elm_widget_can_focus_set after adding parent class.

diff --git a/NEWS b/NEWS
index 0beb5594eb3fb18b9ddad6159e0739d685232fa9..248d15af6a06975233ea944211e98d12fde37584 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Fixes:
    * Fix omitting signal emission when customized text parts change the text.
    * Fix the bug which the callbacks of the sub-object are added even if the sub-object is added the parent object.
    * Fix "changed" signal being sent twice in case of toggle style when check is clicked.
+   * elm_plug should call elm_widget_can_focus_set after adding parent class.
 
 Changes since Elementary 1.7.4:
 -------------------------

diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index a12f48bd7d01d9fccb4af1872124c247435cf5f7..10c687ad8cfda9a1f4527fd4749c3e1df32dede3 100644 (file)
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -51,8 +51,6 @@ _elm_plug_smart_add(Evas_Object *obj)
 
    EVAS_SMART_DATA_ALLOC(obj, Elm_Plug_Smart_Data);
 
-   elm_widget_can_focus_set(obj, EINA_FALSE);
-
    _elm_plug_parent_sc->base.add(obj);
 
    ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
@@ -67,6 +65,7 @@ _elm_plug_smart_add(Evas_Object *obj)
      (ELM_WIDGET_DATA(priv)->resize_obj, EVAS_CALLBACK_MOUSE_UP, _on_mouse_up,
      obj);
 
+   elm_widget_can_focus_set(obj, EINA_FALSE);
    _sizing_eval(obj);
 }