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

Proposed by Cody Garver on 2014-06-01
Status: Merged
Merged at revision: 62
Proposed branch: lp:~codygarver/elementaryos/isis-fix-1018813
Merge into: lp:~elementary-os/elementaryos/pantheon-xsession-settings-bzr
Diff against target: 210 lines (+17/-51)
12 files modified
autostart/gnome-keyring-gpg-pantheon.desktop (+3/-3)
autostart/gnome-keyring-pkcs11-pantheon.desktop (+2/-2)
autostart/gnome-keyring-secrets-pantheon.desktop (+2/-2)
autostart/gnome-keyring-ssh-pantheon.desktop (+2/-2)
autostart/gnome-screensaver-pantheon.desktop (+0/-16)
autostart/gnome-sound-applet-pantheon.desktop (+0/-18)
autostart/gnome-user-share-pantheon.desktop (+1/-1)
autostart/gsettings-data-convert-pantheon.desktop (+1/-1)
autostart/onboard-autostart-pantheon.desktop (+2/-2)
autostart/orca-autostart-pantheon.desktop (+2/-2)
autostart/polkit-gnome-authentication-agent-1-pantheon.desktop (+1/-1)
autostart/user-dirs-update-gtk-pantheon.desktop (+1/-1)
To merge this branch: bzr merge lp:~codygarver/elementaryos/isis-fix-1018813
Reviewer Review Type Date Requested Status
Sergey "Shnatsel" Davidoff (community) 2014-06-01 Approve on 2014-07-01
Review via email: mp+221627@code.launchpad.net

Description of the change

See the bug report for a full tar of all Ubuntu desktop autostart entries

To post a comment you must log in.

Rubberstamp'd.

Remind me to get angry, create an Ubuntu installation with all possible packages, locate all .desktop files, grep them for OnlyShowIn and propose patches in Ubuntu (and if possible, upstream) that either cleanse the OnlyShowIn madness or add Pantheon to the list.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autostart/gnome-keyring-gpg-pantheon.desktop'
2--- autostart/gnome-keyring-gpg-pantheon.desktop 2012-02-10 15:58:41 +0000
3+++ autostart/gnome-keyring-gpg-pantheon.desktop 2014-06-01 01:53:08 +0000
4@@ -2,14 +2,14 @@
5 Type=Application
6 Name=GPG Password Agent
7 Comment=GNOME Keyring: GPG Agent
8-Exec= gnome-keyring-daemon --start --components=gpg
9-OnlyShowIn=Pantheon
10+Exec=/usr/bin/gnome-keyring-daemon --start --components=gpg
11+OnlyShowIn=Pantheon;
12 X-GNOME-Autostart-Phase=Initialization
13 X-GNOME-AutoRestart=false
14 X-GNOME-Autostart-Notify=true
15 X-GNOME-Bugzilla-Bugzilla=GNOME
16 X-GNOME-Bugzilla-Product=gnome-keyring
17 X-GNOME-Bugzilla-Component=general
18-X-GNOME-Bugzilla-Version=3.2.2
19+X-GNOME-Bugzilla-Version=3.10.1
20 NoDisplay=true
21 X-Ubuntu-Gettext-Domain=gnome-keyring
22
23=== modified file 'autostart/gnome-keyring-pkcs11-pantheon.desktop'
24--- autostart/gnome-keyring-pkcs11-pantheon.desktop 2012-02-10 15:58:41 +0000
25+++ autostart/gnome-keyring-pkcs11-pantheon.desktop 2014-06-01 01:53:08 +0000
26@@ -3,13 +3,13 @@
27 Name=Certificate and Key Storage
28 Comment=GNOME Keyring: PKCS#11 Component
29 Exec=/usr/bin/gnome-keyring-daemon --start --components=pkcs11
30-OnlyShowIn=Pantheon
31+OnlyShowIn=Pantheon;
32 X-GNOME-Autostart-Phase=Initialization
33 X-GNOME-AutoRestart=false
34 X-GNOME-Autostart-Notify=true
35 X-GNOME-Bugzilla-Bugzilla=GNOME
36 X-GNOME-Bugzilla-Product=gnome-keyring
37 X-GNOME-Bugzilla-Component=general
38-X-GNOME-Bugzilla-Version=3.2.2
39+X-GNOME-Bugzilla-Version=3.10.1
40 NoDisplay=true
41 X-Ubuntu-Gettext-Domain=gnome-keyring
42
43=== modified file 'autostart/gnome-keyring-secrets-pantheon.desktop'
44--- autostart/gnome-keyring-secrets-pantheon.desktop 2012-02-10 15:58:41 +0000
45+++ autostart/gnome-keyring-secrets-pantheon.desktop 2014-06-01 01:53:08 +0000
46@@ -3,13 +3,13 @@
47 Name=Secret Storage Service
48 Comment=GNOME Keyring: Secret Service
49 Exec=/usr/bin/gnome-keyring-daemon --start --components=secrets
50-OnlyShowIn=Pantheon
51+OnlyShowIn=Pantheon;
52 X-GNOME-Autostart-Phase=Initialization
53 X-GNOME-AutoRestart=false
54 X-GNOME-Autostart-Notify=true
55 X-GNOME-Bugzilla-Bugzilla=GNOME
56 X-GNOME-Bugzilla-Product=gnome-keyring
57 X-GNOME-Bugzilla-Component=general
58-X-GNOME-Bugzilla-Version=3.2.2
59+X-GNOME-Bugzilla-Version=3.10.1
60 NoDisplay=true
61 X-Ubuntu-Gettext-Domain=gnome-keyring
62
63=== modified file 'autostart/gnome-keyring-ssh-pantheon.desktop'
64--- autostart/gnome-keyring-ssh-pantheon.desktop 2012-02-10 15:58:41 +0000
65+++ autostart/gnome-keyring-ssh-pantheon.desktop 2014-06-01 01:53:08 +0000
66@@ -3,13 +3,13 @@
67 Name=SSH Key Agent
68 Comment=GNOME Keyring: SSH Agent
69 Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
70-OnlyShowIn=Pantheon
71+OnlyShowIn=Pantheon;
72 X-GNOME-Autostart-Phase=Initialization
73 X-GNOME-AutoRestart=false
74 X-GNOME-Autostart-Notify=true
75 X-GNOME-Bugzilla-Bugzilla=GNOME
76 X-GNOME-Bugzilla-Product=gnome-keyring
77 X-GNOME-Bugzilla-Component=general
78-X-GNOME-Bugzilla-Version=3.2.2
79+X-GNOME-Bugzilla-Version=3.10.1
80 NoDisplay=true
81 X-Ubuntu-Gettext-Domain=gnome-keyring
82
83=== removed file 'autostart/gnome-screensaver-pantheon.desktop'
84--- autostart/gnome-screensaver-pantheon.desktop 2012-07-09 07:42:30 +0000
85+++ autostart/gnome-screensaver-pantheon.desktop 1970-01-01 00:00:00 +0000
86@@ -1,16 +0,0 @@
87-[Desktop Entry]
88-Type=Application
89-Name=Screensaver
90-Comment=Launch screensaver and locker program
91-Icon=preferences-desktop-screensaver
92-Exec=gnome-screensaver
93-OnlyShowIn=Pantheon
94-NoDisplay=true
95-X-GNOME-Autostart-Delay=20
96-X-GNOME-Autostart-Phase=Application
97-X-GNOME-Autostart-Notify=true
98-X-GNOME-Bugzilla-Bugzilla=GNOME
99-X-GNOME-Bugzilla-Product=gnome-screensaver
100-X-GNOME-Bugzilla-Component=general
101-X-GNOME-Bugzilla-Version=3.4.1
102-X-Ubuntu-Gettext-Domain=gnome-screensaver
103
104=== removed file 'autostart/gnome-sound-applet-pantheon.desktop'
105--- autostart/gnome-sound-applet-pantheon.desktop 2012-02-10 15:58:41 +0000
106+++ autostart/gnome-sound-applet-pantheon.desktop 1970-01-01 00:00:00 +0000
107@@ -1,18 +0,0 @@
108-[Desktop Entry]
109-Name=Volume Control
110-Comment=Show desktop volume control
111-Icon=multimedia-volume-control
112-Exec=gnome-sound-applet
113-Terminal=false
114-Type=Application
115-Categories=
116-NoDisplay=true
117-X-GNOME-Bugzilla-Bugzilla=GNOME
118-X-GNOME-Bugzilla-Product=gnome-control-center
119-X-GNOME-Bugzilla-Component=sound
120-# See http://bugzilla.gnome.org/show_bug.cgi?id=568320
121-#X-GNOME-Autostart-Phase=Panel
122-X-GNOME-Autostart-Notify=true
123-AutostartCondition=GNOME3 if-session gnome-fallback
124-OnlyShowIn=Pantheon
125-X-Ubuntu-Gettext-Domain=gnome-control-center-2.0
126
127=== modified file 'autostart/gnome-user-share-pantheon.desktop'
128--- autostart/gnome-user-share-pantheon.desktop 2012-02-10 15:58:41 +0000
129+++ autostart/gnome-user-share-pantheon.desktop 2014-06-01 01:53:08 +0000
130@@ -6,7 +6,7 @@
131 Terminal=false
132 Type=Application
133 Categories=
134-OnlyShowIn=Pantheon
135+OnlyShowIn=Pantheon;
136 X-GNOME-Autostart-Delay=15
137 NoDisplay=true
138 X-Ubuntu-Gettext-Domain=gnome-user-share
139
140=== modified file 'autostart/gsettings-data-convert-pantheon.desktop'
141--- autostart/gsettings-data-convert-pantheon.desktop 2012-02-10 15:58:41 +0000
142+++ autostart/gsettings-data-convert-pantheon.desktop 2014-06-01 01:53:08 +0000
143@@ -5,7 +5,7 @@
144 Exec=gsettings-data-convert
145 Terminal=false
146 Type=Application
147-OnlyShowIn=Pantheon
148+OnlyShowIn=Pantheon;
149 X-GNOME-Autostart-Phase=Initialization
150 NoDisplay=true
151 X-Ubuntu-Gettext-Domain=GConf2
152
153=== modified file 'autostart/onboard-autostart-pantheon.desktop'
154--- autostart/onboard-autostart-pantheon.desktop 2012-02-10 15:58:41 +0000
155+++ autostart/onboard-autostart-pantheon.desktop 2014-06-01 01:53:08 +0000
156@@ -1,9 +1,9 @@
157 [Desktop Entry]
158 Name=Onboard
159-Exec=onboard
160+Exec=onboard --not-show-in=GNOME
161 Type=Application
162 NoDisplay=true
163 X-Ubuntu-Gettext-Domain=onboard
164 AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
165 X-GNOME-AutoRestart=true
166-OnlyShowIn=Pantheon
167+OnlyShowIn=Pantheon;
168
169=== modified file 'autostart/orca-autostart-pantheon.desktop'
170--- autostart/orca-autostart-pantheon.desktop 2012-02-10 15:58:41 +0000
171+++ autostart/orca-autostart-pantheon.desktop 2014-06-01 01:53:08 +0000
172@@ -1,10 +1,10 @@
173 [Desktop Entry]
174 Type=Application
175 Name=Orca screen reader
176-Exec=orca --no-setup --disable splash-window
177+Exec=orca
178 NoDisplay=true
179 AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled
180 X-GNOME-AutoRestart=true
181 #X-GNOME-Autostart-Phase=Initialization
182-OnlyShowIn=Pantheon
183+OnlyShowIn=Pantheon;
184 X-Ubuntu-Gettext-Domain=orca
185
186=== modified file 'autostart/polkit-gnome-authentication-agent-1-pantheon.desktop'
187--- autostart/polkit-gnome-authentication-agent-1-pantheon.desktop 2012-02-10 15:58:41 +0000
188+++ autostart/polkit-gnome-authentication-agent-1-pantheon.desktop 2014-06-01 01:53:08 +0000
189@@ -6,7 +6,7 @@
190 Type=Application
191 Categories=
192 NoDisplay=true
193-OnlyShowIn=Pantheon
194+OnlyShowIn=Pantheon;
195 X-GNOME-AutoRestart=true
196 AutostartCondition=GNOME3 unless-session gnome
197 X-Ubuntu-Gettext-Domain=polkit-gnome-1
198
199=== modified file 'autostart/user-dirs-update-gtk-pantheon.desktop'
200--- autostart/user-dirs-update-gtk-pantheon.desktop 2012-02-10 15:58:41 +0000
201+++ autostart/user-dirs-update-gtk-pantheon.desktop 2014-06-01 01:53:08 +0000
202@@ -4,7 +4,7 @@
203 Name=User folders update
204 Comment=Update common folders names to match current locale
205 Terminal=false
206-OnlyShowIn=Pantheon
207+OnlyShowIn=Pantheon;
208 Type=Application
209 StartupNotify=false
210 X-KDE-autostart-after=panel

Subscribers

People subscribed via source and target branches