Merge lp:~zeitgeist/activity-log-manager/fix-bug-1058037 into lp:ubuntu/quantal-proposed/activity-log-manager

Status: Needs review
Proposed branch: lp:~zeitgeist/activity-log-manager/fix-bug-1058037
Merge into: lp:ubuntu/quantal-proposed/activity-log-manager
Diff against target: 83 lines (+63/-0)
3 files modified
debian/changelog (+10/-0)
debian/patches/08_fix_gtkapplication.patch (+52/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~zeitgeist/activity-log-manager/fix-bug-1058037
Reviewer Review Type Date Requested Status
Iain Lane 2013-04-19 Approve on 2013-07-22
Review via email: mp+159896@code.launchpad.net

Description of the change

Fixes bugs LP: #1058037 and LP: #1050620 caused by wrong usage of GtkApplication

To post a comment you must log in.
Iain Lane (laney) wrote :

Thanks for your fix! Can you please update one of the bugs to have the SRU template? https://wiki.ubuntu.com/StableReleaseUpdates#Procedure

Added SRU Bug with explanations

Bug #1197904: [SRU] Fix activity-log-manager 0.9.4 in quantal for wrong usage of GtkApplication

18. By Manish Sinha (मनीष सिन्हा) on 2013-07-04

Update the bugs which this patch fixes (LP: #1058037, #1050620, #1197904)

Iain Lane (laney) wrote :

Uploaded, thank you!

review: Approve

Unmerged revisions

18. By Manish Sinha (मनीष सिन्हा) on 2013-07-04

Update the bugs which this patch fixes (LP: #1058037, #1050620, #1197904)

17. By Manish Sinha (मनीष सिन्हा) on 2013-04-19

Fixes LP: #1058037 and LP: #1050620 due to GtkApplication not used properly

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 2012-11-26 17:05:56 +0000
3+++ debian/changelog 2013-07-04 17:46:22 +0000
4@@ -1,3 +1,13 @@
5+activity-log-manager (0.9.4-0ubuntu4.3) quantal-proposed; urgency=low
6+
7+ * 07_fix_gtkapplication.patch:
8+ - Activity Log Manager crashes with GLib-GIO-CRITICAL **:
9+ g_application_list_actions: assertion
10+ `application->priv->is_registered' failed.
11+ (LP: #1058037, #1050620, #1197904)
12+
13+ -- Manish Sinha <manishsinha@ubuntu.com> Fri, 19 Apr 2013 14:26:04 -0700
14+
15 activity-log-manager (0.9.4-0ubuntu4.2) quantal-proposed; urgency=low
16
17 * 07_fix_userdirs.patch:
18
19=== added file 'debian/patches/08_fix_gtkapplication.patch'
20--- debian/patches/08_fix_gtkapplication.patch 1970-01-01 00:00:00 +0000
21+++ debian/patches/08_fix_gtkapplication.patch 2013-07-04 17:46:22 +0000
22@@ -0,0 +1,52 @@
23+=== modified file 'src/alm.vala'
24+--- activity-log-manager-0.9.4.orig/src/alm.vala 2012-03-01 21:25:48 +0000
25++++ activity-log-manager-0.9.4/src/alm.vala 2013-04-19 13:57:45 -0700
26+@@ -23,6 +23,23 @@ using Gtk;
27+
28+
29+ namespace Alm {
30++ public class App : Gtk.Application
31++ {
32++ public App()
33++ {
34++ Object(application_id: "org.zeitgeist.Alm", flags: ApplicationFlags.FLAGS_NONE);
35++ }
36++ public override void activate()
37++ {
38++ var window = new Main();
39++ add_window(window);
40++ }
41++ public static void main(string[] args)
42++ {
43++ var app = new App();
44++ app.run();
45++ }
46++ }
47+ public class Main : Gtk.Window
48+ {
49+ public Main ()
50+@@ -31,23 +48,6 @@ namespace Alm {
51+ var widget = new ActivityLogManager();
52+ this.add(widget);
53+ this.show_all();
54+- this.destroy.connect(on_destroy);
55+- }
56+- [CCode (instance_pos = -1)]
57+- public void on_destroy (Widget window)
58+- {
59+- Gtk.main_quit();
60+- }
61+- static int main (string[] args)
62+- {
63+- Gtk.init (ref args);
64+- var alm = new Gtk.Application ("org.zeitgeist.Alm",
65+- ApplicationFlags.FLAGS_NONE);
66+- var window = new Main ();
67+- alm.add_window (window);
68+-
69+- Gtk.main ();
70+- return 0;
71+ }
72+ }
73+ }
74+
75
76=== modified file 'debian/patches/series'
77--- debian/patches/series 2012-11-26 17:05:56 +0000
78+++ debian/patches/series 2013-07-04 17:46:22 +0000
79@@ -5,3 +5,4 @@
80 05_add_missing_configvapi.patch
81 06_add_unity_dash_privacy.patch
82 07_fix_userdirs.patch
83+08_fix_gtkapplication.patch

Subscribers

People subscribed via source and target branches