Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / lib / elm_thumb.c

diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index fee178d..81efc8e 100644 (file)
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -409,7 +409,11 @@ _thumb_show(Widget_Data *wd)
 {
    evas_object_show(wd->frame);
 
+<<<<<<< HEAD
+   if (elm_thumb_ethumb_client_connected())
+=======
    if (elm_thumb_ethumb_client_connected_get())
+>>>>>>> remotes/origin/upstream
      {
         _thumb_apply(wd);
         return;
@@ -628,8 +632,11 @@ elm_thumb_file_set(Evas_Object *obj, const char *file, const char *key)
 #ifdef HAVE_ELEMENTARY_ETHUMB
    if (((file_replaced) || (key_replaced)) && (evas_object_visible_get(obj)))
      _thumb_show(wd);
+<<<<<<< HEAD
+=======
 #else
    (void)key_replaced;
+>>>>>>> remotes/origin/upstream
 #endif
 }
 
@@ -690,7 +697,11 @@ elm_thumb_ethumb_client_get(void)
 }
 
 EAPI Eina_Bool
+<<<<<<< HEAD
+elm_thumb_ethumb_client_connected(void)
+=======
 elm_thumb_ethumb_client_connected_get(void)
+>>>>>>> remotes/origin/upstream
 {
    return _elm_ethumb_connected;
 }