Manish Sinha (मनीष सिन्हा) has proposed merging lp:~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage into lp:ubuntu/raring/activity-log-manager.
Requested reviews: Ubuntu branches (ubuntu-branches) Related bugs: Bug #1050620 in activity-log-manager (Ubuntu Raring): "activity-log-manager crashed with SIGSEGV in g_action_muxer_insert()" https://bugs.launchpad.net/ubuntu/raring/+source/activity-log-manager/+bug/1050620 Bug #1058037 in activity-log-manager (Ubuntu Raring): "Activity Log Manager crashes with GLib-GIO-CRITICAL **: g_application_list_actions: assertion `application->priv->is_registered' failed" https://bugs.launchpad.net/ubuntu/raring/+source/activity-log-manager/+bug/1058037 Bug #1197904 in activity-log-manager (Ubuntu): "[SRU] Fix activity-log-manager 0.9.4 in quantal/raring for wrong usage of GtkApplication" https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1197904 For more details, see: https://code.launchpad.net/~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage/+merge/173073 Added debian/patches/07_fix_gtkapplication.patch: - Fixes bug for wrong usage of GtkAPplication. (LP: #1058037, #1050620, #1197904) -- https://code.launchpad.net/~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage/+merge/173073 Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/ubuntu/raring/activity-log-manager/fix-1197904-wrong-gtkapplication-usage.
=== modified file 'debian/changelog' --- debian/changelog 2012-11-26 15:45:31 +0000 +++ debian/changelog 2013-07-04 18:24:26 +0000 @@ -1,3 +1,11 @@ +activity-log-manager (0.9.4-0ubuntu7) raring; urgency=low + + * debian/patches/07_fix_gtkapplication.patch: + - Fixes bug for wrong usage of GtkAPplication. + (LP: #1058037, #1050620, #1197904) + + -- Manish Sinha <manishsi...@ubuntu.com> Thu, 04 Jul 2013 11:06:33 -0700 + activity-log-manager (0.9.4-0ubuntu6.1) raring; urgency=low * debian/patches/06_add_unity_dash_privacy.patch: === added file 'debian/patches/07_fix_gtkapplication.patch' --- debian/patches/07_fix_gtkapplication.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/07_fix_gtkapplication.patch 2013-07-04 18:24:26 +0000 @@ -0,0 +1,52 @@ +Index: alm-raring/src/alm.vala +=================================================================== +--- alm-raring.orig/src/alm.vala 2013-07-04 10:53:50.000000000 -0700 ++++ alm-raring/src/alm.vala 2013-07-04 10:54:07.000000000 -0700 +@@ -23,6 +23,23 @@ + + + namespace Alm { ++ public class App : Gtk.Application ++ { ++ public App() ++ { ++ Object(application_id: "org.zeitgeist.Alm", flags: ApplicationFlags.FLAGS_NONE); ++ } ++ public override void activate() ++ { ++ var window = new Main(); ++ add_window(window); ++ } ++ public static void main(string[] args) ++ { ++ var app = new App(); ++ app.run(); ++ } ++ } + public class Main : Gtk.Window + { + public Main () +@@ -31,23 +48,6 @@ + var widget = new ActivityLogManager(); + this.add(widget); + this.show_all(); +- this.destroy.connect(on_destroy); +- } +- [CCode (instance_pos = -1)] +- public void on_destroy (Widget window) +- { +- Gtk.main_quit(); +- } +- static int main (string[] args) +- { +- Gtk.init (ref args); +- var alm = new Gtk.Application ("org.zeitgeist.Alm", +- ApplicationFlags.FLAGS_NONE); +- var window = new Main (); +- alm.add_window (window); +- +- Gtk.main (); +- return 0; + } + } + } === modified file 'debian/patches/series' --- debian/patches/series 2012-11-26 15:45:31 +0000 +++ debian/patches/series 2013-07-04 18:24:26 +0000 @@ -5,4 +5,4 @@ 05_add_missing_configvapi.patch 05_fix_userdirs.patch 06_add_unity_dash_privacy.patch - +07_fix_gtkapplication.patch
_______________________________________________ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp