gnome-panel r11178 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Sun Aug  3 12:11:50 2008
New Revision: 11178
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11178&view=rev

Log:
2008-08-03  Vincent Untz  <vuntz gnome org>

	* panel-multiscreen.c: (panel_multiscreen_x),
	(panel_multiscreen_y), (panel_multiscreen_width),
	(panel_multiscreen_height),
	(panel_multiscreen_is_at_visible_extreme):
	Fix assertion. Patch by Matthias Clasen <mclasen redhat com>
	Fix bug #544881


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel-multiscreen.c

Modified: trunk/gnome-panel/panel-multiscreen.c
==============================================================================
--- trunk/gnome-panel/panel-multiscreen.c	(original)
+++ trunk/gnome-panel/panel-multiscreen.c	Sun Aug  3 12:11:50 2008
@@ -147,7 +147,7 @@
 	n_screen = gdk_screen_get_number (screen);
 
 	g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
-	g_return_val_if_fail (monitor >= 0 || monitor < monitors [n_screen], 0);
+	g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
 
 	return geometries [n_screen][monitor].x;
 }
@@ -161,7 +161,7 @@
 	n_screen = gdk_screen_get_number (screen);
 
 	g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
-	g_return_val_if_fail (monitor >= 0 || monitor < monitors [n_screen], 0);
+	g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
 
 	return geometries [n_screen][monitor].y;
 }
@@ -175,7 +175,7 @@
 	n_screen = gdk_screen_get_number (screen);
 
 	g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
-	g_return_val_if_fail (monitor >= 0 || monitor < monitors [n_screen], 0);
+	g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
 
 	return geometries [n_screen][monitor].width;
 }
@@ -189,7 +189,7 @@
 	n_screen = gdk_screen_get_number (screen);
 
 	g_return_val_if_fail (n_screen >= 0 && n_screen < screens, 0);
-	g_return_val_if_fail (monitor >= 0 || monitor < monitors [n_screen], 0);
+	g_return_val_if_fail (monitor >= 0 && monitor < monitors [n_screen], 0);
 
 	return geometries [n_screen][monitor].height;
 }
@@ -253,7 +253,7 @@
 	*bottommost = TRUE;
 
 	g_return_if_fail (n_screen >= 0 && n_screen < screens);
-	g_return_if_fail (n_monitor >= 0 || n_monitor < monitors [n_screen]);
+	g_return_if_fail (n_monitor >= 0 && n_monitor < monitors [n_screen]);
 
 	get_monitor_bounds (n_screen, n_monitor, &monitor);