summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2008-05-27 20:41:44 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2008-05-27 20:41:44 +0000
commitdda04e8b56acff342b4cae033fd31eef46ffba85 (patch)
treef97803d6809437593abfa9d9c1a94ec805552ae3
parentf9995755b717a36843aaca50c66ec0a821ee1569 (diff)
downloadgdk-pixbuf-dda04e8b56acff342b4cae033fd31eef46ffba85.tar.gz
bgo533891 - disallow DnD from the file list into itself
2008-05-27 Federico Mena Quintero <federico@novell.com> Merged from trunk: http://bugzilla.gnome.org/show_bug.cgi?id=533891 - Don't allow drag and drop from the file list into itself, as it doesn't make sense (it would just change the current folder). * gtk/gtkfilechooserdefault.c (file_list_dest_targets): Use GTK_TARGET_OTHER_WIDGET so we don't DnD from the file list into Signed-off-by: Federico Mena Quintero <federico@novell.com> svn path=/branches/gtk-2-12/; revision=20195
-rw-r--r--ChangeLog12
-rw-r--r--gtk/gtkfilechooserdefault.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 708444de4..54a28c498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-27 Federico Mena Quintero <federico@novell.com>
+
+ Merged from trunk:
+
+ http://bugzilla.gnome.org/show_bug.cgi?id=533891 - Don't allow
+ drag and drop from the file list into itself, as it doesn't make
+ sense (it would just change the current folder).
+
+ * gtk/gtkfilechooserdefault.c (file_list_dest_targets): Use
+ GTK_TARGET_OTHER_WIDGET so we don't DnD from the file list into
+ itself.
+
2008-05-13 Tor Lillqvist <tml@novell.com>
Bug 496958 - Wacom Bamboo doesn't function with GTK apps in Win32
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 5c9e7cb5e..d2e1a557e 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -258,7 +258,7 @@ static const int num_file_list_source_targets = G_N_ELEMENTS (file_list_source_t
/* Target types for dropping into the file list */
static const GtkTargetEntry file_list_dest_targets[] = {
- { "text/uri-list", 0, TEXT_URI_LIST }
+ { "text/uri-list", GTK_TARGET_OTHER_WIDGET, TEXT_URI_LIST }
};
static const int num_file_list_dest_targets = G_N_ELEMENTS (file_list_dest_targets);