summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-01-28 22:36:47 -0500
committerMatthias Clasen <mclasen@redhat.com>2015-01-29 21:29:22 -0500
commit0367f785efe42954b3b889c8bd9decdb1b72a930 (patch)
tree93c7f5859e24fd81df7bf9bd75827bc0993c4d69
parent1c8b77637abad21e30aaa8ac4963485b9e0e6e59 (diff)
downloadgtk+-0367f785efe42954b3b889c8bd9decdb1b72a930.tar.gz
file chooser button: Make dnd work as expected
Update the button contents when accepting a drop. https://bugzilla.gnome.org/show_bug.cgi?id=743451
-rw-r--r--gtk/gtkfilechooserbutton.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 455d21755c..810e5426b5 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1126,8 +1126,7 @@ dnd_select_folder_get_info_cb (GCancellable *cancellable,
data->selected =
(((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) ||
(data->action == GTK_FILE_CHOOSER_ACTION_OPEN && !is_folder)) &&
- gtk_file_chooser_select_file (GTK_FILE_CHOOSER (data->button->priv->dialog),
- data->file, NULL));
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (data->button), data->file, NULL));
}
else
data->selected = FALSE;
@@ -1217,8 +1216,7 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
case TEXT_PLAIN:
text = (char*) gtk_selection_data_get_text (data);
file = g_file_new_for_uri (text);
- gtk_file_chooser_select_file (GTK_FILE_CHOOSER (priv->dialog), file,
- NULL);
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (priv->dialog), file, NULL);
g_object_unref (file);
g_free (text);
g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);