diff options
| author | Erwann Chenede - <erwann.chenede@sun.com> | 2008-08-13 13:47:02 +0000 |
|---|---|---|
| committer | Erwann Chenede <erwannc@src.gnome.org> | 2008-08-13 13:47:02 +0000 |
| commit | a82a25aa2395b3002970ffc17634f18051dd9b10 (patch) | |
| tree | 28cfc2f3e554ba95d90102c0be49cbc0a1699198 /gdk | |
| parent | b8d968aa48bdef6d4c05e327415cea4729a39c22 (diff) | |
| download | gdk-pixbuf-a82a25aa2395b3002970ffc17634f18051dd9b10.tar.gz | |
Bug 547456 - gdk/x11/gdkscreen-x11.c : init_solaris_xinerama doesn't
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.
svn path=/trunk/; revision=21107
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/gdkscreen-x11.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 0fb700591..660693330 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; |