elm photocam : add file_get()> elm slideshow test : fix a bug

SVN revision: 42857

diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c
index dec7d010e80f18e89550be8a3a5d2e41b215d2e0..19ea45623400cf654f2160e4d98f297efaa8a37f 100644 (file)
--- a/src/bin/test_slideshow.c
+++ b/src/bin/test_slideshow.c
@@ -109,7 +109,7 @@ test_slideshow(void *data, Evas_Object *obj, void *event_info)
    bx = elm_box_add(win);
    elm_box_horizontal_set(bx, 1);
    elm_notify_content_set(notify, bx);
-   evas_object_show(bt);
+   evas_object_show(bx);
 
    evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_IN, _mouse_in, notify);
    evas_object_event_callback_add(bx, EVAS_CALLBACK_MOUSE_OUT, _mouse_out, notify);

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 778888787f40de77c0ff67f24226c6f9ace8ace6..e442676d416e5f0c0f6ef5172b503c6bbcf7cec8 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -881,6 +881,7 @@ extern "C" {
      } Elm_Photocam_Zoom_Mode;
    EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
    EAPI int          elm_photocam_file_set(Evas_Object *obj, const char *file);
+   EAPI const char * elm_photocam_file_get(Evas_Object *obj);
    EAPI void         elm_photocam_zoom_set(Evas_Object *obj, int zoom);
    EAPI int          elm_photocam_zoom_get(Evas_Object *obj);
    EAPI void         elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);

diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 5782296a9c89afbef95673f1f67c18179b6a9a29..b1850ca32a8311fb8780034943ca126c43dbbd9c 100644 (file)
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -979,6 +979,20 @@ elm_photocam_file_set(Evas_Object *obj, const char *file)
    return evas_object_image_load_error_get(wd->img);
 }
 
+/*
+ * Returns the path of the current image file
+ *
+ * @param obj The photocam object
+ * @return Returns the path 
+ *
+ * @ingroup Photocam
+ */
+EAPI const char * elm_photocam_file_get(Evas_Object *obj)
+{
+    Widget_Data *wd = elm_widget_data_get(obj);
+    return wd->file;
+}
+
 /**
  * Set the zoom level of the photo
  *