14502N/A--- gnome-control-center-2.23.90.old/capplets/display/xrandr-capplet.c 2008-09-25 12:15:58.397603000 +0100

14502N/A+++ gnome-control-center-2.23.90/capplets/display/xrandr-capplet.c 2008-09-25 12:16:06.376162000 +0100

14502N/A@@ -62,9 +62,8 @@ struct App

14502N/A static void rebuild_gui (App *app);

14502N/A static void on_rate_changed (GtkComboBox *box, gpointer data);

14502N/A

14502N/A-#if 0

14502N/A static void

14502N/A-show_error (const GError *err)

14502N/A+show_error (const char *err)

14502N/A {

14502N/A if (!err)

14502N/A return;

14502N/A@@ -73,14 +72,13 @@ show_error (const GError *err)

14502N/A NULL,

14502N/A GTK_DIALOG_DESTROY_WITH_PARENT,

14502N/A GTK_MESSAGE_WARNING,

14502N/A- GTK_BUTTONS_OK, err->message);

14502N/A+ GTK_BUTTONS_OK, err);

14502N/A

14502N/A gtk_window_set_title (GTK_WINDOW (dialog), "");

14502N/A

14502N/A gtk_dialog_run (GTK_DIALOG (dialog));

14502N/A gtk_widget_destroy (dialog);

14502N/A }

14502N/A-#endif

14502N/A

14502N/A static gboolean

14502N/A do_free (gpointer data)

14502N/A@@ -1715,7 +1713,8 @@ run_application (App *app)

14502N/A on_screen_changed, app);

14502N/A if (!app->screen)

14502N/A {

14502N/A- g_error ("Could not get screen info");

14502N/A+ g_warning (_("The X server does not support the XRANDR extension. Runtime resolution changes to the display size are not available."));

14502N/A+ show_error (_("The X server does not support the XRANDR extension. Runtime resolution changes to the display size are not available."));

14502N/A g_object_unref (xml);

14502N/A return;

14502N/A }