Merge lp:~codygarver/elementaryos/fix-1018813 into lp:~elementary-os/elementaryos/pantheon-xsession-settings-luna

Proposed by Cody Garver on 2012-07-09
Status: Merged
Merged at revision: 52
Proposed branch: lp:~codygarver/elementaryos/fix-1018813
Merge into: lp:~elementary-os/elementaryos/pantheon-xsession-settings-luna
Diff against target: 32 lines (+3/-1)
3 files modified
autostart/gnome-fallback-mount-helper-pantheon.desktop (+1/-0)
autostart/gnome-screensaver-pantheon.desktop (+1/-1)
autostart/telepathy-indicator-pantheon.desktop (+1/-0)
To merge this branch: bzr merge lp:~codygarver/elementaryos/fix-1018813
Reviewer Review Type Date Requested Status
elementary OS team 2012-07-09 Pending
Review via email: mp+113919@code.launchpad.net
To post a comment you must log in.

I'm slightly worried by "AutostartCondition=GNOME3 unless-session gnome", but it was probably added for a good reason. Let's merge this and see if it works (GrabIt doesn't support arbitrary target branch yet so I cannot test this).

Also, we might want to get rid of fallback-mount-helper because Files handles that already. Alternatively, we might want to get rid of auto-mounting in Files...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autostart/gnome-fallback-mount-helper-pantheon.desktop'
2--- autostart/gnome-fallback-mount-helper-pantheon.desktop 2012-02-10 15:58:41 +0000
3+++ autostart/gnome-fallback-mount-helper-pantheon.desktop 2012-07-09 07:44:23 +0000
4@@ -9,4 +9,5 @@
5 NoDisplay=true
6 OnlyShowIn=Pantheon
7 X-GNOME-Autostart-Notify=true
8+AutostartCondition=GNOME3 unless-session gnome
9 X-Ubuntu-Gettext-Domain=gnome-settings-daemon
10
11=== modified file 'autostart/gnome-screensaver-pantheon.desktop'
12--- autostart/gnome-screensaver-pantheon.desktop 2012-02-10 15:58:41 +0000
13+++ autostart/gnome-screensaver-pantheon.desktop 2012-07-09 07:44:23 +0000
14@@ -12,5 +12,5 @@
15 X-GNOME-Bugzilla-Bugzilla=GNOME
16 X-GNOME-Bugzilla-Product=gnome-screensaver
17 X-GNOME-Bugzilla-Component=general
18-X-GNOME-Bugzilla-Version=3.2.0
19+X-GNOME-Bugzilla-Version=3.4.1
20 X-Ubuntu-Gettext-Domain=gnome-screensaver
21
22=== modified file 'autostart/telepathy-indicator-pantheon.desktop'
23--- autostart/telepathy-indicator-pantheon.desktop 2012-06-12 01:41:43 +0000
24+++ autostart/telepathy-indicator-pantheon.desktop 2012-07-09 07:44:23 +0000
25@@ -10,6 +10,7 @@
26 Categories=GNOME;GTK;Network;InstantMessaging;
27 NoDisplay=true
28 OnlyShowIn=Pantheon;
29+AutostartCondition=GNOME3 unless-session gnome
30 X-GNOME-Autostart-Delay=15
31 X-GNOME-Autostart-Phase=Application
32 X-GNOME-Autostart-Notify=true

Subscribers

People subscribed via source and target branches

to all changes: