Ref #202: "Set as wallpaper" doesn't work with GNOME Shell

[geeqie.git] / src / view_dir.c

diff --git a/src/view_dir.c b/src/view_dir.c
index cfe3fc2..fe0dd28 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -496,7 +496,7 @@ static void vd_pop_menu_dupe(ViewDir *vd, gint recursive)
                list = filelist_filter(list, FALSE);
                }
 
-       dw = dupe_window_new(DUPE_MATCH_NAME);
+       dw = dupe_window_new();
        dupe_window_add_files(dw, list, recursive);
 
        filelist_free(list);
@@ -865,6 +865,10 @@ void vd_dnd_drop_scroll_cancel(ViewDir *vd)
 static gboolean vd_auto_scroll_idle_cb(gpointer data)
 {
        ViewDir *vd = data;
+#if GTK_CHECK_VERSION(3,0,0)
+       GdkDeviceManager *device_manager;
+       GdkDevice *device;
+#endif
 
        if (vd->drop_fd)
                {
@@ -873,7 +877,13 @@ static gboolean vd_auto_scroll_idle_cb(gpointer data)
                gint w, h;
 
                window = gtk_widget_get_window(vd->view);
+#if GTK_CHECK_VERSION(3,0,0)
+               device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
+               device = gdk_device_manager_get_client_pointer(device_manager);
+               gdk_window_get_device_position(window, device, &x, &y, NULL);
+#else
                gdk_window_get_pointer(window, &x, &y, NULL);
+#endif
                w = gdk_window_get_width(window);
                h = gdk_window_get_height(window);
                if (x >= 0 && x < w && y >= 0 && y < h)
@@ -1025,6 +1035,9 @@ gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
        GtkTreePath *tpath;
        FileData *fd = NULL;
 
+       if (vd->type == DIRVIEW_LIST && !options->view_dir_list_single_click_enter)
+               return FALSE;
+
        if (!vd->click_fd) return FALSE;
        vd_color_set(vd, vd->click_fd, FALSE);