gnome-control-center r9004 - branches/gnome-2-24/capplets/display

[jensg svn gnome org]

Author: jensg
Date: Fri Sep 26 19:04:30 2008
New Revision: 9004
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9004&view=rev

Log:
2008-09-26  Jens Granseuer  <jensgr gmx net>

	Merged from trunk.

	Patch by: Matt Keenan <matt keenan sun com>

	* xrandr-capplet.c: (show_error), (run_application): show an error
	dialog instead of crashing when initialization fails due to XRandR
	not being available (bug #553762)


Modified:
   branches/gnome-2-24/capplets/display/ChangeLog
   branches/gnome-2-24/capplets/display/xrandr-capplet.c

Modified: branches/gnome-2-24/capplets/display/xrandr-capplet.c
==============================================================================
--- branches/gnome-2-24/capplets/display/xrandr-capplet.c	(original)
+++ branches/gnome-2-24/capplets/display/xrandr-capplet.c	Fri Sep 26 19:04:30 2008
@@ -62,25 +62,20 @@
 static void rebuild_gui (App *app);
 static void on_rate_changed (GtkComboBox *box, gpointer data);
 
-#if 0
 static void
-show_error (const GError *err)
+show_error (const char *err)
 {
-    if (!err)
-	return;
-
     GtkWidget *dialog = gtk_message_dialog_new (
 	NULL,
 	GTK_DIALOG_DESTROY_WITH_PARENT,
 	GTK_MESSAGE_WARNING,
-	GTK_BUTTONS_OK, err->message);
+	GTK_BUTTONS_OK, err);
 
     gtk_window_set_title (GTK_WINDOW (dialog), "");
 
     gtk_dialog_run (GTK_DIALOG (dialog));
     gtk_widget_destroy (dialog);
 }
-#endif
 
 static gboolean
 do_free (gpointer data)
@@ -1726,7 +1721,8 @@
 				       on_screen_changed, app);
     if (!app->screen)
     {
-	g_error ("Could not get screen info");
+	g_warning (_("The X server does not support the XRANDR extension.  Runtime resolution changes to the display size are not available."));
+	show_error (_("The X server does not support the XRANDR extension.  Runtime resolution changes to the display size are not available."));
 	g_object_unref (xml);
 	return;
     }