gtk+ r21107 - in trunk: . gdk/x11

[erwannc svn gnome org]

Author: erwannc
Date: Wed Aug 13 13:47:02 2008
New Revision: 21107
URL: http://svn.gnome.org/viewvc/gtk+?rev=21107&view=rev

Log:
2008-08-13 Erwann Chenede - <erwann chenede sun com>

  Bug 547456 - gdk/x11/gdkscreen-x11.c : init_solaris_xinerama 
  doesn't compile on Solaris

  * gdk/x11/gdkscreen-x11.c: make init_solaris_xinerama () compile 
  when HAVE_SOLARIS_XINERAMA is defined.




Modified:
   trunk/ChangeLog
   trunk/gdk/x11/gdkscreen-x11.c

Modified: trunk/gdk/x11/gdkscreen-x11.c
==============================================================================
--- trunk/gdk/x11/gdkscreen-x11.c	(original)
+++ trunk/gdk/x11/gdkscreen-x11.c	Wed Aug 13 13:47:02 2008
@@ -761,20 +761,17 @@
    */
   if (result == 0)
     {
-      /* FIXME: We need to trap errors, since
-       * XINERAMA isn't always XINERAMA.
-       */ 
-      g_error ("error while retrieving Xinerama information");
+      return FALSE;
     }
 
-  screen_x11->monitors = g_new0 (GdkX11Monitor, n_rects);
-  screen_x11->n_monitors = n_rects;
+  screen_x11->monitors = g_new0 (GdkX11Monitor, n_monitors);
+  screen_x11->n_monitors = n_monitors;
 
-  for (i = 0; i < n_rects; i++)
+  for (i = 0; i < n_monitors; i++)
     {
       init_monitor_geometry (&screen_x11->monitors[i],
-			     rects[i].x, rects[i].y,
-			     rects[i].width, rects[i].height);
+			     monitors[i].x, monitors[i].y,
+			     monitors[i].width, monitors[i].height);
     }
   
   return TRUE;