diff --git a/ChangeLog b/ChangeLog index 93308a10dd..8196dea14e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 5 20:12:51 2003 Owen Taylor + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 93308a10dd..8196dea14e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Jun 5 20:12:51 2003 Owen Taylor + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 93308a10dd..8196dea14e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Jun 5 20:12:51 2003 Owen Taylor + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 93308a10dd..8196dea14e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Jun 5 20:12:51 2003 Owen Taylor + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 93308a10dd..8196dea14e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Jun 5 20:12:51 2003 Owen Taylor + + * 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 * gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index f587d6104e..37649fe6b7 100644 --- a/gtk/gtkwindow.c +++ b/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; } /**