Unset the image when the label is set to "(None)". Reported by Neil

        * gtk/gtkfilechooserbutton.c (update_label_and_image): Unset
        the image when the label is set to "(None)". Reported by
        Neil Roberts

svn path=/trunk/; revision=20833

diff --git a/ChangeLog b/ChangeLog
index 7664d9dc296f9d6141a5eeb7c1958d7af4d2a0ac..11ee415dcf5298a1d21be1488f7ffdf9ca22a584 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-15  Matthias Clasen  <mclasen@redhat.com>
 
+       Bug 488766 – GtkFileChooserButton doesn't clear icon after
+       gtk_file_chooser_unselect_all
+
+       * gtk/gtkfilechooserbutton.c (update_label_and_image): Unset
+       the image when the label is set to "(None)". Reported by
+       Neil Roberts
+
        * tests/testfilechooserbutton.c: Add an "Unselect all" button.
 
 2008-07-15  Matthias Clasen  <mclasen@redhat.com>

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 5647ccc30c151b99f44bbf56af277e10a07c288a..1967d4989fd27e23df9706260dab7e6eb8193b85 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2387,12 +2387,15 @@ out:
       g_free (label_text);
     }
   else
-    gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+    {
+      gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+      gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL);
+    }
 }
 
 
 /* ************************ *
- *  Child Object Callbacks  *
+ /*  Child Object Callbacks  *
  * ************************ */
 
 /* File System */