Merge lp:~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage into lp:ubuntu/raring/activity-log-manager

Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage
Merge into: lp:ubuntu/raring/activity-log-manager
Diff against target: 82 lines (+61/-1)
3 files modified
debian/changelog (+8/-0)
debian/patches/07_fix_gtkapplication.patch (+52/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage
Reviewer Review Type Date Requested Status
Iain Lane Approve on 2013-07-22
Ubuntu branches 2013-07-04 Pending
Review via email: mp+173073@code.launchpad.net

Description of the change

Added debian/patches/07_fix_gtkapplication.patch:
  - Fixes bug for wrong usage of GtkAPplication.
    (LP: #1058037, #1050620, #1197904)

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

Uploaded after fixing the version number to be ...6.2 - thanks!

Please set this MP as 'merged'. :-)

review: Approve

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

Subscribers

People subscribed via source and target branches