Merge "fixed TC bugs"

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 22511df..6e0c740 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -83,18 +83,32 @@ test_calendar.c \
 test_diskselector.c \
 test_ctxpopup.c 
 
-elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_test_LDFLAGS =
 
 elementary_config_SOURCES = \
 config.c
 
-elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@
 elementary_config_LDFLAGS =
 
 if BUILD_QUICKLAUNCH
 elementary_quicklaunch_SOURCES = quicklaunch.c
-elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_quicklaunch_LDFLAGS =
 
 if BUILD_RUN
@@ -115,7 +129,12 @@ elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
 elementary_testql_la_CFLAGS =
 elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
 elementary_testql_SOURCES = $(elementary_test_SOURCES)
-elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la
+elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
+       @ELEMENTARY_EWEATHER_LIBS@ \
+       @ELEMENTARY_EDBUS_LIBS@ \
+       @ELEMENTARY_EFREET_LIBS@ \
+       @ELEMENTARY_LIBS@ \
+       @my_libs@
 elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
 elementary_testql_LDFLAGS =
 endif

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index f4f095d..1d7dde3 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1883,7 +1883,7 @@ extern "C" {
    EAPI void               elm_genlist_edit_selected_items_del(Evas_Object *obj);
    EAPI Eina_List         *elm_genlist_edit_selected_items_get(const Evas_Object *obj);
    EAPI void               elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it, Eina_Bool selected) EINA_ARG_NONNULL(1);
-   EAPI const Eina_Bool    elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);;
+   EAPI Eina_Bool          elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it) EINA_ARG_NONNULL(1);
    EAPI Evas_Object       *elm_genlist_item_rename_mode_set(Elm_Genlist_Item *it, int emode);
    EAPI void               elm_genlist_item_move_after(Elm_Genlist_Item *it, Elm_Genlist_Item *after );
    EAPI void               elm_genlist_item_move_before(Elm_Genlist_Item *it, Elm_Genlist_Item *before);

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index be14c12..5c51571 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -98,7 +98,6 @@ elm_colorselector.c \
 elm_colorpalette.c \
 elc_ctxpopup.c \
 elm_controlbar.c \
-elm_slidingdrawer.c \ 
 elm_dialoguegroup.c \
 elm_dayselector.c \
 elm_cnp_helper.c \
@@ -108,6 +107,7 @@ elm_nocontents.c \
 elm_tickernoti.c \
 elm_imageslider.c \
 elm_multibuttonentry.c \
+elm_slidingdrawer.c \
 elm_stackedicon.c \
 elm_calendar.c \
 elm_font.c \

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 40b20ee..4fc29ae 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -6472,7 +6472,7 @@ elm_genlist_edit_item_selected_set(Elm_Genlist_Item *it,
 }
 
 // TODO : add comment                              
-EAPI const Eina_Bool
+EAPI Eina_Bool
 elm_genlist_edit_item_selected_get(const Elm_Genlist_Item *it)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);

diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index 1db16fd..b1b0c9f 100644 (file)
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -42,6 +42,8 @@ static void _del_hook(Evas_Object *obj)
 static void _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   char buf[4096];
+
    if (!wd) return;
 
    _elm_theme_object_set(obj, wd->base, "searchbar", "base", elm_widget_style_get(obj));
@@ -51,6 +53,12 @@ static void _theme_hook(Evas_Object *obj)
    if (wd->cancel_btn)
      edje_object_part_swallow(wd->base, "button_cancel", wd->cancel_btn);
 
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->eb, buf);
+
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->cancel_btn, buf);
+
    edje_object_scale_set(wd->cancel_btn, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
@@ -127,15 +135,23 @@ static void _cancel_clicked(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-_searchicon_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+_basebg_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
+
    if (!wd) return;
 
-   if (!strcmp(source, "search_icon"))
-     evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
-   else if (!strcmp(source, "base_bg"))
-     _clicked(data, obj, NULL); //emission, source);
+   if (!strcmp(source, "base_bg"))
+      _clicked(data, obj, NULL);
+}
+
+static void
+_searchsymbol_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+
+   if (!wd) return;
+   evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL);
 }
 
 /**
@@ -150,6 +166,7 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
    Evas_Object *obj;
    Evas *e;
    Widget_Data *wd;
+   char buf[4096];
 
    wd = ELM_NEW(Widget_Data);
    e = evas_object_evas_get(parent);
@@ -174,21 +191,27 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
 
    // Add Entry
    wd->eb = elm_editfield_add(parent);
-   elm_object_style_set(wd->eb, "searchbar");
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->eb, buf);
+
    edje_object_part_swallow(wd->base, "search_textfield", wd->eb);
 //   elm_editfield_guide_text_set(wd->eb, "Search");
    elm_editfield_entry_single_line_set(wd->eb, EINA_TRUE);
    elm_editfield_eraser_set(wd->eb, EINA_TRUE);
    evas_object_smart_callback_add(wd->eb, "clicked", _clicked, obj);
    evas_object_smart_callback_add(elm_editfield_entry_get(wd->eb), "changed", _changed, obj);
-   edje_object_signal_callback_add(wd->base, "mouse,up,1", "*", _searchicon_clicked, obj);
+   edje_object_signal_callback_add(wd->base, "mouse,up,1", "*", _basebg_clicked, obj);
+   edje_object_signal_callback_add(wd->base, "elm,action,click", "", _searchsymbol_clicked, obj);
 
    elm_widget_sub_object_add(obj, wd->eb);
 
    // Add Button
    wd->cancel_btn = elm_button_add(parent);
    edje_object_part_swallow(wd->base, "button_cancel", wd->cancel_btn);
-   elm_object_style_set(wd->cancel_btn, "custom/darkblue");
+
+   snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
+   elm_object_style_set(wd->cancel_btn, buf);
+
    elm_button_label_set(wd->cancel_btn, "Cancel");
    evas_object_smart_callback_add(wd->cancel_btn, "clicked", _cancel_clicked, obj);
    elm_widget_sub_object_add(obj, wd->cancel_btn);

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 31a5b39..355b7b8 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2293,7 +2293,7 @@ elm_win_indicator_state_get(Evas_Object *obj)
         unsigned int *prop_data = NULL;
 
         ret = ecore_x_window_prop_property_get (win->xwin,
-                    ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count);
+                    ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, ECORE_X_ATOM_CARDINAL, 32, (void *)&prop_data, &count);
         if( ret && prop_data )
            memcpy (&show, prop_data, sizeof (int));