[gnome-settings-daemon] avoid warning bubbles on virtual machines
Matthias Clasen
mclasen at fedoraproject.org
Fri Aug 27 19:33:22 UTC 2010
commit 84d6b517605609a4ebf760f3561acc7b3c122cda
Author: Matthias Clasen <mclasen at redhat.com>
Date: Fri Aug 27 15:03:42 2010 -0400
avoid warning bubbles on virtual machines
dark-config.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++
gnome-settings-daemon.spec | 9 ++++++-
2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/dark-config.patch b/dark-config.patch
new file mode 100644
index 0000000..7c7f228
--- /dev/null
+++ b/dark-config.patch
@@ -0,0 +1,57 @@
+--- gnome-settings-daemon-2.31.6/plugins/xrandr/gsd-xrandr-manager.c 2010-08-02 17:54:13.000000000 -0400
++++ foo/plugins/xrandr/gsd-xrandr-manager.c 2010-08-27 14:48:39.506158001 -0400
+@@ -684,6 +684,7 @@
+ /* Turn on the laptop, disable everything else */
+ GnomeRRConfig *result = gnome_rr_config_new_current (screen);
+ int i;
++ gboolean all_off = TRUE;
+
+ for (i = 0; result->outputs[i] != NULL; ++i) {
+ GnomeOutputInfo *info = result->outputs[i];
+@@ -694,12 +695,18 @@
+ result = NULL;
+ break;
+ }
++ all_off = FALSE;
+ }
+ else {
+ info->on = FALSE;
+ }
+ }
+
++ if (all_off) {
++ gnome_rr_config_free (result);
++ result = NULL;
++ }
++
+ print_configuration (result, "Laptop setup");
+
+ /* FIXME - Maybe we should return NULL if there is more than
+@@ -751,6 +758,7 @@
+ static GnomeRRConfig *
+ make_other_setup (GnomeRRScreen *screen)
+ {
++ gboolean all_off = TRUE;
+ /* Turn off all laptops, and make all external monitors clone
+ * from (0, 0)
+ */
+@@ -765,11 +773,18 @@
+ info->on = FALSE;
+ }
+ else {
+- if (info->connected)
++ if (info->connected) {
+ turn_on (screen, info, 0, 0);
++ all_off = FALSE;
++ }
+ }
+ }
+
++ if (all_off) {
++ gnome_rr_config_free (result);
++ result = NULL;
++ }
++
+ print_configuration (result, "other setup");
+
+ return result;
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index b6af52d..1a144fc 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.31.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -39,6 +39,9 @@ Patch3: slight-hinting.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=610319
Patch4: keyboard-icon.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=628056
+Patch5: dark-config.patch
+
%description
A daemon to share settings from GNOME to other applications. It also
handles global keybindings, as well as a number of desktop-wide settings.
@@ -58,6 +61,7 @@ developing applications that use %{name}.
%setup -q
%patch3 -p1 -b .slight-hinting
%patch4 -p1 -b .keyboard-icon
+%patch5 -p1 -b .dark-config
%build
# https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
@@ -129,6 +133,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Fri Aug 27 2010 Matthias Clasen <mclasen at redhat.com> 2.31.6-2
+- Fix a problem with warning bubbles in virtual machines (#624624)
+
* Tue Aug 3 2010 Matthias Clasen <mclasen at redhat.com> 2.31.6-1
- Update to 2.31.6
More information about the scm-commits
mailing list