Merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-649809 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

Proposed by Rodrigo Moya on 2011-03-29
Status: Merged
Merged at revision: 137
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-649809
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 57 lines (+36/-1)
3 files modified
debian/changelog (+8/-0)
debian/patches/93_wait_for_xsettings.patch (+27/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-649809
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2011-03-29 Pending
Review via email: mp+55346@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-23 17:42:53 +0000
3+++ debian/changelog 2011-03-29 14:18:37 +0000
4@@ -1,3 +1,11 @@
5+gnome-settings-daemon (2.32.1-0ubuntu12) natty; urgency=low
6+
7+ * debian/patches/93_wait_for_xsettings.patch:
8+ - Add patch to avoid race condition between gdm's gnome-settings-daemon
9+ and user's (LP: #649809)
10+
11+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Tue, 29 Mar 2011 10:26:47 +0200
12+
13 gnome-settings-daemon (2.32.1-0ubuntu11) natty; urgency=low
14
15 * debian/patches/92_datetime_fixups.patch:
16
17=== added file 'debian/patches/93_wait_for_xsettings.patch'
18--- debian/patches/93_wait_for_xsettings.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/93_wait_for_xsettings.patch 2011-03-29 14:18:37 +0000
20@@ -0,0 +1,27 @@
21+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
22+index 709d9f8..fdad93c 100644
23+--- a/plugins/xsettings/gsd-xsettings-manager.c
24++++ b/plugins/xsettings/gsd-xsettings-manager.c
25+@@ -583,12 +583,20 @@ setup_xsettings_managers (GnomeXSettingsManager *manager)
26+ int n_screens;
27+ gboolean res;
28+ gboolean terminated;
29++ gint tries = 0;
30+
31+ display = gdk_display_get_default ();
32+ n_screens = gdk_display_get_n_screens (display);
33+
34+- res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
35+- gdk_screen_get_number (gdk_screen_get_default ()));
36++ do {
37++ res = xsettings_manager_check_running (gdk_x11_display_get_xdisplay (display),
38++ gdk_screen_get_number (gdk_screen_get_default ()));
39++ if (res) {
40++ g_usleep (100000);
41++ tries++;
42++ }
43++ } while (res && tries <= 20);
44++
45+ if (res) {
46+ g_warning ("You can only run one xsettings manager at a time; exiting");
47+ return FALSE;
48
49=== modified file 'debian/patches/series'
50--- debian/patches/series 2011-03-23 17:42:53 +0000
51+++ debian/patches/series 2011-03-29 14:18:37 +0000
52@@ -15,4 +15,4 @@
53 45_support_new_video_key.patch
54 91_update_gvc_source.patch
55 92_datetime_fixups.patch
56-
57+93_wait_for_xsettings.patch

Subscribers

People subscribed via source and target branches

to all changes: