Handle gtk_window_get_geometry_info() returning NULL. (#107311, John

Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_get_default_size): Handle
        gtk_window_get_geometry_info() returning NULL.
        (#107311, John Finlay)

ChangeLog

+Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
+	gtk_window_get_geometry_info() returning NULL.
+	(#107311, John Finlay)
+
 Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

ChangeLog.pre-2-10

+Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
+	gtk_window_get_geometry_info() returning NULL.
+	(#107311, John Finlay)
+
 Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

ChangeLog.pre-2-4

+Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
+	gtk_window_get_geometry_info() returning NULL.
+	(#107311, John Finlay)
+
 Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

ChangeLog.pre-2-6

+Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
+	gtk_window_get_geometry_info() returning NULL.
+	(#107311, John Finlay)
+
 Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

ChangeLog.pre-2-8

+Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
+	gtk_window_get_geometry_info() returning NULL.
+	(#107311, John Finlay)
+
 Thu Jun  5 19:24:33 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

gtk/gtkwindow.c

@@ -2953,10 +2953,10 @@ gtk_window_get_default_size (GtkWindow *window,
   info = gtk_window_get_geometry_info (window, FALSE);
 
   if (width)
-    *width = info->default_width;
+    *width = info ? info->default_width : -1;
 
   if (height)
-    *height = info->default_height;
+    *height = info ? info->default_height : -1;
 }
 
 /**