Activity Log Manager

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

  1. fix-few-warnings
  2. Merge into redesign
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 74
Proposed branch: lp:~jbicha/activity-log-manager/fix-few-warnings
Merge into: lp:activity-log-manager
Diff against target: 145 lines (+14/-14)
6 files modified
src/Makefile.am (+4/-4)
src/searchresults-widget.vala (+0/-1)
src/security-widget.vala (+5/-5)
src/unified-privacy-applications.vala (+0/-1)
src/unified-privacy-history.vala (+0/-1)
src/unified-privacy.vala (+5/-2)
To merge this branch: bzr merge lp:~jbicha/activity-log-manager/fix-few-warnings
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) Approve
Review via email: mp+173626@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Makefile.am'
2--- src/Makefile.am 2013-07-08 01:37:43 +0000
3+++ src/Makefile.am 2013-07-09 01:36:26 +0000
4@@ -1,4 +1,4 @@
5-VALAFLAGS = \
6+AM_VALAFLAGS = \
7 --pkg zeitgeist-2.0 \
8 --pkg glib-2.0 \
9 --pkg gtk+-3.0 \
10@@ -56,7 +56,7 @@
11 if HAVE_SWITCHBOARD
12 switchboarddir = $(prefix)/lib/plugs/zeitgeist/alm
13 switchboard_PROGRAMS = alm-switchboard
14-VALAFLAGS += -D SWITCHBOARD \
15+AM_VALAFLAGS += -D SWITCHBOARD \
16 --pkg pantheon
17 alm_switchboard_LDADD = \
18 $(SHARED_LIBS) \
19@@ -71,7 +71,7 @@
20 endif
21
22 if HAVE_DIAG
23-VALAFLAGS += \
24+AM_VALAFLAGS += \
25 -D DIAGNOSTIC
26 gnomeccuidir = $(datadir)/gnome-control-center/ui/
27 SUBDIRS = diagnostics
28@@ -79,7 +79,7 @@
29
30
31 if HAVE_CCPANEL
32-ccpaneldir = $(prefix)/lib/control-center-1/panels
33+ccpaneldir = $(libdir)/control-center-1/panels
34 ccpanel_LTLIBRARIES = libactivity-log-manager.la
35 endif
36
37
38=== modified file 'src/searchresults-widget.vala'
39--- src/searchresults-widget.vala 2013-07-08 01:37:43 +0000
40+++ src/searchresults-widget.vala 2013-07-09 01:36:26 +0000
41@@ -19,7 +19,6 @@
42 */
43
44 using Gtk;
45-using Gee;
46
47 namespace Alm {
48
49
50=== modified file 'src/security-widget.vala'
51--- src/security-widget.vala 2013-07-07 19:51:19 +0000
52+++ src/security-widget.vala 2013-07-09 01:36:26 +0000
53@@ -18,7 +18,6 @@
54 */
55
56 using Gtk;
57-using Gee;
58
59 namespace Alm {
60
61@@ -40,8 +39,8 @@
62
63 private void set_up_ui () {
64
65- Gtk.ListStore liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
66- Gtk.TreeIter iter;
67+ var liststore_delay = new ListStore (2, typeof (string), typeof (int));
68+ TreeIter iter;
69 liststore_delay.append (out iter);
70 liststore_delay.set (iter, 0, "1 second", 1, 0);
71 liststore_delay.append (out iter);
72@@ -68,6 +67,7 @@
73 grid.set_margin_left(25);
74 grid.set_column_spacing(25);
75 grid.set_row_spacing(5);
76+ grid.set_row_homogeneous(true);
77 this.add(grid);
78
79 var list_focus = new GLib.List<Widget> ();
80@@ -113,7 +113,7 @@
81 try {
82 Process.spawn_command_line_async ("gnome-control-center user-accounts");
83 } catch (SpawnError e) {
84- stdout.printf ("Error: %s\n", e.message);
85+ warning ("%s", e.message);
86 }
87 return true;
88 });
89@@ -126,7 +126,7 @@
90 try {
91 Process.spawn_command_line_async ("gnome-control-center power");
92 } catch (SpawnError e) {
93- stdout.printf ("Error: %s\n", e.message);
94+ warning ("%s", e.message);
95 }
96 return true;
97 });
98
99=== modified file 'src/unified-privacy-applications.vala'
100--- src/unified-privacy-applications.vala 2013-07-03 08:09:42 +0000
101+++ src/unified-privacy-applications.vala 2013-07-09 01:36:26 +0000
102@@ -23,7 +23,6 @@
103
104 using Gtk;
105 using Gee;
106-using GLib;
107 using Zeitgeist;
108
109 namespace Alm {
110
111=== modified file 'src/unified-privacy-history.vala'
112--- src/unified-privacy-history.vala 2013-02-15 23:09:09 +0000
113+++ src/unified-privacy-history.vala 2013-07-09 01:36:26 +0000
114@@ -21,7 +21,6 @@
115 */
116
117 using Gtk;
118-using Gee;
119 using Zeitgeist;
120
121 namespace Alm {
122
123=== modified file 'src/unified-privacy.vala'
124--- src/unified-privacy.vala 2013-07-08 02:42:55 +0000
125+++ src/unified-privacy.vala 2013-07-09 01:36:26 +0000
126@@ -19,7 +19,6 @@
127
128 using Gtk;
129 using Gee;
130-using GLib;
131 using Zeitgeist;
132
133 namespace Alm {
134@@ -854,7 +853,11 @@
135 else if (index == 4){
136 tr = new Zeitgeist.TimeRange.anytime();
137 get_history.begin (tr);
138- recent.purge_items();
139+ try {
140+ recent.purge_items();
141+ } catch (Error err) {
142+ warning ("%s", err.message);
143+ }
144 }
145 }
146

Subscribers

People subscribed via source and target branches