gtk+ r21621 - in trunk: . gtk

[cdywan svn gnome org]

Author: cdywan
Date: Thu Oct  9 16:26:35 2008
New Revision: 21621
URL: http://svn.gnome.org/viewvc/gtk+?rev=21621&view=rev

Log:
Bug 555573 â gtk_font_selection_set_font_name
shouldn't require a screen

* gtk/gtkfontsel.c (gtk_font_selection_set_font_name):
Don't warn if there is no screen, just return FALSE

Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfontsel.c

Modified: trunk/gtk/gtkfontsel.c
==============================================================================
--- trunk/gtk/gtkfontsel.c	(original)
+++ trunk/gtk/gtkfontsel.c	Thu Oct  9 16:26:35 2008
@@ -1350,8 +1350,10 @@
   const gchar *new_family_name;
   
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), FALSE);
-  g_return_val_if_fail (gtk_widget_has_screen (GTK_WIDGET (fontsel)), FALSE);
-  
+
+  if (!gtk_widget_has_screen (GTK_WIDGET (fontsel)))
+    return FALSE;
+
   new_desc = pango_font_description_from_string (fontname);
   new_family_name = pango_font_description_get_family (new_desc);