Merge lp:~jbicha/activity-log-manager/fix-few-warnings into lp:activity-log-manager

[Jeremy Bícha]

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

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-07-08 01:37:43 +0000
+++ src/Makefile.am	2013-07-09 01:36:26 +0000
@@ -1,4 +1,4 @@
-VALAFLAGS = \
+AM_VALAFLAGS = \
 	--pkg zeitgeist-2.0 \
 	--pkg glib-2.0 \
 	--pkg gtk+-3.0 \
@@ -56,7 +56,7 @@
 if HAVE_SWITCHBOARD
 switchboarddir = $(prefix)/lib/plugs/zeitgeist/alm
 switchboard_PROGRAMS = alm-switchboard
-VALAFLAGS += -D SWITCHBOARD \
+AM_VALAFLAGS += -D SWITCHBOARD \
 	--pkg pantheon
 alm_switchboard_LDADD = \
 	$(SHARED_LIBS) \
@@ -71,7 +71,7 @@
 endif
 
 if HAVE_DIAG
-VALAFLAGS += \
+AM_VALAFLAGS += \
   -D DIAGNOSTIC
 gnomeccuidir = $(datadir)/gnome-control-center/ui/
 SUBDIRS = diagnostics
@@ -79,7 +79,7 @@
 
 
 if HAVE_CCPANEL
-ccpaneldir = $(prefix)/lib/control-center-1/panels
+ccpaneldir = $(libdir)/control-center-1/panels
 ccpanel_LTLIBRARIES = libactivity-log-manager.la
 endif
 
 
=== modified file 'src/searchresults-widget.vala'
--- src/searchresults-widget.vala	2013-07-08 01:37:43 +0000
+++ src/searchresults-widget.vala	2013-07-09 01:36:26 +0000
@@ -19,7 +19,6 @@
  */
 
 using Gtk;
-using Gee;
 
 namespace Alm {
 
 
=== modified file 'src/security-widget.vala'
--- src/security-widget.vala	2013-07-07 19:51:19 +0000
+++ src/security-widget.vala	2013-07-09 01:36:26 +0000
@@ -18,7 +18,6 @@
  */
 
 using Gtk;
-using Gee;
 
 namespace Alm {
 
@@ -40,8 +39,8 @@
 
 		private void set_up_ui () {
 
-			Gtk.ListStore liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
-			Gtk.TreeIter iter;
+			var liststore_delay = new ListStore (2, typeof (string), typeof (int));
+			TreeIter iter;
 			liststore_delay.append (out iter);
 			liststore_delay.set (iter, 0, "1 second", 1, 0);
 			liststore_delay.append (out iter);
@@ -68,6 +67,7 @@
 			grid.set_margin_left(25);
 			grid.set_column_spacing(25);
 			grid.set_row_spacing(5);
+			grid.set_row_homogeneous(true);
 			this.add(grid);
 
 			var list_focus = new GLib.List<Widget> ();
@@ -113,7 +113,7 @@
 				try {
 					Process.spawn_command_line_async ("gnome-control-center user-accounts");
 				} catch (SpawnError e) {
-					stdout.printf ("Error: %s\n", e.message);
+					warning ("%s", e.message);
 				}
 				return true;
 			});
@@ -126,7 +126,7 @@
 				try {
 					Process.spawn_command_line_async ("gnome-control-center power");
 				} catch (SpawnError e) {
-					stdout.printf ("Error: %s\n", e.message);
+					warning ("%s", e.message);
 				}
 				return true;
 			});
 
=== modified file 'src/unified-privacy-applications.vala'
--- src/unified-privacy-applications.vala	2013-07-03 08:09:42 +0000
+++ src/unified-privacy-applications.vala	2013-07-09 01:36:26 +0000
@@ -23,7 +23,6 @@
  
 using Gtk;
 using Gee;
-using GLib;
 using Zeitgeist;
 
 namespace Alm {
 
=== modified file 'src/unified-privacy-history.vala'
--- src/unified-privacy-history.vala	2013-02-15 23:09:09 +0000
+++ src/unified-privacy-history.vala	2013-07-09 01:36:26 +0000
@@ -21,7 +21,6 @@
  */
 
 using Gtk;
-using Gee;
 using Zeitgeist;
 
 namespace Alm {
 
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala	2013-07-08 02:42:55 +0000
+++ src/unified-privacy.vala	2013-07-09 01:36:26 +0000
@@ -19,7 +19,6 @@
  
 using Gtk;
 using Gee;
-using GLib;
 using Zeitgeist;
 
 namespace Alm {
@@ -854,7 +853,11 @@
 				else if (index == 4){
 					tr = new Zeitgeist.TimeRange.anytime();
 					get_history.begin (tr);
-					recent.purge_items();
+					try {
+						recent.purge_items();
+					} catch (Error err) {
+	                                        warning ("%s", err.message);
+                                	}
 				}
 			}