small fix by Assar Westerlund <assar@sics.se>.

Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
                Assar Westerlund <assar@sics.se>.

diff --git a/ChangeLog b/ChangeLog
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index faee5583117977d903f89e7d7faac42ef6713188..8d9fc65d25f970e2cf1186a83b93f4a8c2e4a58d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 Sun Mar 15 08:27:06 1998  Tim Janik  <timj@gimp.org>
 
+       * gtk/gtkwindow.c (gtk_window_configure_event): small fix by
+       Assar Westerlund <assar@sics.se>.
+
        * gtk/gtkmenu.c (gtk_menu_key_press): don't cast a NULL pointer.
 
 Sat Mar 14 19:36:16 PST 1998 Shawn T. Amundson <amundson@gimp.org>

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 9785a36c9ec680673ad85abce8d2a2e0cdf12c1e..181f3ee85da5f1947a2efac48056e6356777f058 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -716,13 +716,14 @@ gtk_window_configure_event (GtkWidget         *widget,
   g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
   
+  window = GTK_WINDOW (widget);
+
   /* If the window was merely moved, do nothing */
   if ((widget->allocation.width == event->width) &&
       (widget->allocation.height == event->height) &&
       (window->resize_count == 0))
     return FALSE;
   
-  window = GTK_WINDOW (widget);
   window->handling_resize = TRUE;
   
   allocation.x = 0;