Author: olivier
Date: 2008-10-21 20:12:41 +0000 (Tue, 21 Oct 2008)
New Revision: 28348

Modified:
   xfce4-panel/branches/xfce_4_4/panel/panel-app.c
   xfce4-panel/trunk/panel/panel-app.c
Log:
With xrandr 1.2, monitors can be added/removed, so need to double check the 
number of monitors (bug #3620)

Modified: xfce4-panel/branches/xfce_4_4/panel/panel-app.c
===================================================================
--- xfce4-panel/branches/xfce_4_4/panel/panel-app.c     2008-10-21 19:38:56 UTC 
(rev 28347)
+++ xfce4-panel/branches/xfce_4_4/panel/panel-app.c     2008-10-21 20:12:41 UTC 
(rev 28348)
@@ -364,7 +364,11 @@
     {
         monitor = g_ptr_array_index (panel_app.monitor_list, i);
 
-        if (monitor->screen == screen)
+        /* 
+         * With xrandr 1.2, monitors can be added/removed, so need 
+         * to double check the number of monitors (bug #3620)...
+         */
+        if ((monitor->screen == screen) && (monitor->num < 
gdk_screen_get_n_monitors (screen)))
         {
             gdk_screen_get_monitor_geometry (screen, monitor->num, 
                                              &(monitor->geometry));

Modified: xfce4-panel/trunk/panel/panel-app.c
===================================================================
--- xfce4-panel/trunk/panel/panel-app.c 2008-10-21 19:38:56 UTC (rev 28347)
+++ xfce4-panel/trunk/panel/panel-app.c 2008-10-21 20:12:41 UTC (rev 28348)
@@ -428,7 +428,11 @@
     {
         monitor = g_ptr_array_index (panel_app.monitor_list, i);
 
-        if (monitor->screen == screen)
+        /* 
+         * With xrandr 1.2, monitors can be added/removed, so need 
+         * to double check the number of monitors (bug #3620)...
+         */
+        if ((monitor->screen == screen) && (monitor->num < 
gdk_screen_get_n_monitors (screen)))
         {
             gdk_screen_get_monitor_geometry (screen, monitor->num,
                                              &(monitor->geometry));

_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to