Activity Log Manager

Merge lp:~ballogy/activity-log-manager/gee-0.8 into lp:activity-log-manager

  1. gee-0.8
  2. Merge into redesign
Proposed by Balló György
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~ballogy/activity-log-manager/gee-0.8
Merge into: lp:activity-log-manager
Diff against target: 47 lines (+4/-4)
3 files modified
configure.ac (+1/-1)
src/Makefile.am (+1/-1)
src/unified-privacy.vala (+2/-2)
To merge this branch: bzr merge lp:~ballogy/activity-log-manager/gee-0.8
Reviewer Review Type Date Requested Status
Activity Log Manager Pending
Review via email: mp+245270@code.launchpad.net

Description of the change

This change ports activity-log-manager to gee-0.8, which has a newer API.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-08-01 04:00:26 +0000
3+++ configure.ac 2014-12-20 19:57:45 +0000
4@@ -43,7 +43,7 @@
5
6 PKG_CHECK_MODULES(ZEITGEIST, zeitgeist-2.0, [HAVE_LIBZG=yes])
7 PKG_CHECK_MODULES(GTK, gtk+-3.0, [HAVE_GTK=yes])
8-PKG_CHECK_MODULES(GEE, gee-1.0, [HAVE_GEE=yes])
9+PKG_CHECK_MODULES(GEE, gee-0.8, [HAVE_GEE=yes])
10 PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0, [HAVE_GIO_UNIX=yes])
11 PKG_CHECK_MODULES(POLKIT, polkit-gobject-1, [HAVE_POLKIT=yes], [HAVE_POLKIT=no])
12 PKG_CHECK_MODULES(LIBWHOOPSIEPREFS, libwhoopsie-preferences, [HAVE_LIBWHOOPSIE=yes], [HAVE_LIBWHOOPSIE=no])
13
14=== modified file 'src/Makefile.am'
15--- src/Makefile.am 2014-02-06 16:12:21 +0000
16+++ src/Makefile.am 2014-12-20 19:57:45 +0000
17@@ -2,7 +2,7 @@
18 --pkg zeitgeist-2.0 \
19 --pkg glib-2.0 \
20 --pkg gtk+-3.0 \
21- --pkg gee-1.0 \
22+ --pkg gee-0.8 \
23 --target-glib=2.26 \
24 --pkg gio-unix-2.0 \
25 config.vapi
26
27=== modified file 'src/unified-privacy.vala'
28--- src/unified-privacy.vala 2014-11-10 19:34:43 +0000
29+++ src/unified-privacy.vala 2014-12-20 19:57:45 +0000
30@@ -113,7 +113,7 @@
31 remove_folder_from_view(folder);
32 });
33
34- mime_dict = new HashMap<string, string>(str_hash, str_equal);
35+ mime_dict = new HashMap<string, string>();
36 mime_dict.set(_("Applications"), NFO.SOFTWARE);
37 mime_dict.set(_("Music"), NFO.AUDIO);
38 mime_dict.set(_("Videos"), NFO.VIDEO);
39@@ -211,7 +211,7 @@
40 // Checkbox Box
41 var checkbox_hbox = new Box(Orientation.VERTICAL, 0);
42
43- CompareFunc<string> mime_compare = (s1, s2) => {
44+ CompareDataFunc<string> mime_compare = (s1, s2) => {
45 return s1.collate(s2);
46 };
47 Gee.ArrayList<string> keys = new Gee.ArrayList<string>();

Subscribers

People subscribed via source and target branches