Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary

diff --git a/packaging/elementary.spec b/packaging/elementary.spec
new file mode 100644 (file)
index 0000000..f7d9238
--- /dev/null
+++ b/packaging/elementary.spec
@@ -0,0 +1,101 @@
+Name:       elementary
+Summary:    EFL toolkit for small touchscreens
+Version:    0.7.0.svn61256
+Release:    1
+Group:      TO_BE/FILLED_IN
+License:    LGPL
+URL:        http://trac.enlightenment.org/e/wiki/Elementary
+Source0:    elementary-%{version}.tar.bz2
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires:  pkgconfig(ecore)
+BuildRequires:  pkgconfig(ecore-evas)
+BuildRequires:  pkgconfig(ecore-fb)
+BuildRequires:  pkgconfig(ecore-file)
+BuildRequires:  pkgconfig(ecore-imf)
+BuildRequires:  pkgconfig(ecore-x)
+BuildRequires:  pkgconfig(edbus)
+BuildRequires:  pkgconfig(edje)
+BuildRequires:  pkgconfig(eet)
+BuildRequires:  pkgconfig(efreet)
+BuildRequires:  pkgconfig(eina)
+BuildRequires:  pkgconfig(ethumb)
+BuildRequires:  pkgconfig(evas)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  edje-bin
+BuildRequires:  embryo-bin
+BuildRequires:  eet-bin
+BuildRequires:  libjpeg-devel
+BuildRequires:  desktop-file-utils
+
+%description
+Elementary - a basic widget set that is easy to use based on EFL for mobile This package contains devel content.
+
+%package devel
+Summary:    EFL toolkit (devel)
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description devel
+EFL toolkit for small touchscreens (devel)
+
+%package bin
+Summary:    EFL toolkit (devel)
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description bin
+EFL toolkit for small touchscreens (devel)
+
+
+%prep
+%setup -q -n %{name}
+
+%build
+
+%autogen --disable-static
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+desktop-file-install --delete-original       \
+  --dir %{buildroot}%{_datadir}/applications             \
+   %{buildroot}%{_datadir}/applications/*.desktop
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+/usr/lib/*.so.0
+/usr/share/elementary/images/*
+/usr/share/elementary/config/default/*
+/usr/share/elementary/config/illume/*
+/usr/share/elementary/config/standard/*
+/usr/share/elementary/config/profile.cfg
+/usr/lib/elementary/modules/*/*/*.so
+/usr/lib/libelementary*.so.*
+/usr/share/applications/*.desktop
+/usr/share/elementary/objects/*.edj
+/usr/share/elementary/edje_externals/*.edj
+/usr/share/icons/elementary.png
+/usr/share/elementary/themes/*.edj
+/usr/share/elementary/config/slp/*
+/usr/lib/edje/modules/elm/*/module.so
+
+%files devel
+%defattr(-,root,root,-)
+/usr/include/elementary-0/*.h
+/usr/lib/libelementary.so
+/usr/lib/pkgconfig/elementary.pc
+
+%files bin
+%defattr(-,root,root,-)
+/usr/bin/elementary_*
+/usr/lib/elementary_testql.so
+

diff --git a/src/edje_externals/elm_searchbar.c b/src/edje_externals/elm_searchbar.c
index f34e527..1fa6186 100644 (file)
--- a/src/edje_externals/elm_searchbar.c
+++ b/src/edje_externals/elm_searchbar.c
@@ -16,8 +16,6 @@ external_searchbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void
    else if (from_params) p = from_params;
    else return;
 
-   //if (p->base.label)
-   //  elm_searchbar_text_set(obj, p->base.label);
    if (p->cancel_button_animation_exists)
       elm_searchbar_cancel_button_animation_set(obj, p->cancel_button_animation);
 }
@@ -25,15 +23,8 @@ external_searchbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void
 static Eina_Bool
 external_searchbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
 {
-   if (!strcmp(param->name, "label"))
-     {
-        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
-          {
-             elm_searchbar_text_set(obj, param->s);
-             return EINA_TRUE;
-          }
-     }
-   else if (!strcmp(param->name, "cancel_button_animation"))
+
+   if (!strcmp(param->name, "cancel_button_animation"))
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
           {
@@ -51,15 +42,7 @@ external_searchbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje
 static Eina_Bool
 external_searchbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
 {
-   if (!strcmp(param->name, "label"))
-     {
-        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
-          {
-             param->s = elm_searchbar_text_get((Evas_Object *)obj);
-             return EINA_TRUE;
-          }
-     }
-   else if (!strcmp(param->name, "cancel_button_animation"))
+   if (!strcmp(param->name, "cancel_button_animation"))
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
           {
@@ -82,7 +65,7 @@ external_searchbar_params_parse(void *data __UNUSED__,
    Edje_External_Param *param;
    const Eina_List *l;
 
-   //mem = external_common_params_parse(Elm_Params_Searchbar, data, obj, params);
+   mem = calloc(1, sizeof(Elm_Params_Searchbar));
    if (!mem)
       return NULL;
 
@@ -90,7 +73,7 @@ external_searchbar_params_parse(void *data __UNUSED__,
      {
         if (!strcmp(param->name, "cancel_button_animation"))
           {
-             mem->cancel_button_animation = param->i;
+             mem->cancel_button_animation = !!param->i;
              mem->cancel_button_animation_exists = EINA_TRUE;
           }
      }
@@ -109,7 +92,8 @@ static Evas_Object *external_searchbar_content_get(void *data __UNUSED__,
 static void
 external_searchbar_params_free(void *params)
 {
-   external_common_params_free(params);
+   Elm_Params_Searchbar *mem = params;
+   free(params);
 }
 
 static Edje_External_Param_Info external_searchbar_params[] = {

diff --git a/src/lib/elm_editfield.c b/src/lib/elm_editfield.c
index b632fb5..e20e63d 100644 (file)
--- a/src/lib/elm_editfield.c
+++ b/src/lib/elm_editfield.c
@@ -158,7 +158,7 @@ static void
 _show_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if ((!wd) && (!wd->entry)) return;
+   if (!wd) return;
    if (wd->editing && wd->single_line)  // FIXME : single_line is not needed for this conditional state after TEXTBLOCK fixing
      elm_object_focus(wd->entry);
 }

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 1ca27f8..8d4f861 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -147,6 +147,7 @@ struct _Widget_Data
    Eina_List *text_filters;
    Eina_List *match_list;
    Ecore_Job *matchlist_job;
+   int matchlist_threshold;
    Ecore_Job *hovdeljob;
    Mod_Api *api; // module api if supplied
    int cursor_pos;
@@ -179,7 +180,6 @@ struct _Widget_Data
    Eina_Bool autoperiod : 1;
    Eina_Bool matchlist_list_clicked : 1;
    Eina_Bool matchlist_case_sensitive : 1;
-   int matchlist_threshold;
 };
 
 struct _Elm_Entry_Context_Menu_Item