Robert Ancell has proposed merging 
lp:~robert-ancell/activity-log-manager/unity-control-center2 into 
lp:activity-log-manager.

Commit message:
Add support for Unity Control Center.

Requested reviews:
  Activity Log Manager (activity-log-manager)
Related bugs:
  Bug #1257505 in gnome-control-center (Ubuntu): "Create Unity Control Center 
so can remain on old GNOME Control Center version"
  https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1257505

For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/unity-control-center2/+merge/203431
-- 
https://code.launchpad.net/~robert-ancell/activity-log-manager/unity-control-center2/+merge/203431
Your team Activity Log Manager is requested to review the proposed merge of 
lp:~robert-ancell/activity-log-manager/unity-control-center2 into 
lp:activity-log-manager.
=== modified file 'configure.ac'
--- configure.ac	2013-08-01 04:00:26 +0000
+++ configure.ac	2014-01-27 22:54:43 +0000
@@ -102,13 +102,39 @@
   ]
 )
 
+PKG_CHECK_MODULES(UNITY_CCPANEL, libunity-control-center,
+  [
+   AC_SUBST(UNITY_CCPANEL_CFLAGS)
+   AC_SUBST(UNITY_CCPANEL_LIBS)
+   if test "x$with_whoopsie" != xcheck && test "x$HAVE_POLKIT" != xyes; then
+      AC_MSG_FAILURE(
+        [--with-whoopsie was given, but polkit-gobject-1 was not found])
+   fi
+   if test "x$with_whoopsie" != xcheck && test "x$HAVE_LIBWHOOPSIE" != xyes; then
+      AC_MSG_FAILURE(
+        [--with-whoopsie was given, but libwhoopsie or libwhoopsie-preferences was not found])
+   fi
+  ]
+
+  AC_SUBST(UNITY_CCPANEL_DIR),
+  [
+    if test "x$with_ccpanel" != xcheck; then
+      AC_MSG_FAILURE(
+        [--with-ccpanel was given, but test for libunity-control-center failed])
+    fi
+  ]
+)
+
 AM_CONDITIONAL([HAVE_CCPANEL], [test -n "$CCPANEL_LIBS"  && test "x$with_ccpanel" != xno])
+AM_CONDITIONAL([HAVE_UNITY_CCPANEL], [test -n "$UNITY_CCPANEL_LIBS"  && test "x$with_unity_ccpanel" != xno])
 AM_CONDITIONAL([HAVE_WHOOPSIE], [test -n "$POLKIT_LIBS" && test -n "$LIBWHOOPSIEPREFS_LIBS"])
 
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
 src/Makefile
+src/gnome-control-center/Makefile
+src/unity-control-center/Makefile
 po/Makefile.in
 ])
 
@@ -131,6 +157,12 @@
   CC_ENABLE=no
 fi
 
+if test -n "$UNITY_CCPANEL_LIBS"  && test "x$with_unity_ccpanel" != xno; then
+  UNITY_CC_ENABLE=yes
+else
+  UNITY_CC_ENABLE=no
+fi
+
 AM_CONDITIONAL([HAVE_SWITCHBOARD], [test -n "$PANTHEON_LIBS" && test "x$with_switchboard" != xno])
 
 AM_CONDITIONAL([HAVE_DIAG], [test "x$WHOOPSIE_ENABLE" = xyes])
@@ -148,6 +180,7 @@
 
   Optional Integration
     System Settings:    ${CC_ENABLE}
+    Unity:              ${UNITY_CC_ENABLE}
     Whoopsie:           ${WHOOPSIE_ENABLE}
     Switchboard:        ${SWITCHBOARD_ENABLE}
 

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-07-19 12:29:05 +0000
+++ data/Makefile.am	2014-01-27 22:54:43 +0000
@@ -22,10 +22,12 @@
 
 desktopdir = $(datadir)/applications
 
+desktop_in_files = activity-log-manager.desktop.in
 if HAVE_CCPANEL
-    desktop_in_files = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in
-else
-    desktop_in_files = activity-log-manager.desktop.in
+    desktop_in_files += gnome-activity-log-manager-panel.desktop.in
+endif
+if HAVE_UNITY_CCPANEL
+    desktop_in_files += unity-activity-log-manager-panel.desktop.in
 endif
 
 if HAVE_SWITCHBOARD

=== added file 'data/unity-activity-log-manager-panel.desktop.in'
--- data/unity-activity-log-manager-panel.desktop.in	1970-01-01 00:00:00 +0000
+++ data/unity-activity-log-manager-panel.desktop.in	2014-01-27 22:54:43 +0000
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Version=1.0
+
+_Name=Security & Privacy
+_Comment=Privacy and Activity Manager
+
+Icon=activity-log-manager
+TryExec=unity-control-center
+Exec=unity-control-center activity-log-manager
+
+StartupNotify=true
+
+Type=Application
+Categories=GNOME;GTK;System;Archiving;Utility;Settings;X-GNOME-PersonalSettings;X-Unity-Settings-Panel;
+X-Unity-Settings-Panel=activity-log-manager
+
+OnlyShowIn=Unity;
+
+# Translators: Add whatever keywords you want in your language, separated by semicolons
+# These keywords are used when searching for applications in dashes, etc.
+_Keywords=privacy;activity;log;zeitgeist;diagnostics;error reports;
+
+X-AppInstall-Ignore=true
+X-Ayatana-Desktop-Shortcuts=X-Activity-Log-Manager;
+

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-07-20 20:41:29 +0000
+++ po/POTFILES.in	2014-01-27 22:54:43 +0000
@@ -1,5 +1,6 @@
 data/activity-log-manager.desktop.in
 data/gnome-activity-log-manager-panel.desktop.in
+data/unity-activity-log-manager-panel.desktop.in
 src/activity-log-manager.vala
 src/alm.vala
 src/alm-cc.c

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2013-07-08 01:37:43 +0000
+++ po/POTFILES.skip	2014-01-27 22:54:43 +0000
@@ -5,3 +5,15 @@
 src/unified-privacy-applications.c
 src/unified-privacy-history.c
 src/unified-privacy.c
+src/gnome-control-center/activity-log-manager.c
+src/gnome-control-center/searchresults-widget.c
+src/gnome-control-center/security-widget.c
+src/gnome-control-center/unified-privacy-applications.c
+src/gnome-control-center/unified-privacy-history.c
+src/gnome-control-center/unified-privacy.c
+src/unity-control-center/activity-log-manager.c
+src/unity-control-center/searchresults-widget.c
+src/unity-control-center/security-widget.c
+src/unity-control-center/unified-privacy-applications.c
+src/unity-control-center/unified-privacy-history.c
+src/unity-control-center/unified-privacy.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-07-22 04:50:07 +0000
+++ src/Makefile.am	2014-01-27 22:54:43 +0000
@@ -1,3 +1,5 @@
+SUBDIRS = gnome-control-center unity-control-center
+
 AM_VALAFLAGS = \
 	--pkg zeitgeist-2.0 \
 	--pkg glib-2.0 \
@@ -24,9 +26,9 @@
 SHARED_SOURCES = \
 	blacklist-dbus.vala \
 	activity-log-manager.vala \
-        unified-privacy-files.vala \
-        unified-privacy-applications.vala \
-        unified-privacy-history.vala \
+	unified-privacy-files.vala \
+	unified-privacy-applications.vala \
+	unified-privacy-history.vala \
 	unified-privacy.vala \
 	$(NULL)
 
@@ -78,24 +80,10 @@
 gnomeccuidir = $(datadir)/gnome-control-center/ui/
 endif
 
-
-if HAVE_CCPANEL
-ccpaneldir = $(libdir)/control-center-1/panels
-ccpanel_LTLIBRARIES = libactivity-log-manager.la
-endif
-
 bin_PROGRAMS = activity-log-manager
 
 activity_log_manager_CFLAGS = \
 	$(SHARED_CFLAGS)
-libactivity_log_manager_la_CFLAGS = \
-	$(SHARED_CFLAGS) \
-	$(CCPANEL_CFLAGS)
-
-if HAVE_WHOOPSIE
-libactivity_log_manager_la_CFLAGS += \
-	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\"
-endif
 
 activity_log_manager_SOURCES = \
 	$(SHARED_SOURCES) \
@@ -107,27 +95,12 @@
 	diagnostics-widget.c
 endif
 
-libactivity_log_manager_la_SOURCES = \
-	searchresults-widget.vala \
-	security-widget.vala \
-	$(SHARED_SOURCES:.vala=.c) \
-	alm-cc.c
-
-if HAVE_WHOOPSIE
-libactivity_log_manager_la_SOURCES += \
-	diagnostics-widget.c
-endif
-
 
 activity_log_manager_LDFLAGS = \
 	-Wl,--export-dynamic
-libactivity_log_manager_la_LDFLAGS = -module -avoid-version
 
 activity_log_manager_LDADD = \
 	$(SHARED_LIBS)
-libactivity_log_manager_la_LIBADD = \
-	$(SHARED_LIBS) \
-	$(CCPANEL_LIBS)
 
 
 GENERATED_C_FILES = $(SHARED_SOURCES:.vala=.c)

=== modified file 'src/alm-cc.c'
--- src/alm-cc.c	2013-07-21 22:25:25 +0000
+++ src/alm-cc.c	2014-01-27 22:54:43 +0000
@@ -19,7 +19,11 @@
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#if USE_UNITY
+#include <libunity-control-center/cc-panel.h>
+#else
 #include <libgnome-control-center/cc-panel.h>
+#endif
 
 extern void* alm_activity_log_manager_new (void);
 extern void alm_activity_log_manager_insert_page (void* alm, GtkWidget* widget, const gchar* label, int position);

=== added directory 'src/gnome-control-center'
=== added file 'src/gnome-control-center/Makefile.am'
--- src/gnome-control-center/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/gnome-control-center/Makefile.am	2014-01-27 22:54:43 +0000
@@ -0,0 +1,78 @@
+AM_VALAFLAGS = \
+	--pkg zeitgeist-2.0 \
+	--pkg glib-2.0 \
+	--pkg gtk+-3.0 \
+	--pkg gee-1.0  \
+	--target-glib=2.26 \
+	--pkg gio-unix-2.0 \
+	../config.vapi
+
+if HAVE_CCPANEL
+ccpaneldir = $(libdir)/gnome-control-center-1/panels
+ccpanel_LTLIBRARIES = libactivity-log-manager.la
+endif
+
+libactivity_log_manager_la_CFLAGS = \
+	-Wall \
+	-g \
+	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	-DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\" \
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+	$(GTK_CFLAGS) $(ZEITGEIST_CFLAGS) $(GEE_CFLAGS) $(GIO_UNIX_CFLAGS) $(POLKIT_CFLAGS) \
+	$(CCPANEL_CFLAGS)
+
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_CFLAGS += \
+	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\"
+endif
+
+searchresults-widget.vala: ../searchresults-widget.vala
+	cp ../searchresults-widget.vala searchresults-widget.vala
+security-widget.vala: ../security-widget.vala
+	cp ../security-widget.vala security-widget.vala
+blacklist-dbus.vala: ../blacklist-dbus.vala
+	cp ../blacklist-dbus.vala blacklist-dbus.vala
+activity-log-manager.vala: ../activity-log-manager.vala
+	cp ../activity-log-manager.vala activity-log-manager.vala
+unified-privacy-files.vala: ../unified-privacy-files.vala
+	cp ../unified-privacy-files.vala unified-privacy-files.vala
+unified-privacy-applications.vala: ../unified-privacy-applications.vala
+	cp ../unified-privacy-applications.vala unified-privacy-applications.vala
+unified-privacy-history.vala: ../unified-privacy-history.vala
+	cp ../unified-privacy-history.vala unified-privacy-history.vala
+unified-privacy.vala: ../unified-privacy.vala
+	cp ../unified-privacy.vala unified-privacy.vala
+
+libactivity_log_manager_la_SOURCES = \
+	searchresults-widget.vala \
+	security-widget.vala \
+	blacklist-dbus.vala \
+	activity-log-manager.vala \
+	unified-privacy-files.vala \
+	unified-privacy-applications.vala \
+	unified-privacy-history.vala \
+	unified-privacy.vala \
+	../alm-cc.c
+
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_SOURCES += \
+	../diagnostics-widget.c
+endif
+
+libactivity_log_manager_la_LDFLAGS = -module -avoid-version
+
+libactivity_log_manager_la_LIBADD = \
+	$(GTK_LIBS) \
+	$(ZEITGEIST_LIBS) \
+	$(GEE_LIBS) \
+	$(GIO_UNIX_LIBS) \
+	$(GLIB_LIBS) \
+	$(POLKIT_LIBS) \
+	-lm \
+	$(CCPANEL_LIBS)
+
+EXTRA_DIST = config.vapi

=== added directory 'src/unity-control-center'
=== added file 'src/unity-control-center/Makefile.am'
--- src/unity-control-center/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/unity-control-center/Makefile.am	2014-01-27 22:54:43 +0000
@@ -0,0 +1,79 @@
+AM_VALAFLAGS = \
+	--pkg zeitgeist-2.0 \
+	--pkg glib-2.0 \
+	--pkg gtk+-3.0 \
+	--pkg gee-1.0  \
+	--target-glib=2.26 \
+	--pkg gio-unix-2.0 \
+	../config.vapi
+
+if HAVE_UNITY_CCPANEL
+ccpaneldir = $(libdir)/unity-control-center-1/panels
+ccpanel_LTLIBRARIES = libactivity-log-manager.la
+endif
+
+libactivity_log_manager_la_CFLAGS = \
+	-Wall \
+	-g \
+	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\" \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	-DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\" \
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+	-DUSE_UNITY \
+	$(GTK_CFLAGS) $(ZEITGEIST_CFLAGS) $(GEE_CFLAGS) $(GIO_UNIX_CFLAGS) $(POLKIT_CFLAGS) \
+	$(UNITY_CCPANEL_CFLAGS)
+
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_CFLAGS += \
+	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\"
+endif
+
+searchresults-widget.vala: ../searchresults-widget.vala
+	cp ../searchresults-widget.vala searchresults-widget.vala
+security-widget.vala: ../security-widget.vala
+	cp ../security-widget.vala security-widget.vala
+blacklist-dbus.vala: ../blacklist-dbus.vala
+	cp ../blacklist-dbus.vala blacklist-dbus.vala
+activity-log-manager.vala: ../activity-log-manager.vala
+	cp ../activity-log-manager.vala activity-log-manager.vala
+unified-privacy-files.vala: ../unified-privacy-files.vala
+	cp ../unified-privacy-files.vala unified-privacy-files.vala
+unified-privacy-applications.vala: ../unified-privacy-applications.vala
+	cp ../unified-privacy-applications.vala unified-privacy-applications.vala
+unified-privacy-history.vala: ../unified-privacy-history.vala
+	cp ../unified-privacy-history.vala unified-privacy-history.vala
+unified-privacy.vala: ../unified-privacy.vala
+	cp ../unified-privacy.vala unified-privacy.vala
+
+libactivity_log_manager_la_SOURCES = \
+	searchresults-widget.vala \
+	security-widget.vala \
+	blacklist-dbus.vala \
+	activity-log-manager.vala \
+	unified-privacy-files.vala \
+	unified-privacy-applications.vala \
+	unified-privacy-history.vala \
+	unified-privacy.vala \
+	../alm-cc.c
+
+if HAVE_WHOOPSIE
+libactivity_log_manager_la_SOURCES += \
+	../diagnostics-widget.c
+endif
+
+libactivity_log_manager_la_LDFLAGS = -module -avoid-version
+
+libactivity_log_manager_la_LIBADD = \
+	$(GTK_LIBS) \
+	$(ZEITGEIST_LIBS) \
+	$(GEE_LIBS) \
+	$(GIO_UNIX_LIBS) \
+	$(GLIB_LIBS) \
+	$(POLKIT_LIBS) \
+	-lm \
+	$(UNITY_CCPANEL_LIBS)
+
+EXTRA_DIST = config.vapi

_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to     : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp

Reply via email to