gnome-control-center r8852 - in trunk: . capplets/display

[jensg svn gnome org]

Author: jensg
Date: Mon Aug 11 20:30:49 2008
New Revision: 8852
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8852&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/capplets/display/ChangeLog
   trunk/capplets/display/xrandr-capplet.c
   trunk/configure.in

Modified: trunk/capplets/display/xrandr-capplet.c
==============================================================================
--- trunk/capplets/display/xrandr-capplet.c	(original)
+++ trunk/capplets/display/xrandr-capplet.c	Mon Aug 11 20:30:49 2008
@@ -1690,9 +1690,16 @@
 	return;
     }
 
+    app->screen = gnome_rr_screen_new (gdk_screen_get_default (),
+				       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->screen = gnome_rr_screen_new (gdk_screen_get_default(),
-				 on_screen_changed, app);
 
     app->dialog = glade_xml_get_widget (xml, "dialog");
 
@@ -1785,6 +1792,8 @@
     }
 
     gtk_widget_destroy (app->dialog);
+    gnome_rr_screen_destroy (app->screen);
+    g_object_unref (app->client);
 }
 
 int

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 11 20:30:49 2008
@@ -96,7 +96,7 @@
  gconf-2.0 dnl
  libgnomeui-2.0 >= 2.2.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(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)