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>

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 9fa5038bba5b77ef87ea72bf7846731e5569339a..d561a8b9957caec85ba51a240735ba8cea09df9f 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -716,10 +716,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 eb382130587c6280d11cc62d417e3f8105dd150a..ac5c89969fe8cb6d384c225c7762e78b54c93935 100644 (file)
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -1441,19 +1441,6 @@ static FileChooserButtonTest button_tests[] =
       NULL,                    /* final_current_folder */
       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,