Merge lp:~darkxst/gnome-session/fix-fail-whale into lp:~ubuntu-desktop/gnome-session/ubuntu

Proposed by Tim Lunn on 2015-03-10
Status: Merged
Merged at revision: 324
Proposed branch: lp:~darkxst/gnome-session/fix-fail-whale
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 62 lines (+24/-10)
2 files modified
debian/changelog (+8/-0)
debian/patches/103_kill_the_fail_whale.patch (+16/-10)
To merge this branch: bzr merge lp:~darkxst/gnome-session/fix-fail-whale
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2015-03-10 Pending
Review via email: mp+252399@code.launchpad.net
To post a comment you must log in.
324. By Tim Lunn on 2015-03-10

fix spacing

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 2015-01-26 01:55:34 +0000
3+++ debian/changelog 2015-03-10 05:15:02 +0000
4@@ -1,3 +1,11 @@
5+gnome-session (3.14.0-2ubuntu4) UNRELEASED; urgency=medium
6+
7+ * debian/patches/103_kill_the_fail_whale.patch: fix logic gnome-session
8+ should die at this point. This will fix LP: #1236749,
9+ LP: #1385572 and possibly various other strange bugs
10+
11+ -- Tim Lunn <tim@feathertop.org> Tue, 10 Mar 2015 09:45:35 +1100
12+
13 gnome-session (3.14.0-2ubuntu3) vivid; urgency=medium
14
15 * Split wayland session into gnome-session-wayland (LP: #247500)
16
17=== modified file 'debian/patches/103_kill_the_fail_whale.patch'
18--- debian/patches/103_kill_the_fail_whale.patch 2013-06-08 23:25:03 +0000
19+++ debian/patches/103_kill_the_fail_whale.patch 2015-03-10 05:15:02 +0000
20@@ -1,17 +1,23 @@
21-Index: gnome-session-3.7.3/gnome-session/gsm-fail-whale.c
22+Index: gnome-session-3.14.0/gnome-session/gsm-fail-whale.c
23 ===================================================================
24---- gnome-session-3.7.3.orig/gnome-session/gsm-fail-whale.c 2013-01-07 12:59:29.994981479 +1300
25-+++ gnome-session-3.7.3/gnome-session/gsm-fail-whale.c 2013-01-07 12:59:29.990981477 +1300
26-@@ -30,18 +30,10 @@
27+--- gnome-session-3.14.0.orig/gnome-session/gsm-fail-whale.c
28++++ gnome-session-3.14.0/gnome-session/gsm-fail-whale.c
29+@@ -18,6 +18,8 @@
30+
31+ #include <config.h>
32+
33++#include <stdlib.h>
34++
35+ #include <glib/gi18n.h>
36+ #include <glib/gstdio.h>
37+
38+@@ -28,18 +30,7 @@ gsm_fail_whale_dialog_we_failed (gboole
39 gboolean allow_logout,
40 GsmShellExtensions *extensions)
41 {
42 - gint i;
43 - gchar *argv[5];
44-+ static gboolean failed = FALSE;
45-+ if (failed)
46-+ return;
47-
48+-
49 - i = 0;
50 - argv[i++] = LIBEXECDIR "/gnome-session-failed";
51 - if (debug_mode)
52@@ -21,8 +27,8 @@
53 - if (extensions != NULL && gsm_shell_extensions_n_extensions (extensions) > 0)
54 - argv[i++] = "--extensions";
55 - argv[i++] = NULL;
56--
57+
58 - g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
59 + g_critical ("We failed, but the fail whale is dead. Sorry....");
60-+ failed = TRUE;
61++ exit (1);
62 }

Subscribers

People subscribed via source and target branches

to all changes: