From: hermet Date: Thu, 17 Nov 2011 00:42:14 +0000 (+0000) Subject: elemlentary - minor changes. X-Git-Tag: REL_F_I9500_20111128_2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66bd14eac74087a8b7c1e579b0412f710879e9b9;p=framework%2Fuifw%2Felementary.git elemlentary - minor changes. guarantee the compatibility for priveous content_set/get/unset changes. git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@65320 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c index 9d90e43..89f8925 100644 --- a/src/lib/elc_player.c +++ b/src/lib/elc_player.c @@ -456,7 +456,7 @@ _double_to_time(double value) static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) { - if (!part || strcmp(part, "video")) return; + if (part && strcmp(part, "video")) return; #ifdef HAVE_EMOTION ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c index dd463e9..99d4157 100644 --- a/src/lib/elm_bg.c +++ b/src/lib/elm_bg.c @@ -122,7 +122,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd; - if (!part || strcmp(part, "overlay")) return; + if (part && strcmp(part, "overlay")) return; wd = elm_widget_data_get(obj); if (!wd) return; @@ -146,7 +146,7 @@ _content_get_hook(const Evas_Object *obj, const char *part) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; - if (!part || strcmp(part, "overlay")) return NULL; + if (part && strcmp(part, "overlay")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; return wd->overlay; @@ -158,7 +158,7 @@ _content_unset_hook(Evas_Object *obj, const char *part) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; Evas_Object *overlay; - if (!part || strcmp(part, "overlay")) return NULL; + if (part && strcmp(part, "overlay")) return NULL; wd = elm_widget_data_get(obj); if (!wd || !wd->overlay) return NULL; overlay = wd->overlay; diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index 53765ea..77bef04 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -238,7 +238,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd; - if (strcmp(part, "icon")) return; + if (part && strcmp(part, "icon")) return; wd = elm_widget_data_get(obj); if (!wd) return; if (wd->icon == content) return; @@ -263,7 +263,7 @@ _content_get_hook(const Evas_Object *obj, const char *part) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; - if (strcmp(part, "icon")) return NULL; + if (part && strcmp(part, "icon")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; return wd->icon; @@ -275,7 +275,7 @@ _content_unset_hook(Evas_Object *obj, const char *part) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; - if (strcmp(part, "icon")) return NULL; + if (part && strcmp(part, "icon")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; if (!wd->icon) return NULL; diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c index 9ada9fb..205455b 100644 --- a/src/lib/elm_progressbar.c +++ b/src/lib/elm_progressbar.c @@ -202,7 +202,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd; - if (!part || strcmp(part, "icon")) return; + if (part && strcmp(part, "icon")) return; wd = elm_widget_data_get(obj); if (!wd) return; if (wd->icon == content) return; @@ -226,7 +226,7 @@ _content_get_hook(const Evas_Object *obj, const char *part) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; - if (!part || strcmp(part, "icon")) return NULL; + if (part && strcmp(part, "icon")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; return wd->icon; @@ -238,7 +238,7 @@ _content_unset_hook(Evas_Object *obj, const char *part) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; Evas_Object *icon; - if (!part || strcmp(part, "icon")) return NULL; + if (part && strcmp(part, "icon")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; if (!wd->icon) return NULL; diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index 032e072..c111130 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -277,7 +277,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd; - if (!part || strcmp(part, "icon")) return; + if (part && strcmp(part, "icon")) return; wd = elm_widget_data_get(obj); if (!wd) return; if (wd->icon == content) return; @@ -302,7 +302,7 @@ _content_get_hook(const Evas_Object *obj, const char *part) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; - if (!part || strcmp(part, "icon")) return NULL; + if (part && strcmp(part, "icon")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; return wd->icon; @@ -314,7 +314,7 @@ _content_unset_hook(Evas_Object *obj, const char *part) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; Evas_Object *icon; - if (!part || strcmp(part, "icon")) return NULL; + if (part && strcmp(part, "icon")) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; if (!wd->icon) return NULL; diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 2407392..bd6ca90 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -602,8 +602,7 @@ static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) { ELM_CHECK_WIDTYPE(obj, widtype); - if (!part) return; - if (!strcmp(part, "icon")) + if (!part || !strcmp(part, "icon")) _icon_set(obj, content); else if (!strcmp(part, "end")) _end_set(obj, content); @@ -614,10 +613,9 @@ _content_get_hook(const Evas_Object *obj, const char *part) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd; - if (!part) return NULL; wd = elm_widget_data_get(obj); if (!wd) return NULL; - if (!strcmp(part, "icon")) + if (!part || !strcmp(part, "icon")) return wd->icon; else if (!strcmp(part, "end")) return wd->end; @@ -628,8 +626,7 @@ static Evas_Object * _content_unset_hook(Evas_Object *obj, const char *part) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; - if (!part) return NULL; - if (!strcmp(part, "icon")) + if (!part || !strcmp(part, "icon")) return _icon_unset(obj); else if (!strcmp(part, "end")) return _end_unset(obj);