Ubuntu
gnome-session package

Merge lp:~jbicha/ubuntu/oneiric/gnome-session/gnome-session-3.1.5 into lp:~ubuntu-desktop/gnome-session/ubuntu

  1. Oneiric (11.10)
  2. gnome-session-3.1.5
  3. Merge into ubuntu
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 200
Proposed branch: lp:~jbicha/ubuntu/oneiric/gnome-session/gnome-session-3.1.5
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 372 lines (+38/-217)
6 files modified
debian/changelog (+12/-0)
debian/patches/104_respect_onlyshowin_in_dlg.patch (+0/-105)
debian/patches/105_respect_xdg_current_desktop.patch (+0/-85)
debian/patches/20_hide_nodisplay.patch (+25/-24)
debian/patches/50_ubuntu_sessions.patch (+1/-1)
debian/patches/series (+0/-2)
To merge this branch: bzr merge lp:~jbicha/ubuntu/oneiric/gnome-session/gnome-session-3.1.5
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+71511@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work

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-08-11 19:27:00 +0000
3+++ debian/changelog 2011-08-15 07:12:27 +0000
4@@ -1,3 +1,15 @@
5+gnome-session (3.1.5-0ubuntu1) oneiric; urgency=low
6+
7+ * New upstream release
8+ * debian/patches/20_hide_nodisplay.patch: Refreshed
9+ * debian/patches/50_ubuntu_sessions.patch: Fixed typo
10+ * debian/patches/104_respect_onlyshowin_in_dlg.patch:
11+ - Dropped, applied upstream
12+ * debian/patches/105_respect_xdg_current_desktop.patch:
13+ - Dropped, applied upstream
14+
15+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 15 Aug 2011 03:08:53 -0400
16+
17 gnome-session (3.1.3-0ubuntu11) oneiric; urgency=low
18
19 * debian/patches/50_ubuntu_sessions.patch:
20
21=== removed file 'debian/patches/104_respect_onlyshowin_in_dlg.patch'
22--- debian/patches/104_respect_onlyshowin_in_dlg.patch 2011-07-13 19:01:29 +0000
23+++ debian/patches/104_respect_onlyshowin_in_dlg.patch 1970-01-01 00:00:00 +0000
24@@ -1,105 +0,0 @@
25-Description: Respect OnlyShowIn and NotShowIn keys in properties dialog
26-Author: Michael Terry <michael.terry@canonical.com>
27-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=654040
28-
29-Index: gnome-session/capplet/gsm-properties-dialog.c
30-===================================================================
31---- gnome-session.orig/capplet/gsm-properties-dialog.c 2011-07-05 14:24:59.160965708 -0400
32-+++ gnome-session/capplet/gsm-properties-dialog.c 2011-07-05 14:49:29.376981269 -0400
33-@@ -114,6 +114,7 @@
34- {
35- gboolean hidden;
36- gboolean display;
37-+ gboolean can_launch;
38- gboolean enabled;
39- GIcon *icon;
40- const char *description;
41-@@ -121,6 +122,7 @@
42-
43- hidden = gsp_app_get_hidden (app);
44- display = gsp_app_get_display (app);
45-+ can_launch = gsp_app_get_can_launch (app);
46- enabled = gsp_app_get_enabled (app);
47- icon = gsp_app_get_icon (app);
48- description = gsp_app_get_description (app);
49-@@ -152,7 +154,7 @@
50- }
51-
52- gtk_list_store_set (list_store, iter,
53-- STORE_COL_VISIBLE, (display && !hidden),
54-+ STORE_COL_VISIBLE, (display && !hidden && can_launch),
55- STORE_COL_ENABLED, enabled,
56- STORE_COL_GICON, icon,
57- STORE_COL_DESCRIPTION, description,
58-Index: gnome-session/capplet/gsp-app.c
59-===================================================================
60---- gnome-session.orig/capplet/gsp-app.c 2011-07-05 14:08:50.992955461 -0400
61-+++ gnome-session/capplet/gsp-app.c 2011-07-05 15:18:10.468999484 -0400
62-@@ -32,6 +32,7 @@
63- #include "gsm-util.h"
64- #include "gsp-app-manager.h"
65- #include "gsp-keyfile.h"
66-+#include "eggdesktopfile.h"
67-
68- #include "gsp-app.h"
69-
70-@@ -75,6 +76,8 @@
71- /* after writing to file, we skip the next file monitor event of type
72- * CHANGED */
73- gboolean skip_next_monitor_event;
74-+
75-+ EggDesktopFile *eggfile;
76- };
77-
78- #define GSP_APP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP, GspAppPrivate))
79-@@ -201,6 +204,11 @@
80- g_free (app->priv->old_system_path);
81- app->priv->old_system_path = NULL;
82- }
83-+
84-+ if (app->priv->eggfile) {
85-+ egg_desktop_file_free (app->priv->eggfile);
86-+ app->priv->eggfile = NULL;
87-+ }
88- }
89-
90- static void
91-@@ -557,6 +565,15 @@
92- }
93-
94- gboolean
95-+gsp_app_get_can_launch (GspApp *app)
96-+{
97-+ g_return_val_if_fail (GSP_IS_APP (app), FALSE);
98-+
99-+ return !app->priv->eggfile ||
100-+ egg_desktop_file_can_launch (app->priv->eggfile, "GNOME");
101-+}
102-+
103-+gboolean
104- gsp_app_get_display (GspApp *app)
105- {
106- g_return_val_if_fail (GSP_IS_APP (app), FALSE);
107-@@ -851,7 +868,9 @@
108- app->priv->gicon = NULL;
109- }
110-
111-- g_key_file_free (keyfile);
112-+ app->priv->eggfile = egg_desktop_file_new_from_key_file (keyfile,
113-+ app->priv->path,
114-+ NULL);
115-
116- _gsp_app_update_description (app);
117-
118-Index: gnome-session/capplet/gsp-app.h
119-===================================================================
120---- gnome-session.orig/capplet/gsp-app.h 2011-07-05 14:08:51.028955461 -0400
121-+++ gnome-session/capplet/gsp-app.h 2011-07-05 14:09:00.428955561 -0400
122-@@ -75,6 +75,7 @@
123-
124- gboolean gsp_app_get_hidden (GspApp *app);
125- gboolean gsp_app_get_display (GspApp *app);
126-+gboolean gsp_app_get_can_launch (GspApp *app);
127-
128- gboolean gsp_app_get_enabled (GspApp *app);
129- void gsp_app_set_enabled (GspApp *app,
130
131=== removed file 'debian/patches/105_respect_xdg_current_desktop.patch'
132--- debian/patches/105_respect_xdg_current_desktop.patch 2011-07-13 19:01:29 +0000
133+++ debian/patches/105_respect_xdg_current_desktop.patch 1970-01-01 00:00:00 +0000
134@@ -1,85 +0,0 @@
135-Description: Respect XDG_CURRENT_DESKTOP when deciding which files to show
136-Author: Michael Terry <michael.terry@canonical.com>
137-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=654041
138-
139-Index: gnome-session/capplet/gsp-app.c
140-===================================================================
141---- gnome-session.orig/capplet/gsp-app.c 2011-07-05 14:51:03.076982260 -0400
142-+++ gnome-session/capplet/gsp-app.c 2011-07-05 15:13:55.388996785 -0400
143-@@ -570,7 +570,8 @@
144- g_return_val_if_fail (GSP_IS_APP (app), FALSE);
145-
146- return !app->priv->eggfile ||
147-- egg_desktop_file_can_launch (app->priv->eggfile, "GNOME");
148-+ egg_desktop_file_can_launch (app->priv->eggfile,
149-+ gsm_util_get_current_desktop ());
150- }
151-
152- gboolean
153-Index: gnome-session/gnome-session/gsm-autostart-app.c
154-===================================================================
155---- gnome-session.orig/gnome-session/gsm-autostart-app.c 2011-07-05 15:14:30.388997155 -0400
156-+++ gnome-session/gnome-session/gsm-autostart-app.c 2011-07-05 15:17:51.064999279 -0400
157-@@ -110,6 +110,7 @@
158- is_disabled (GsmApp *app)
159- {
160- GsmAutostartAppPrivate *priv;
161-+ const char *current_desktop;
162-
163- priv = GSM_AUTOSTART_APP (app)->priv;
164-
165-@@ -132,9 +133,14 @@
166- }
167-
168- /* Check OnlyShowIn/NotShowIn/TryExec */
169-- if (!egg_desktop_file_can_launch (priv->desktop_file, "GNOME")) {
170-- g_debug ("app %s not installed or not for GNOME",
171-- gsm_app_peek_id (app));
172-+ current_desktop = gsm_util_get_current_desktop ();
173-+ if (!egg_desktop_file_can_launch (priv->desktop_file, current_desktop)) {
174-+ if (current_desktop) {
175-+ g_debug ("app %s not installed or not for %s",
176-+ gsm_app_peek_id (app), current_desktop);
177-+ } else {
178-+ g_debug ("app %s not installed", gsm_app_peek_id (app));
179-+ }
180- return TRUE;
181- }
182-
183-Index: gnome-session/gnome-session/gsm-util.c
184-===================================================================
185---- gnome-session.orig/gnome-session/gsm-util.c 2011-07-05 14:50:54.624982171 -0400
186-+++ gnome-session/gnome-session/gsm-util.c 2011-07-05 15:13:26.136996475 -0400
187-@@ -183,6 +183,19 @@
188- return _saved_session_dir;
189- }
190-
191-+const char *
192-+gsm_util_get_current_desktop ()
193-+{
194-+ const char *desktop;
195-+
196-+ desktop = g_getenv ("XDG_CURRENT_DESKTOP");
197-+ if (!desktop)
198-+ desktop = "GNOME"; /* backwards compatibility */
199-+ else if (desktop[0] == 0)
200-+ desktop = NULL; /* no desktop defined */
201-+
202-+ return desktop;
203-+}
204-
205- char **
206- gsm_util_get_autostart_dirs ()
207-Index: gnome-session/gnome-session/gsm-util.h
208-===================================================================
209---- gnome-session.orig/gnome-session/gsm-util.h 2011-07-05 14:50:54.660982171 -0400
210-+++ gnome-session/gnome-session/gsm-util.h 2011-07-05 14:51:24.608982488 -0400
211-@@ -35,6 +35,8 @@
212-
213- const char *gsm_util_get_saved_session_dir (void);
214-
215-+const char *gsm_util_get_current_desktop (void);
216-+
217- gchar** gsm_util_get_app_dirs (void);
218-
219- gchar** gsm_util_get_autostart_dirs (void);
220
221=== modified file 'debian/patches/20_hide_nodisplay.patch'
222--- debian/patches/20_hide_nodisplay.patch 2011-05-23 14:00:56 +0000
223+++ debian/patches/20_hide_nodisplay.patch 2011-08-15 07:12:27 +0000
224@@ -3,39 +3,40 @@
225 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=556459
226 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/462768
227
228-Index: gnome-session-3.0.0/capplet/gsm-properties-dialog.c
229+Index: gnome-session-3.1.5/capplet/gsm-properties-dialog.c
230 ===================================================================
231---- gnome-session-3.0.0.orig/capplet/gsm-properties-dialog.c 2011-03-22 21:31:42.000000000 +0100
232-+++ gnome-session-3.0.0/capplet/gsm-properties-dialog.c 2011-05-23 15:37:59.808880842 +0200
233-@@ -113,12 +113,14 @@
234+--- gnome-session-3.1.5.orig/capplet/gsm-properties-dialog.c 2011-08-15 02:48:32.345886738 -0400
235++++ gnome-session-3.1.5/capplet/gsm-properties-dialog.c 2011-08-15 02:55:53.946909811 -0400
236+@@ -112,6 +112,7 @@
237 GspApp *app)
238 {
239 gboolean hidden;
240 + gboolean display;
241 gboolean enabled;
242+ gboolean shown;
243 GIcon *icon;
244- const char *description;
245+@@ -119,6 +120,7 @@
246 const char *app_name;
247
248 hidden = gsp_app_get_hidden (app);
249 + display = gsp_app_get_display (app);
250 enabled = gsp_app_get_enabled (app);
251+ shown = gsp_app_get_shown (app);
252 icon = gsp_app_get_icon (app);
253- description = gsp_app_get_description (app);
254-@@ -150,7 +152,7 @@
255+@@ -151,7 +153,7 @@
256 }
257
258 gtk_list_store_set (list_store, iter,
259-- STORE_COL_VISIBLE, !hidden,
260-+ STORE_COL_VISIBLE, (display && !hidden),
261+- STORE_COL_VISIBLE, !hidden && shown,
262++ STORE_COL_VISIBLE, !hidden && display && shown,
263 STORE_COL_ENABLED, enabled,
264 STORE_COL_GICON, icon,
265 STORE_COL_DESCRIPTION, description,
266-Index: gnome-session-3.0.0/capplet/gsp-app.c
267+Index: gnome-session-3.1.5/capplet/gsp-app.c
268 ===================================================================
269---- gnome-session-3.0.0.orig/capplet/gsp-app.c 2010-07-02 11:58:13.000000000 +0200
270-+++ gnome-session-3.0.0/capplet/gsp-app.c 2011-05-23 15:36:33.468452700 +0200
271-@@ -37,18 +37,20 @@
272+--- gnome-session-3.1.5.orig/capplet/gsp-app.c 2011-08-12 04:30:34.000000000 -0400
273++++ gnome-session-3.1.5/capplet/gsp-app.c 2011-08-15 02:48:15.275460304 -0400
274+@@ -41,18 +41,20 @@
275
276 #define GSP_APP_SAVE_DELAY 2
277
278@@ -60,9 +61,9 @@
279 gboolean hidden;
280 + gboolean no_display;
281 gboolean enabled;
282+ gboolean shown;
283
284- char *name;
285-@@ -334,6 +336,14 @@
286+@@ -341,6 +343,14 @@
287 return FALSE;
288 }
289
290@@ -77,7 +78,7 @@
291 str = gsp_key_file_get_locale_string (keyfile,
292 G_KEY_FILE_DESKTOP_KEY_NAME);
293 if (!_gsp_str_equal (str, app->priv->name)) {
294-@@ -442,6 +452,12 @@
295+@@ -449,6 +459,12 @@
296 app->priv->hidden);
297 }
298
299@@ -90,7 +91,7 @@
300 if (app->priv->save_mask & GSP_ASP_SAVE_MASK_ENABLED) {
301 gsp_key_file_set_boolean (keyfile,
302 GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED,
303-@@ -541,6 +557,14 @@
304+@@ -548,6 +564,14 @@
305 }
306
307 gboolean
308@@ -105,7 +106,7 @@
309 gsp_app_get_enabled (GspApp *app)
310 {
311 g_return_val_if_fail (GSP_IS_APP (app), FALSE);
312-@@ -790,6 +814,9 @@
313+@@ -805,6 +829,9 @@
314 app->priv->hidden = gsp_key_file_get_boolean (keyfile,
315 G_KEY_FILE_DESKTOP_KEY_HIDDEN,
316 FALSE);
317@@ -115,15 +116,15 @@
318 app->priv->enabled = gsp_key_file_get_boolean (keyfile,
319 GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED,
320 TRUE);
321-@@ -935,6 +962,7 @@
322+@@ -952,6 +979,7 @@
323 app->priv->basename, NULL);
324
325 app->priv->hidden = FALSE;
326 + app->priv->no_display = FALSE;
327 app->priv->enabled = TRUE;
328+ app->priv->shown = TRUE;
329
330- if (!gsm_util_text_is_blank (name)) {
331-@@ -1031,6 +1059,12 @@
332+@@ -1049,6 +1077,12 @@
333 app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN;
334 }
335
336@@ -136,10 +137,10 @@
337 if (!app->priv->enabled) {
338 changed = TRUE;
339 app->priv->enabled = TRUE;
340-Index: gnome-session-3.0.0/capplet/gsp-app.h
341+Index: gnome-session-3.1.5/capplet/gsp-app.h
342 ===================================================================
343---- gnome-session-3.0.0.orig/capplet/gsp-app.h 2010-07-02 11:58:13.000000000 +0200
344-+++ gnome-session-3.0.0/capplet/gsp-app.h 2011-05-23 15:36:33.472452723 +0200
345+--- gnome-session-3.1.5.orig/capplet/gsp-app.h 2011-08-12 04:22:59.000000000 -0400
346++++ gnome-session-3.1.5/capplet/gsp-app.h 2011-08-15 02:48:15.275460304 -0400
347 @@ -74,6 +74,7 @@
348 const char *gsp_app_get_path (GspApp *app);
349
350
351=== modified file 'debian/patches/50_ubuntu_sessions.patch'
352--- debian/patches/50_ubuntu_sessions.patch 2011-08-11 19:18:31 +0000
353+++ debian/patches/50_ubuntu_sessions.patch 2011-08-15 07:12:27 +0000
354@@ -75,7 +75,7 @@
355 +++ gnome-session-3.1.3/data/gnome-classic.desktop.in 2011-08-11 21:17:51.107088456 +0200
356 @@ -0,0 +1,7 @@
357 +[Desktop Entry]
358-+_Name=GNOME classic
359++_Name=GNOME Classic
360 +_Comment=This session logs you into GNOME with the traditional panel
361 +Exec=gnome-session --session=gnome-classic
362 +TryExec=gnome-session
363
364=== modified file 'debian/patches/series'
365--- debian/patches/series 2011-07-26 19:54:48 +0000
366+++ debian/patches/series 2011-08-15 07:12:27 +0000
367@@ -15,5 +15,3 @@
368 96_no_catch_sigsegv.patch
369 #101_screen_lock_on_suspend.patch
370 103_kill_the_fail_whale.patch
371-104_respect_onlyshowin_in_dlg.patch
372-105_respect_xdg_current_desktop.patch

Subscribers

People subscribed via source and target branches

to all changes: