genlist: theme_object_set returns enum not bool, so now genlist check enum values 44/132244/1
authorSangHyeon Lee <sh10233.lee@samsung.com>
Fri, 2 Jun 2017 00:55:04 +0000 (09:55 +0900)
committerSangHyeon Lee <sh10233.lee@samsung.com>
Fri, 2 Jun 2017 00:55:07 +0000 (09:55 +0900)
Change-Id: If7998e36b8f10937c11e3df21b9d5062a6cb059c

src/lib/elm_genlist.c
src/mobile_lib/elm_genlist.c

index 7785ee1..7b5a9bd 100644 (file)
@@ -535,18 +535,17 @@ _view_style_find(Elm_Gen_Item *it, Evas_Object *view, const char *style)
                     sd->mode == ELM_LIST_COMPRESS ? "_compress" :
                     "",style ? : "default");
      }
-
-   if (!elm_widget_theme_object_set(WIDGET(it), view,
-                                    "genlist", buf,
-                                    elm_widget_style_get(WIDGET(it))))
-    {
+   Elm_Theme_Apply th_ret =
+      elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
+                                  elm_widget_style_get(WIDGET(it)));
+   if (th_ret == ELM_THEME_APPLY_FAILED)
+     {
        snprintf(buf2, sizeof(buf2), "item/%s", style ? : "default");
        ERR("%s is not a valid genlist item style. fallback to %s", buf, buf2);
        if (!strcmp(buf, buf2)) return EINA_FALSE;
-       if (!elm_widget_theme_object_set(WIDGET(it), view,
-                                       "genlist", buf2,
-                                       elm_widget_style_get(WIDGET(it))))
-         return EINA_FALSE;
+       th_ret = elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf2,
+                                            elm_widget_style_get(WIDGET(it)));
+       if (th_ret == ELM_THEME_APPLY_FAILED) return EINA_FALSE;
     }
 
   return EINA_TRUE;
index 379c09b..7418f5b 100644 (file)
@@ -990,8 +990,11 @@ _view_theme_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
    Eina_List *l;
 
    snprintf(buf, sizeof(buf), "item/%s", style ? : "default");
-   if (!elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
-                                    elm_widget_style_get(WIDGET(it))))
+
+   Elm_Theme_Apply th_ret =
+      elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
+                                  elm_widget_style_get(WIDGET(it)));
+   if (th_ret == ELM_THEME_APPLY_FAILED)
      {
         ERR("%s is not a valid genlist item style. "
             "Automatically falls back into default style.",