AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkFileChooserButton: Also emit 'file-set' when changing the selection through the combo box

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=696498
This commit is contained in:
Federico Mena Quintero 2013-06-21 19:14:36 -05:00
parent 9162589b5a
commit 32e75adf6a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkfilechooserbutton.c
View File

@ -2712,12 +2712,15 @@ static void
combo_box_changed_cb (GtkComboBox *combo_box,
gpointer user_data)
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
GtkFileChooserButtonPrivate *priv = button->priv;
GtkTreeIter iter;
gboolean file_was_set;
file_was_set = FALSE;
if (gtk_combo_box_get_active_iter (combo_box, &iter))
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
GtkFileChooserButtonPrivate *priv = button->priv;
gchar type;
gpointer data;
@ -2736,7 +2739,10 @@ combo_box_changed_cb (GtkComboBox *combo_box,
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
if (data)
gtk_file_chooser_button_select_file (GTK_FILE_CHOOSER (button), data, NULL);
{
gtk_file_chooser_button_select_file (GTK_FILE_CHOOSER (button), data, NULL);
file_was_set = TRUE;
}
break;
case ROW_TYPE_VOLUME:
{
@ -2746,6 +2752,7 @@ combo_box_changed_cb (GtkComboBox *combo_box,
if (base_file)
{
gtk_file_chooser_button_select_file (GTK_FILE_CHOOSER (button), base_file, NULL);
file_was_set = TRUE;
g_object_unref (base_file);
}
}
@ -2757,6 +2764,9 @@ combo_box_changed_cb (GtkComboBox *combo_box,
break;
}
}
if (file_was_set)
g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
}
/* Calback for the "notify::popup-shown" signal on the combo box.