Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/ev-window.c
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2009-05-13 12:47:33 (GMT)
committer Carlos Garcia Campos <carlosgc@gnome.org>2009-05-13 12:47:33 (GMT)
commit5aca30a9831db84b4485fe6a5c8de5357c940d5d (patch)
treeed020abbaaa68574b05d80d44d9ce253edf126ad /shell/ev-window.c
parent308d0bf15bb3c2a1a4506f4da5fa1a5eac77e7f7 (diff)
[shell] Abort dnd operations originated in the same Evince window
Fixes bug #582077
Diffstat (limited to 'shell/ev-window.c')
-rw-r--r--shell/ev-window.c15
1 files changed, 11 insertions, 4 deletions
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) {