From: Havoc Pennington <hp@redhat.com>
Date: Thu, 17 Oct 2002 21:48:30 +0000 (+0000)
Subject: fix compiler warnings
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=74e51bc10975727d321acf051ea1f83391848e95;p=~andy%2Fgtk

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 c0cdb2948..358f4c9aa 100644
--- 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 c0cdb2948..358f4c9aa 100644
--- 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 c0cdb2948..358f4c9aa 100644
--- 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 c0cdb2948..358f4c9aa 100644
--- 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 c0cdb2948..358f4c9aa 100644
--- 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 c0cdb2948..358f4c9aa 100644
--- 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 25c00a7d3..d10f9ec5f 100644
--- 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;