From 5aca30a9831db84b4485fe6a5c8de5357c940d5d Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Wed, 13 May 2009 12:47:33 +0000
Subject: [shell] Abort dnd operations originated in the same Evince window

Fixes bug #582077
---
(limited to 'shell/ev-window.c')

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 16e10ca..7ec9aca 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -4519,10 +4519,17 @@ ev_window_drag_data_received (GtkWidget        *widget,
 			      guint             time)
 
 {
-	EvWindow *window = EV_WINDOW (widget);
-	gchar   **uris;
-	gint      i = 0;
-	GSList   *uri_list = NULL;
+	EvWindow  *window = EV_WINDOW (widget);
+	gchar    **uris;
+	gint       i = 0;
+	GSList    *uri_list = NULL;
+	GtkWidget *source;
+
+	source = gtk_drag_get_source_widget (context);
+	if (source && widget == gtk_widget_get_toplevel (source)) {
+		gtk_drag_finish (context, FALSE, FALSE, time);
+		return;
+	}
 
 	uris = gtk_selection_data_get_uris (selection_data);
 	if (!uris) {
--
cgit v0.9.1