Assorted fixes to slideshow in lib and externals

Patch by Thiago Masaki

SVN revision: 47845

diff --git a/src/edje_externals/elm_slideshow.c b/src/edje_externals/elm_slideshow.c
index efcd9830e70de58d6f2d947981693059f8ed3bff..657f95b259f192399906e6daa80fc3ea7a4c0fbc 100644 (file)
--- a/src/edje_externals/elm_slideshow.c
+++ b/src/edje_externals/elm_slideshow.c
@@ -9,8 +9,8 @@ typedef struct _Elm_Params_Slideshow
    Eina_Bool loop_exists:1;
 } Elm_Params_Slideshow;
 
-static const char *transitions[] = { "fade", "black_fade", "horizontal", "vertical",
-                             "square"};
+static const char *transitions[] = { "fade", "black_fade", "horizontal",
+                                    "vertical", "square", NULL};
 
 static void
 external_slideshow_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index e97dc6a055f8b67c7cb014736f1b3fc8dba9c6ce..4ba6ccc4982f3475f96cbe84980bb8d6e46afc96 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -421,7 +421,7 @@ elm_slideshow_transition_set(Evas_Object *obj, const char *transition)
 EAPI const char *
 elm_slideshow_transition_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
    return wd->transition;
@@ -486,7 +486,7 @@ elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop)
 EAPI Eina_Bool
 elm_slideshow_loop_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return EINA_FALSE;
    return wd->loop;