From a82a25aa2395b3002970ffc17634f18051dd9b10 Mon Sep 17 00:00:00 2001 From: Erwann Chenede - Date: Wed, 13 Aug 2008 13:47:02 +0000 Subject: [PATCH] Bug 547456 - gdk/x11/gdkscreen-x11.c : init_solaris_xinerama doesn't 2008-08-13 Erwann Chenede - 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. svn path=/trunk/; revision=21107 --- ChangeLog | 8 ++++++++ gdk/x11/gdkscreen-x11.c | 15 ++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 750046dcef..1da9a176f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-13 Erwann Chenede - + + 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. + 2008-08-13 Michael Natterer * gtk/gtkstock.c (gtk_stock_lookup): cast the return value of diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 0fb700591d..6606933305 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -761,20 +761,17 @@ init_solaris_xinerama (GdkScreen *screen) */ 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;