callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Erwann Chenede -
2008-08-13 13:47:02 +00:00
committed by Erwann Chenede
parent b8d968aa48
commit a82a25aa23
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-08-13 Michael Natterer <mitch@imendio.com> 2008-08-13 Michael Natterer <mitch@imendio.com>
* gtk/gtkstock.c (gtk_stock_lookup): cast the return value of * gtk/gtkstock.c (gtk_stock_lookup): cast the return value of

15
gdk/x11/gdkscreen-x11.c
View File

@ -761,20 +761,17 @@ init_solaris_xinerama (GdkScreen *screen)
*/ */
if (result == 0) if (result == 0)
{ {
/* FIXME: We need to trap errors, since return FALSE;
* XINERAMA isn't always XINERAMA.
*/
g_error ("error while retrieving Xinerama information");
} }
screen_x11->monitors = g_new0 (GdkX11Monitor, n_rects); screen_x11->monitors = g_new0 (GdkX11Monitor, n_monitors);
screen_x11->n_monitors = n_rects; 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], init_monitor_geometry (&screen_x11->monitors[i],
rects[i].x, rects[i].y, monitors[i].x, monitors[i].y,
rects[i].width, rects[i].height); monitors[i].width, monitors[i].height);
} }
return TRUE; return TRUE;