sync with upstream.

Change-Id: I869d2f7f18475e9f937830e93667608e8ec960fc

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 0491fb80686b84ca2f58fc6d2ba979662962c8af..fb3f2ae864da7a92f803e7839da32adce080acbe 100644 (file)
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -3125,7 +3125,6 @@ _wl_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
      }
 
    ecore_wl_dnd_drag_end(ecore_wl_input_get());
-
    return ECORE_CALLBACK_PASS_ON;
 }
 

diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 186e1de217444645d89114d02e4c7b188ed24b91..fe37966a6ee564f762b0e4983efbc074189ac429 100644 (file)
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -830,13 +830,6 @@ EAPI double elm_config_scale_get(void);
  */
 EAPI void   elm_config_scale_set(double scale);
 
-/*
- * Add backwards compatability implementation for elm_scale_get and elm_scale_set
- * to allow running unmodified Tizen applications on a new drop of elementary
- */
-EAPI double elm_scale_get(void);
-EAPI void   elm_scale_set(double scale);
-
 /**
  * @defgroup Password_last_show Password show last
  * @ingroup Elementary
@@ -1959,5 +1952,11 @@ EAPI double elm_config_transition_duration_factor_get(void);
  * @}
  */
 
+/*
+ * Add backwards compatability implementation for elm_scale_get and elm_scale_set
+ * to allow running unmodified Tizen applications on a new drop of elementary
+ */
+EAPI double elm_scale_get(void);
+EAPI void   elm_scale_set(double scale);
 EAPI Evas_Coord elm_finger_size_get(void);
 EAPI void       elm_finger_size_set(Evas_Coord size);

diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 4b9e9f95146572eff888657b07265bc95cf520a5..ccd14f325211c2f2123a36d187d4a26b9a7c805e 100644 (file)
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -1027,6 +1027,7 @@ _elm_datetime_field_limit_set(Eo *obj, Elm_Datetime_Data *sd, Elm_Datetime_Field
 
    if (!_field_cmp(fieldtype, &old_time, &sd->curr_time))
      eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL));
+
 }
 
 EOLIAN static Eina_Bool

diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index a58a2913d4a9f2462ff2f8657ebb754fbb02fb39..9dd9e3646a858423506f461bb9197db0a1b94dd8 100644 (file)
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -391,14 +391,7 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
             [[Set the input panel layout of the entry.]]
          }
          get {
-            [[@
-            Get the input panel layout of the entry
-
-            @return layout type. It returns ELM_INPUT_PANEL_LAYOUT_INVALID(8) when it fails.
-
-            @see elm_entry_input_panel_layout_set
-
-            @ingroup Entry ]]
+            [[Get the input panel layout of the entry.]]
          }
          values {
             layout: Elm.Input.Panel.Layout(Elm.Input.Panel.Layout.invalid); [[layout type.]]

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 4b872081d5640b478a6a1fff65059731c44e5976..01c72ccef658f47ecd6a6018b3dcc3c59140225d 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1384,9 +1384,6 @@ _item_realize(Elm_Gen_Item *it)
           edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
         if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
-        if (it == (Elm_Gen_Item *)sd->focused_item &&
-            elm_widget_focus_highlight_enabled_get(WIDGET(it)))
-          edje_object_signal_emit(VIEW(it), "elm,state,focused", "elm");
      }
    edje_object_message_signal_process(VIEW(it));
    evas_object_show(VIEW(it));

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 8f68fa9802ba1970fd60cbcd1c76a0886e105e34..affc2bf954f991972ebac50aaa027a9257dc7ac2 100644 (file)
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -507,6 +507,7 @@ _popup_add(Elm_Slider_Data *sd, Eo *obj)
 
    // XXX popup needs to adapt to theme etc.
    sd->popup = edje_object_add(evas_object_evas_get(obj));
+   evas_object_smart_member_add(sd->popup, obj);
    if (sd->horizontal)
      _elm_theme_set(elm_widget_theme_get(obj), sd->popup, "slider", "horizontal/popup", elm_widget_style_get(obj));
    else

diff --git a/src/lib/elm_widget_photocam.h b/src/lib/elm_widget_photocam.h
index a6ab6b8fe0d7a1204c6f6c62a74ecad501d37ae2..b255ec146186d5ce1675df78f1653c170f9aa668 100644 (file)
--- a/src/lib/elm_widget_photocam.h
+++ b/src/lib/elm_widget_photocam.h
@@ -116,6 +116,7 @@ struct _Elm_Photocam_Data
 
    int          tsize;
    Evas_Object *img;  /* low res version of image (scale down == 8) */
+   int          no_smooth;
    int          preload_num;
 
    Eina_List   *grids;

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index f5df9cede43a5cf7d83a0d6bab57a0d23cbdc3bb..498bf236f1d1a8294d916fb938e2c7488c225139 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -248,7 +248,6 @@ static const char SIG_INDICATOR_PROP_CHANGED[] = "indicator,prop,changed";
 static const char SIG_ROTATION_CHANGED[] = "rotation,changed";
 static const char SIG_PROFILE_CHANGED[] = "profile,changed";
 static const char SIG_WM_ROTATION_CHANGED[] = "wm,rotation,changed";
-static const char SIG_THEME_CHANGED[] = "theme,changed";
 static const char SIG_CONFORMANT_CHANGED[] = "conformant,changed";
 static const char SIG_AUX_HINT_ALLOWED[] = "aux,hint,allowed";
 
@@ -5185,7 +5184,6 @@ _elm_win_conformant_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool conform
      ecore_wl_window_conformant_set(sd->wl.win, conformant);
 #else
    (void)conformant;
-
 #endif
 }