zeitgeist team mailing list archive

[Evan Dandrea <evan.dandrea@xxxxxxxxxxxxx>]

Evan Dandrea has proposed merging lp:~ev/activity-log-manager/1192778 into lp:activity-log-manager.

Requested reviews:
  Activity Log Manager (activity-log-manager)

For more details, see:
https://code.launchpad.net/~ev/activity-log-manager/1192778/+merge/172098

Fixes bug 1192778. :)
-- 
https://code.launchpad.net/~ev/activity-log-manager/1192778/+merge/172098
Your team Activity Log Manager is requested to review the proposed merge of lp:~ev/activity-log-manager/1192778 into lp:activity-log-manager.

=== modified file 'configure.ac'
--- configure.ac	2013-06-20 02:06:00 +0000
+++ configure.ac	2013-06-28 16:25:33 +0000
@@ -62,7 +62,7 @@
 AC_ARG_WITH([whoopsie],
   [AS_HELP_STRING([--with-whoopsie],
     [build control-center plugin Ubuntu crash reporting page @<:@default=check@:>@])],
-  [with_ccpanel=yes],
+  [with_ccpanel=check],
   [with_whoopsie=check])
 
 AC_ARG_WITH([ccpanel],
@@ -95,10 +95,6 @@
 
   AC_SUBST(CCPANEL_DIR),
   [
-    if test "x$with_whoopsie" != xcheck; then
-      AC_MSG_FAILURE(
-        [--with-whoopsie was given, but test for libgnome-control-center failed])
-    fi
     if test "x$with_ccpanel" != xcheck; then
       AC_MSG_FAILURE(
         [--with-ccpanel was given, but test for libgnome-control-center failed])

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-06-18 12:37:52 +0000
+++ src/Makefile.am	2013-06-28 16:25:33 +0000
@@ -11,13 +11,14 @@
 SHARED_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)
+	$(GTK_CFLAGS) $(ZEITGEIST_CFLAGS) $(GEE_CFLAGS) $(GIO_UNIX_CFLAGS) $(POLKIT_CFLAGS)
 
 
 SHARED_SOURCES = \
@@ -36,6 +37,7 @@
 	$(GEE_LIBS) \
 	$(GIO_UNIX_LIBS) \
 	$(GLIB_LIBS) \
+	$(POLKIT_LIBS) \
 	-lm
 
 alm_switchboard_SOURCES = \
@@ -43,6 +45,12 @@
 	alm-plug.vala \
 	$(NULL)
 
+if HAVE_WHOOPSIE
+alm_switchboard_SOURCES += \
+	diagnostics-widget.c \
+	diagnostics/whoopsie-generated.c
+endif
+
 if HAVE_SWITCHBOARD
 switchboarddir = $(prefix)/lib/plugs/zeitgeist/alm
 switchboard_PROGRAMS = alm-switchboard
@@ -81,7 +89,6 @@
 
 if HAVE_WHOOPSIE
 libactivity_log_manager_la_CFLAGS += \
-	$(POLKIT_CFLAGS) \
 	-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\"
 endif
 
@@ -89,6 +96,13 @@
 	$(SHARED_SOURCES) \
 	alm.vala \
 	$(NULL)
+
+if HAVE_WHOOPSIE
+activity_log_manager_SOURCES += \
+	diagnostics-widget.c \
+	diagnostics/whoopsie-generated.c
+endif
+
 libactivity_log_manager_la_SOURCES = \
 	$(SHARED_SOURCES:.vala=.c) \
 	alm-cc.c
@@ -115,9 +129,8 @@
 	$(POLKIT_LIBS)
 endif
 
-GENERATED_C_FILES = $(activity_log_manager_SOURCES:.vala=.c)
-
-GENERATED_O_FILES = $(activity_log_manager_SOURCES:.vala=.o)
+GENERATED_C_FILES = $(SHARED_SOURCES:.vala=.c)
+GENERATED_O_FILES = $(SHARED_SOURCES:.vala=.o)
 
 CLEANFILES = \
 	$(GENERATED_C_FILES) \

=== modified file 'src/activity-log-manager.vala'
--- src/activity-log-manager.vala	2013-06-20 05:29:55 +0000
+++ src/activity-log-manager.vala	2013-06-28 16:25:33 +0000
@@ -19,11 +19,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.";
  */
+extern Gtk.Widget whoopsie_daisy_preferences_new ();
+
 namespace Alm {
 
 	public class ActivityLogManager : Gtk.Box {
 		private Gtk.Notebook notebook;
 		private PrivacyWidget privacy_widget;
+        private Gtk.Widget whoopsie;
 
 		private Blacklist blacklist;
 
@@ -36,11 +39,14 @@
 
 			blacklist = new Blacklist();
 			privacy_widget = new PrivacyWidget(blacklist);
+            whoopsie = whoopsie_daisy_preferences_new ();
 
 			notebook = new Gtk.Notebook();
 			this.pack_start(notebook, true, true, 0);
 			var privacy_label = new Gtk.Label(_("Files & Applications"));
 			notebook.append_page(privacy_widget, privacy_label);
+            var whoopsie_label = new Gtk.Label(_("Diagnostics"));
+            notebook.append_page(whoopsie, whoopsie_label);
 			this.show_all();
 		}
 

=== modified file 'src/alm-cc.c'
--- src/alm-cc.c	2013-06-19 15:15:46 +0000
+++ src/alm-cc.c	2013-06-28 16:25:33 +0000
@@ -22,10 +22,6 @@
 #include <libgnome-control-center/cc-panel.h>
 
 extern void* alm_activity_log_manager_new (void);
-#ifdef HAVE_WHOOPSIE
-extern void alm_activity_log_manager_append_page (void* alm, GtkWidget* widget, const gchar* label);
-extern GtkWidget* whoopsie_daisy_preferences_new (void);
-#endif
 
 #define ALM_TYPE_MAIN_WINDOW_PANEL alm_main_window_panel_get_type()
 
@@ -58,10 +54,6 @@
 alm_main_window_panel_init (AlmMainWindowPanel *self)
 {
   GtkWidget *widget = GTK_WIDGET (alm_activity_log_manager_new ());
-#ifdef HAVE_WHOOPSIE
-  GtkWidget *whoopsie = GTK_WIDGET (whoopsie_daisy_preferences_new ());
-  alm_activity_log_manager_append_page (widget, whoopsie, _("Diagnostics"));
-#endif
   gtk_widget_show_all (widget);
   gtk_container_add (GTK_CONTAINER (self), widget);
 }