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=/branches/gtk-2-12/; revision=21355

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 559f51527a..e6d045b422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
 	Merged from trunk:
 
+	* gtk/gtkfilechooserbutton.c (update_label_and_image): Unset
+	the image when the label is set to "(None)". Reported by
+	Neil Roberts
+
+2008-09-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
 	* gtk/gtkuimanager.c (update_node): Skip update of accelerator 
 	child node if it has no associated action. Fixes #541950.
 	Patch by Christian Neumair
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 9e31e05063..dda9308f9c 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2407,7 +2407,10 @@ 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);
+    }
 }