György Balló has proposed merging lp:~ballogy/activity-log-manager/gee-0.8 into
lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~ballogy/activity-log-manager/gee-0.8/+merge/245270
This change ports activity-log-manager to gee-0.8, which has a newer API.
--
Your team Activity Log Manager is requested to review the proposed merge of
lp:~ballogy/activity-log-manager/gee-0.8 into lp:activity-log-manager.
=== modified file 'configure.ac'
--- configure.ac 2013-08-01 04:00:26 +
+++ configure.ac 2014-12-20 19:57:45 +
@@ -43,7 +43,7 @@
PKG_CHECK_MODULES(ZEITGEIST, zeitgeist-2.0, [HAVE_LIBZG=yes])
PKG_CHECK_MODULES(GTK, gtk+-3.0, [HAVE_GTK=yes])
-PKG_CHECK_MODULES(GEE, gee-1.0, [HAVE_GEE=yes])
+PKG_CHECK_MODULES(GEE, gee-0.8, [HAVE_GEE=yes])
PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0, [HAVE_GIO_UNIX=yes])
PKG_CHECK_MODULES(POLKIT, polkit-gobject-1, [HAVE_POLKIT=yes], [HAVE_POLKIT=no])
PKG_CHECK_MODULES(LIBWHOOPSIEPREFS, libwhoopsie-preferences, [HAVE_LIBWHOOPSIE=yes], [HAVE_LIBWHOOPSIE=no])
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2014-02-06 16:12:21 +
+++ src/Makefile.am 2014-12-20 19:57:45 +
@@ -2,7 +2,7 @@
--pkg zeitgeist-2.0 \
--pkg glib-2.0 \
--pkg gtk+-3.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--target-glib=2.26 \
--pkg gio-unix-2.0 \
config.vapi
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2014-11-10 19:34:43 +
+++ src/unified-privacy.vala 2014-12-20 19:57:45 +
@@ -113,7 +113,7 @@
remove_folder_from_view(folder);
});
- mime_dict = new HashMapstring, string(str_hash, str_equal);
+ mime_dict = new HashMapstring, string();
mime_dict.set(_(Applications), NFO.SOFTWARE);
mime_dict.set(_(Music), NFO.AUDIO);
mime_dict.set(_(Videos), NFO.VIDEO);
@@ -211,7 +211,7 @@
// Checkbox Box
var checkbox_hbox = new Box(Orientation.VERTICAL, 0);
- CompareFuncstring mime_compare = (s1, s2) = {
+ CompareDataFuncstring mime_compare = (s1, s2) = {
return s1.collate(s2);
};
Gee.ArrayListstring keys = new Gee.ArrayListstring();
___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
