[gtk+/gtk-2-24] filechooserbutton: During unselect_all(), update the widgets in all situations

[Federico Mena Quintero <federico src gnome org>]

commit d09b75b9ed03f15ac6fd4a02b8b82285d7c5edea
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Mar 11 18:12:23 2013 -0600

    filechooserbutton: During unselect_all(), update the widgets in all situations
    
    Not just if we thought we had a selection.
    
    Signed-off-by: Federico Mena Quintero <federico gnome org>

 gtk/gtkfilechooserbutton.c |    6 +++---
 gtk/tests/filechooser.c    |   13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index b0d2842..bc5347e 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -680,10 +680,10 @@ gtk_file_chooser_button_unselect_all (GtkFileChooser *chooser)
        {
          g_object_unref (priv->selection_while_inactive);
          priv->selection_while_inactive = NULL;
-
-         update_label_and_image (button);
-         update_combo_box (button);
        }
+
+      update_label_and_image (button);
+      update_combo_box (button);
     }
 }
 
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index 369375d..99885ac 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -1442,19 +1442,6 @@ static FileChooserButtonTest button_tests[] =
       NULL                     /* final_filename */
     },
     {
-      "unselect-all-4",
-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-      FOLDER_NAME,             /* initial_current_folder */
-      NULL,                    /* initial_filename */
-      FALSE,                   /* open_dialog */
-      NULL,                    /* tweak_current_folder */
-      NULL,                    /* tweak_filename */
-      0,                       /* dialog_response */
-      TRUE,                    /* unselect_all */
-      NULL,                    /* final_current_folder */
-      NULL                     /* final_filename */
-    },
-    {
       "unselect-all-5",
       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
       NULL,                    /* initial_current_folder */