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

Subscribers

People subscribed via source and target branches