fix compiler warnings

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

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

ChangeLog

+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

ChangeLog.pre-2-10

+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

ChangeLog.pre-2-2

+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

ChangeLog.pre-2-4

+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

ChangeLog.pre-2-6

+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

ChangeLog.pre-2-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

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;