okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=f76804a0806ce5764e6d0ef67a5956d9c9d2c943

commit f76804a0806ce5764e6d0ef67a5956d9c9d2c943
Author: Stephen Houston <smhousto...@gmail.com>
Date:   Wed Dec 2 19:46:17 2015 -0600

    No need to refresh view if files are pasted in a directory other than the 
current.
---
 src/bin/ephoto_main.c          |  2 +-
 src/bin/ephoto_thumb_browser.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index e601818..dcebeea 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -460,7 +460,7 @@ ephoto_directory_set(Ephoto *ephoto, const char *path, 
Evas_Object *expanded,
    ed->thumbs_only = thumbs_only;
 
    ephoto_title_set(ephoto, NULL);
-   eina_stringshare_replace(&ephoto->config->directory, path);
+   eina_stringshare_replace(&ephoto->config->directory, 
ecore_file_realpath(path));
 
    if (ed->ephoto->job.change_dir)
       ecore_job_del(ed->ephoto->job.change_dir);
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 3f660fa..e8667c6 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -1007,7 +1007,17 @@ _copy_idler_cb(void *data)
          }
        tb->file_errors = 0;
        tb->thumbs_only = 1;
-       
+        if (strlen(destination) == strlen(tb->ephoto->config->directory))
+          {
+             if (strcmp(destination, tb->ephoto->config->directory))
+               {
+                  evas_object_del(popup);
+                  evas_object_freeze_events_set(tb->main, EINA_FALSE);
+                  elm_object_focus_set(tb->main, EINA_TRUE);
+
+                  return EINA_FALSE;
+               }
+          }
         ephoto_directory_set(tb->ephoto, tb->ephoto->config->directory, NULL,
             tb->dirs_only, tb->thumbs_only);
        ephoto_title_set(tb->ephoto, tb->ephoto->config->directory);
@@ -1790,7 +1800,6 @@ _drop_dropcb(void *data EINA_UNUSED, Evas_Object *obj, 
Elm_Object_Item *it,
    EINA_SAFETY_ON_NULL_RETURN_VAL(it, EINA_TRUE);
 
    const char *path = elm_object_item_data_get(it);
-   printf("%s\n", path);
    Eina_List *files = NULL;
    Ephoto_Thumb_Browser *tb = evas_object_data_get(obj, "thumb_browser");
 
@@ -1971,7 +1980,6 @@ _dnd_drag_data_build(Eina_List **items)
             e = elm_object_item_data_get(it);
             if (e->path)
                len += strlen(e->path);
-             printf("%s\n", e->path);
          }
 
        drag_data =

-- 


Reply via email to