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

Be more robust against X breakage

Browse Source 
svn path=/trunk/; revision=22378
This commit is contained in:
Matthias Clasen
2009-02-19 19:13:10 +00:00
parent 753bebe045
commit 0bd95af21a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-02-19 Matthias Clasen <mclasen@redhat.com>
Bug 572387 – gdm crashes after gtk 2.15.4 upgrade
* gdk/x11/gdkscreen-x11.c (init_xrandr13): If X is broken and returns
no monitors, fall back to other multihead init methods, so that we
at least get one monitor set up.
2009-02-19 Michael Natterer <mitch@imendio.com> 2009-02-19 Michael Natterer <mitch@imendio.com>
* gtk/gtkmountoperation.c: sort functions so their order is more * gtk/gtkmountoperation.c: sort functions so their order is more

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

@ -735,7 +735,7 @@ init_randr13 (GdkScreen *screen)
screen_x11->n_monitors = monitors->len; screen_x11->n_monitors = monitors->len;
screen_x11->monitors = (GdkX11Monitor *)g_array_free (monitors, FALSE); screen_x11->monitors = (GdkX11Monitor *)g_array_free (monitors, FALSE);
return TRUE; return screen_x11->n_monitors > 0;
#endif #endif
return FALSE; return FALSE;