callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filechooserbutton: Update the combo box even after the dialog is cancelled

Browse Source 
We assumed that we didn't have to update the combo box if the dialog got cancelled,
as it should simply retain its previous contents.  But this assumption doesn't work
as the dialog is brought up with the 'Other...' item - we don't want the
combo box to keep showing 'Other...' if the dialog is cancelled.

The test from the previous commit now passes.

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
This commit is contained in:
Federico Mena Quintero
2013-03-08 12:43:10 -06:00
parent e4c2ef108c
commit f076b6bb02
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkfilechooserbutton.c
View File

@ -2982,9 +2982,6 @@ dialog_response_cb (GtkDialog *dialog,
g_signal_emit_by_name (button, "current-folder-changed");
g_signal_emit_by_name (button, "selection-changed");
update_label_and_image (button);
update_combo_box (button);
}
else
{
@ -3002,6 +2999,9 @@ dialog_response_cb (GtkDialog *dialog,
priv->active = FALSE;
}
update_label_and_image (button);
update_combo_box (button);
gtk_widget_set_sensitive (priv->combo_box, TRUE);
gtk_widget_hide (priv->dialog);