gtk+ r21725 - in trunk: . gtk

[cdywan svn gnome org]

Author: cdywan
Date: Wed Oct 29 15:08:49 2008
New Revision: 21725
URL: http://svn.gnome.org/viewvc/gtk+?rev=21725&view=rev

Log:
Bug 558397 â gtk_widget_error_bell undefined without a screen

* gtk/gtkwidget.c (gtk_widget_error_bell): Test the settings
instance and return silently if unset

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

Modified: trunk/gtk/gtkwidget.c
==============================================================================
--- trunk/gtk/gtkwidget.c	(original)
+++ trunk/gtk/gtkwidget.c	Wed Oct 29 15:08:49 2008
@@ -6943,11 +6943,16 @@
 void
 gtk_widget_error_bell (GtkWidget *widget)
 {
+  GtkSettings* settings;
   gboolean beep;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  g_object_get (gtk_widget_get_settings (widget),
+  settings = gtk_widget_get_settings (widget);
+  if (!settings)
+    return;
+
+  g_object_get (settings,
                 "gtk-error-bell", &beep,
                 NULL);