Allowing that icon/content can be set as NULL

Now, we can "remove" the icon used for the widget, in editje.

By: Fabiano Fidencio <fidencio@profusion.mobi>

SVN revision: 49705

diff --git a/src/edje_externals/elm_bubble.c b/src/edje_externals/elm_bubble.c
index e184225..76eae78 100644 (file)
--- a/src/edje_externals/elm_bubble.c
+++ b/src/edje_externals/elm_bubble.c
@@ -39,11 +39,9 @@ external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_bubble_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_bubble_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "info"))
@@ -59,12 +57,10 @@ external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *content = \
-              external_common_param_edje_object_get(obj, param);
-            if (content)
-              {
-                 elm_bubble_content_set(obj, content);
-                 return EINA_TRUE;
-              }
+                   external_common_param_edje_object_get(obj, param);
+            if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
+            elm_bubble_content_set(obj, content);
+            return EINA_TRUE;
          }
      }
 

diff --git a/src/edje_externals/elm_button.c b/src/edje_externals/elm_button.c
index f87df7e..5b8395e 100644 (file)
--- a/src/edje_externals/elm_button.c
+++ b/src/edje_externals/elm_button.c
@@ -37,11 +37,9 @@ external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_button_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_button_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
 

diff --git a/src/edje_externals/elm_check.c b/src/edje_externals/elm_check.c
index 692c5a7..ac167ca 100644 (file)
--- a/src/edje_externals/elm_check.c
+++ b/src/edje_externals/elm_check.c
@@ -41,11 +41,9 @@ external_check_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_check_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_check_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "state"))

diff --git a/src/edje_externals/elm_fileselector_button.c b/src/edje_externals/elm_fileselector_button.c
index 8dd6aa0..f4239d3 100644 (file)
--- a/src/edje_externals/elm_fileselector_button.c
+++ b/src/edje_externals/elm_fileselector_button.c
@@ -57,11 +57,9 @@ external_fileselector_button_param_set(void *data __UNUSED__, Evas_Object *obj,
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_fileselector_button_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_fileselector_button_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "path"))

diff --git a/src/edje_externals/elm_hoversel.c b/src/edje_externals/elm_hoversel.c
index ef17c3e..41f0f11 100644 (file)
--- a/src/edje_externals/elm_hoversel.c
+++ b/src/edje_externals/elm_hoversel.c
@@ -41,11 +41,9 @@ external_hoversel_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_hoversel_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_hoversel_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "horizontal"))

diff --git a/src/edje_externals/elm_progressbar.c b/src/edje_externals/elm_progressbar.c
index 6b5d997..c289952 100644 (file)
--- a/src/edje_externals/elm_progressbar.c
+++ b/src/edje_externals/elm_progressbar.c
@@ -56,11 +56,9 @@ external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Ed
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_progressbar_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_progressbar_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "value"))

diff --git a/src/edje_externals/elm_radio.c b/src/edje_externals/elm_radio.c
index 9b6bed7..bb1298a 100644 (file)
--- a/src/edje_externals/elm_radio.c
+++ b/src/edje_externals/elm_radio.c
@@ -48,11 +48,9 @@ external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_radio_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_radio_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "value"))

diff --git a/src/edje_externals/elm_slider.c b/src/edje_externals/elm_slider.c
index 0d52a10..2c82394 100644 (file)
--- a/src/edje_externals/elm_slider.c
+++ b/src/edje_externals/elm_slider.c
@@ -71,11 +71,9 @@ external_slider_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_slider_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_slider_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "min"))

diff --git a/src/edje_externals/elm_toggle.c b/src/edje_externals/elm_toggle.c
index 39eadeb..c226b43 100644 (file)
--- a/src/edje_externals/elm_toggle.c
+++ b/src/edje_externals/elm_toggle.c
@@ -57,11 +57,9 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
             Evas_Object *icon = external_common_param_icon_get(obj, param);
-            if (icon)
-              {
-                 elm_toggle_icon_set(obj, icon);
-                 return EINA_TRUE;
-              }
+            if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+            elm_toggle_icon_set(obj, icon);
+            return EINA_TRUE;
          }
      }
    else if (!strcmp(param->name, "label on"))