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

[Manish Sinha (मनीष सिन्हा)]

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

[Iain Lane (laney)]

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

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Added SRU Bug with explanations

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

[lp:~zeitgeist/activity-log-manager/fix-bug-1058037]

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

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

[Iain Lane (laney)]

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

=== 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 @@
+activity-log-manager (0.9.4-0ubuntu4.3) quantal-proposed; urgency=low
+
+  * 07_fix_gtkapplication.patch:
+    - Activity Log Manager crashes with GLib-GIO-CRITICAL **: 
+      g_application_list_actions: assertion 
+      `application->priv->is_registered' failed.
+      (LP: #1058037,  #1050620, #1197904)
+
+ -- Manish Sinha <[e-mail]>  Fri, 19 Apr 2013 14:26:04 -0700
+
 activity-log-manager (0.9.4-0ubuntu4.2) quantal-proposed; urgency=low
 
   * 07_fix_userdirs.patch:

=== 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 @@
+=== modified file 'src/alm.vala'
+--- activity-log-manager-0.9.4.orig/src/alm.vala 2012-03-01 21:25:48 +0000
++++ activity-log-manager-0.9.4/src/alm.vala 2013-04-19 13:57:45 -0700
+@@ -23,6 +23,23 @@ using Gtk;
+ 
+ 
+ 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 @@ namespace Alm {
+ 			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 17:05:56 +0000
+++ debian/patches/series	2013-07-04 17:46:22 +0000
@@ -5,3 +5,4 @@
 05_add_missing_configvapi.patch
 06_add_unity_dash_privacy.patch
 07_fix_userdirs.patch
+08_fix_gtkapplication.patch