fix compiler warnings

2002-10-17  Havoc Pennington  <hp@redhat.com>

	* gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
	compiler warnings

diff --git a/ChangeLog b/ChangeLog
index c0cdb29482c1a95472a2f083dcd6e54f65b7e5b6..358f4c9aa52769315d124bd11d9cfc51af9c23e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
+       compiler warnings
+
 Thu Oct 17 22:37:57 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkwindow.c (get_center_monitor_of_window): fix typo to make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c0cdb29482c1a95472a2f083dcd6e54f65b7e5b6..358f4c9aa52769315d124bd11d9cfc51af9c23e7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
+       compiler warnings
+
 Thu Oct 17 22:37:57 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkwindow.c (get_center_monitor_of_window): fix typo to make

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c0cdb29482c1a95472a2f083dcd6e54f65b7e5b6..358f4c9aa52769315d124bd11d9cfc51af9c23e7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
+       compiler warnings
+
 Thu Oct 17 22:37:57 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkwindow.c (get_center_monitor_of_window): fix typo to make

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c0cdb29482c1a95472a2f083dcd6e54f65b7e5b6..358f4c9aa52769315d124bd11d9cfc51af9c23e7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
+       compiler warnings
+
 Thu Oct 17 22:37:57 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkwindow.c (get_center_monitor_of_window): fix typo to make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c0cdb29482c1a95472a2f083dcd6e54f65b7e5b6..358f4c9aa52769315d124bd11d9cfc51af9c23e7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
+       compiler warnings
+
 Thu Oct 17 22:37:57 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkwindow.c (get_center_monitor_of_window): fix typo to make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c0cdb29482c1a95472a2f083dcd6e54f65b7e5b6..358f4c9aa52769315d124bd11d9cfc51af9c23e7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-10-17  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_compute_configure_request): fix
+       compiler warnings
+
 Thu Oct 17 22:37:57 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkwindow.c (get_center_monitor_of_window): fix typo to make

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 25c00a7d3dc3860f426049fcc080ef3d96edd784..d10f9ec5fe07801208bc84d90367dc53c7e80853 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4490,7 +4490,7 @@ clamp_window_to_rectangle (gint               *x,
   if (outside_w > 0)
     *x -= outside_w;
 
-  outside_h = (y + h) - (rect->y + rect->height);
+  outside_h = (*y + h) - (rect->y + rect->height);
   if (outside_h > 0)
     *y -= outside_h; 
 
@@ -4561,7 +4561,6 @@ gtk_window_compute_configure_request (GtkWindow    *window,
           {
             gint monitor_num;
             GdkRectangle monitor;
-            gint offscreen_w, offscreen_h;
             gint ox, oy;
             
             g_assert (GTK_WIDGET_MAPPED (parent_widget)); /* established earlier */
@@ -4596,7 +4595,6 @@ gtk_window_compute_configure_request (GtkWindow    *window,
             gint screen_height = gdk_screen_get_height (window->screen);
            gint monitor_num;
            GdkRectangle monitor;
-            gint offscreen_w, offscreen_h;
             GdkScreen *pointer_screen;
             gint px, py;