applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fail gracefully if we cannot get a screen

Browse source 
2008-08-11  Jens Granseuer  <jensgr@gmx.net>

	* xrandr-capplet.c: (run_application): fail gracefully if we cannot
	get a screen

2008-08-11  Jens Granseuer  <jensgr@gmx.net>

	* configure.in: require gnome-desktop 2.23.90

svn path=/trunk/; revision=8852
This commit is contained in:
Jens Granseuer 2008-08-11 20:30:49 +00:00 • committed by Jens Granseuer
parent fb36ebb3a3
commit fc63bace52
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2008-08-11 Jens Granseuer <jensgr@gmx.net>
* configure.in: require gnome-desktop 2.23.90
2008-08-04 Rodrigo Moya <rodrigo@gnome-db.org> 2008-08-04 Rodrigo Moya <rodrigo@gnome-db.org>
* NEWS: * NEWS:

5
capplets/display/ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-11 Jens Granseuer <jensgr@gmx.net>
* xrandr-capplet.c: (run_application): fail gracefully if we cannot
get a screen
2008-08-08 Jens Granseuer <jensgr@gmx.net> 2008-08-08 Jens Granseuer <jensgr@gmx.net>
* xrandr-capplet.c: (on_screen_changed), (rebuild_gui), * xrandr-capplet.c: (on_screen_changed), (rebuild_gui),

13
capplets/display/xrandr-capplet.c
View file

@ -1690,9 +1690,16 @@ run_application (App *app)
return; return;
} }
app->client = gconf_client_get_default (); app->screen = gnome_rr_screen_new (gdk_screen_get_default (),
app->screen = gnome_rr_screen_new (gdk_screen_get_default(),
on_screen_changed, app); on_screen_changed, app);
if (!app->screen)
{
g_error ("Could not get screen info");
g_object_unref (xml);
return;
}
app->client = gconf_client_get_default ();
app->dialog = glade_xml_get_widget (xml, "dialog"); app->dialog = glade_xml_get_widget (xml, "dialog");
@ -1785,6 +1792,8 @@ restart:
} }
gtk_widget_destroy (app->dialog); gtk_widget_destroy (app->dialog);
gnome_rr_screen_destroy (app->screen);
g_object_unref (app->client);
} }
int int

2
configure.in
View file

@ -96,7 +96,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.11.6 dnl
gconf-2.0 dnl gconf-2.0 dnl
libgnomeui-2.0 >= 2.2.0 dnl libgnomeui-2.0 >= 2.2.0 dnl
libglade-2.0 >= 2.0.0 dnl libglade-2.0 >= 2.0.0 dnl
gnome-desktop-2.0 >= 2.23.5" gnome-desktop-2.0 >= 2.23.90"
PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0) PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0)
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0) PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)