[gtk+] filechooserbutton: Update the combo box even after the dialog is cancelled

[Federico Mena Quintero <federico src gnome org>]

commit f076b6bb0284b59de67d5be8d53a14b5bb32e119
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Mar 8 12:43:10 2013 -0600

    filechooserbutton: Update the combo box even after the dialog is cancelled
    
    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>

 gtk/gtkfilechooserbutton.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index d61a4d9..c69157d 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -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);