From c9b31942e54605fe757f592d747c2f4a1049ab74e545a78ebd8c43342f9320b4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 16 Jan 2009 00:31:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=25 --- gnome-settings-daemon-randr-gerror.diff | 30 ++++++++++++++++--------- gnome-settings-daemon.changes | 7 ++++++ gnome-settings-daemon.spec | 6 ++++- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/gnome-settings-daemon-randr-gerror.diff b/gnome-settings-daemon-randr-gerror.diff index 478eee9..9f05942 100644 --- a/gnome-settings-daemon-randr-gerror.diff +++ b/gnome-settings-daemon-randr-gerror.diff @@ -1,8 +1,15 @@ diff --git a/ChangeLog b/ChangeLog -index dc3cf82..24eef9e 100644 +index dc3cf82..4423ee2 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,58 @@ +@@ -1,3 +1,65 @@ ++2009-01-14 Federico Mena Quintero ++ ++ * plugins/xrandr/gsd-xrandr-manager.c (gsd_xrandr_manager_start): ++ If there was no file with a stored configuration, don't pop up an ++ error message --- this is not an error when the daemon starts up. ++ Fixes https://bugzilla.novell.com/show_bug.cgi?id=465968 ++ +2008-12-08 Jens Granseuer + + * plugins/xrandr/gsd-xrandr-manager.c: (error_message): make libnotify @@ -130,7 +137,7 @@ index 54eda77..78637e6 100644 @GSD_INTLTOOL_PLUGIN_RULE@ diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c -index 4d8ce2f..ecac754 100644 +index 4d8ce2f..fcd70c1 100644 --- a/plugins/xrandr/gsd-xrandr-manager.c +++ b/plugins/xrandr/gsd-xrandr-manager.c @@ -37,6 +37,7 @@ @@ -786,16 +793,17 @@ index 4d8ce2f..ecac754 100644 manager->priv->running = TRUE; manager->priv->client = gconf_client_get_default (); -@@ -724,21 +1162,19 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager, +@@ -724,21 +1162,20 @@ gsd_xrandr_manager_start (GsdXrandrManager *manager, gdk_error_trap_pop (); } - gnome_rr_config_apply_stored (manager->priv->rw_screen); + my_error = NULL; + if (!gnome_rr_config_apply_stored (manager->priv->rw_screen, &my_error)) { -+ /* my_error can be null if there were no stored configurations */ + if (my_error) { -+ error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL); ++ if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) ++ error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL); ++ + g_error_free (my_error); + } + } @@ -816,7 +824,7 @@ index 4d8ce2f..ecac754 100644 start_or_stop_icon (manager); return TRUE; -@@ -781,6 +1217,11 @@ gsd_xrandr_manager_stop (GsdXrandrManager *manager) +@@ -781,6 +1218,11 @@ gsd_xrandr_manager_stop (GsdXrandrManager *manager) manager->priv->rw_screen = NULL; } @@ -828,7 +836,7 @@ index 4d8ce2f..ecac754 100644 status_icon_stop (manager); } -@@ -856,6 +1297,8 @@ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass) +@@ -856,6 +1298,8 @@ gsd_xrandr_manager_class_init (GsdXrandrManagerClass *klass) object_class->dispose = gsd_xrandr_manager_dispose; object_class->finalize = gsd_xrandr_manager_finalize; @@ -837,7 +845,7 @@ index 4d8ce2f..ecac754 100644 g_type_class_add_private (klass, sizeof (GsdXrandrManagerPrivate)); } -@@ -869,6 +1312,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager) +@@ -869,6 +1313,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager) manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager); manager->priv->keycode = keycode; @@ -847,7 +855,7 @@ index 4d8ce2f..ecac754 100644 } static void -@@ -886,6 +1332,26 @@ gsd_xrandr_manager_finalize (GObject *object) +@@ -886,6 +1333,26 @@ gsd_xrandr_manager_finalize (GObject *object) G_OBJECT_CLASS (gsd_xrandr_manager_parent_class)->finalize (object); } @@ -874,7 +882,7 @@ index 4d8ce2f..ecac754 100644 GsdXrandrManager * gsd_xrandr_manager_new (void) { -@@ -895,6 +1361,11 @@ gsd_xrandr_manager_new (void) +@@ -895,6 +1362,11 @@ gsd_xrandr_manager_new (void) manager_object = g_object_new (GSD_TYPE_XRANDR_MANAGER, NULL); g_object_add_weak_pointer (manager_object, (gpointer *) &manager_object); diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index ab706d4..35ef01f 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 14 19:46:53 CST 2009 - federico@novell.com + +- Updated gnome-settings-daemon-randr-gerror.diff to fix bnc#465968 - + The RANDR plugin was displaying a confusing error message during + GDM's startup. + ------------------------------------------------------------------- Fri Jan 9 14:03:11 CST 2009 - federico@novell.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index bc86268..0286897 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -24,7 +24,7 @@ BuildRequires: fdupes gnome-common gnome-desktop-devel gnome-patch-translation License: GPL v2 or later Group: System/GUI/GNOME Version: 2.24.0 -Release: 5 +Release: 8 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff @@ -152,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jan 14 2009 federico@novell.com +- Updated gnome-settings-daemon-randr-gerror.diff to fix bnc#465968 - + The RANDR plugin was displaying a confusing error message during + GDM's startup. * Fri Jan 09 2009 federico@novell.com - Added gnome-settings-daemon-randr-gerror.diff. This makes the RANDR plugin for gnome-settings-daemon process GError arguments from the