Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Review: Approve -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Will try it out in a few hours (when back from work) and getting it merged. alm needs to be released today so that it can be uploaded before UIF hits -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
The proposal to merge lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Yep merging tomorrow first thing On Wed, Feb 22, 2012 at 12:41 AM, Evan Dandrea wrote: > On Tue, Feb 21, 2012 at 2:55 PM, Seif Lotfy wrote: > > Evan I dont mind also having it in the standalone version :D > > Sure, but presumably that requires building the whoopsie code as a > library and generating a vapi, as you cannot directly call C code from > vala source. > > So could we get that in a second pass, given that UI freeze is tomorrow? > > -- > https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 > Your team Activity Log Manager is subscribed to branch > lp:activity-log-manager. > -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
On Tue, Feb 21, 2012 at 2:55 PM, Seif Lotfy wrote: > Evan I dont mind also having it in the standalone version :D Sure, but presumably that requires building the whoopsie code as a library and generating a vapi, as you cannot directly call C code from vala source. So could we get that in a second pass, given that UI freeze is tomorrow? -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
On Tue, Feb 21, 2012 at 3:00 PM, Manish Sinha (मनीष सिन्हा wrote: > Review: Needs Fixing symbols > > I get symbol lookup error. This is what I did > > ./autogen.sh --prefix=/usr --with-ccpanel --with-whoopsie > sudo make install This should be fixed in r87. You don't have to specify both --with-ccpanel and --with-whoopsie. Setting --with-whoopsie will imply --with-ccpanel. -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Review: Needs Fixing symbols
I get symbol lookup error. This is what I did
./autogen.sh --prefix=/usr --with-ccpanel --with-whoopsie
sudo make install
Running as
$ gnome-control-center activity-log-manager
gnome-control-center: symbol lookup error:
/usr/lib/control-center-1/panels/libactivity-log-manager.so: undefined symbol:
whoopsie_daisy_preferences_new
Running strace
$ strace gnome-control-center activity-log-manager
futex(0x20f578b4, FUTEX_WAKE_OP_PRIVATE, 1, 1, 0x20f578b0, {FUTEX_OP_SET, 0,
FUTEX_OP_CMP_GT, 1}) = 1
futex(0x20f57fe0, FUTEX_WAKE_PRIVATE, 1) = 1
writev(2, [{"gnome-control-center", 20}, {": ", 2}, {"symbol lookup error",
19}, {": ", 2}, {"/usr/lib/control-center-1/panels"..., 59}, {": ", 2},
{"undefined symbol: whoopsie_daisy"..., 48}, {"", 0}, {"", 0}, {"\n", 1}],
10gnome-control-center: symbol lookup error:
/usr/lib/control-center-1/panels/libactivity-log-manager.so: undefined symbol:
whoopsie_daisy_preferences_new
) = 153
exit_group(127)
--
https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899
Your team Activity Log Manager is subscribed to branch lp:activity-log-manager.
___
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Evan I dont mind also having it in the standalone version :D -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
On Mon, Feb 20, 2012 at 10:05 PM, Seif Lotfy wrote: > Also I cant seem to see the panel anywhere... > Since this is being merged into an upstream project can you please make it so > it is disabled by default.. > It should be enabled upon configuring by passing a -enable-whoopsie parameter Okay, I've made the diagnostics tab optional. Enable it by passing --with-whoopsie to configure. You should then see a "Diagnostics" tab on the GNOME Control Center Privacy page's GtkNotebook. -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
On Tue, Feb 21, 2012 at 10:31 AM, Evan Dandrea wrote: > Okay, I've made the diagnostics tab optional. Enable it by passing > --with-whoopsie to configure. You should then see a "Diagnostics" tab > on the GNOME Control Center Privacy page's GtkNotebook. That's r86. -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Review: Needs Fixing build system Please make this as optional (--enable-whoopsie) otherwise it cannot be packaged in other distributions without whoopsie being packaged -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is subscribed to branch lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Also I cant seem to see the panel anywhere... Since this is being merged into an upstream project can you please make it so it is disabled by default.. It should be enabled upon configuring by passing a -enable-whoopsie parameter -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is requested to review the proposed merge of lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Since this is upstream work that will be deployed elsewhere I would like to have this part optional... Which means if possible can you make it so if i pass --enable-whoopsie or --mode=ubuntu upon configuring that the whoopsie widget appears. It should be disabled by default cheers Seif On Mon, Feb 20, 2012 at 10:48 PM, Evan Dandrea wrote: > On Mon, Feb 20, 2012 at 8:51 PM, Seif Lotfy wrote: > > Can you please make sure that the makefile is complete... I can't > compile it due to > > > > make[3]: *** No rule to make target `diagnostics/whoopsie-generated.c', > needed by `libactivity_log_manager_la_vala.stamp'. Stop. > > make[3]: Leaving directory `/home/seif/Projects/whoopsie/src' > > Fixed in r85. This was due to the autogenerated vala targets pulling > in libactivity-log-manager even when --with-ccpanel was not set. I've > worked around that by explicitly building against the C source > targets: > > activity_log_manager_la_SOURCES = \ >$(SOURCES:.vala=.c) alm-cc.c \ >diagnostics-widget.c \ >diagnostics/whoopsie-generated.c > > -- > https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 > Your team Activity Log Manager is requested to review the proposed merge > of lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager. > -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is requested to review the proposed merge of lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
On Mon, Feb 20, 2012 at 8:51 PM, Seif Lotfy wrote: > Can you please make sure that the makefile is complete... I can't compile it > due to > > make[3]: *** No rule to make target `diagnostics/whoopsie-generated.c', > needed by `libactivity_log_manager_la_vala.stamp'. Stop. > make[3]: Leaving directory `/home/seif/Projects/whoopsie/src' Fixed in r85. This was due to the autogenerated vala targets pulling in libactivity-log-manager even when --with-ccpanel was not set. I've worked around that by explicitly building against the C source targets: activity_log_manager_la_SOURCES = \ $(SOURCES:.vala=.c) alm-cc.c \ diagnostics-widget.c \ diagnostics/whoopsie-generated.c -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is requested to review the proposed merge of lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
Re: [Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Can you please make sure that the makefile is complete... I can't compile it due to make[3]: *** No rule to make target `diagnostics/whoopsie-generated.c', needed by `libactivity_log_manager_la_vala.stamp'. Stop. make[3]: Leaving directory `/home/seif/Projects/whoopsie/src' -- https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899 Your team Activity Log Manager is requested to review the proposed merge of lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager. ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
[Zeitgeist] [Merge] lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager
Evan Dandrea has proposed merging lp:~ev/activity-log-manager/whoopsie 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/whoopsie/+merge/93899
As discussed with Seif and the Canonical design team, we should merge the two
existing privacy pages in GNOME Control Center into a single entity, under
activity-log-manager. Here is a branch to do just that.
Christian has provided the following mockup as guidance:
http://dl.dropbox.com/u/2935618/canonical/ss/privacy-7.png
The privacy page for the Ubuntu crash report settings, hereafter referred to as
"diagnostics," provides a small DBus daemon for writing the root-owned
/etc/default/whoopsie preferences file.
This also adds a dependency on PolicyKit.
I've only made one change to activity-log-manager itself, which exposes a new
append_page method to allow adding the diagnostics page.
As stated previously in #ubuntu-release and #ubuntu-devel, this code already
exists in another form in the archive (whoopsie-daisy), and it is the release
team's belief that it therefore falls under UI Freeze and not Feature Freeze.
However, care will have to be taken to coordinate a release of whoopsie-daisy
that does not have the aforementioned files.
--
https://code.launchpad.net/~ev/activity-log-manager/whoopsie/+merge/93899
Your team Activity Log Manager is requested to review the proposed merge of
lp:~ev/activity-log-manager/whoopsie into lp:activity-log-manager.
=== modified file '.bzrignore'
--- .bzrignore 2012-02-15 19:55:47 +
+++ .bzrignore 2012-02-20 20:39:19 +
@@ -31,6 +31,7 @@
src/applications-widget.c
src/files-widget.c
src/history-widget.c
+src/diagnostics/Makefile
po/*.gmo
src/*.lo
po/stamp-it
=== modified file 'configure.ac'
--- configure.ac 2012-02-14 20:20:46 +
+++ configure.ac 2012-02-20 20:39:19 +
@@ -35,6 +35,7 @@
PKG_CHECK_MODULES(GTK, gtk+-3.0, [HAVE_GTK=yes], [HAVE_GTK=no])
PKG_CHECK_MODULES(GEE, gee-1.0, [HAVE_GEE=yes], [HAVE_GEE=no])
PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0, [HAVE_GIO_UNIX=yes], [HAVE_GIO_UNIX=no])
+PKG_CHECK_MODULES(POLKIT, polkit-gobject-1, [HAVE_POLKIT=yes], [HAVE_POLKIT=no])
AC_ARG_WITH([extensiondir],
[AS_HELP_STRING([--with-extensiondir],
@@ -71,5 +72,6 @@
Makefile
data/Makefile
src/Makefile
+src/diagnostics/Makefile
po/Makefile.in
])
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2012-02-14 20:20:46 +
+++ po/POTFILES.in 2012-02-20 20:39:19 +
@@ -6,3 +6,4 @@
src/applications-widget.vala
src/files-widget.vala
src/history-widget.vala
+src/diagnostics/whoopsie.ui
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-02-08 14:19:18 +
+++ src/Makefile.am 2012-02-20 20:39:19 +
@@ -3,6 +3,8 @@
ccpanel_LTLIBRARIES = libactivity-log-manager.la
endif
+SUBDIRS = diagnostics
+
VALAFLAGS = \
--pkg zeitgeist-1.0 \
--pkg gtk+-3.0 \
@@ -13,6 +15,8 @@
bin_PROGRAMS = activity-log-manager
+gnomeccuidir = $(datadir)/gnome-control-center/ui/
+
SHARED_CFLAGS = \
-Wall \
-g \
@@ -21,14 +25,15 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\" \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+-DGNOMECC_UI_DIR=\""$(gnomeccuidir)"\" \
$(GTK_CFLAGS) $(ZEITGEIST_CFLAGS) $(GEE_CFLAGS) $(GIO_UNIX_CFLAGS)
activity_log_manager_CFLAGS = \
$(SHARED_CFLAGS)
libactivity_log_manager_la_CFLAGS = \
$(SHARED_CFLAGS) \
+$(POLKIT_CFLAGS) \
$(CCPANEL_CFLAGS)
-
SOURCES = \
activity-log-manager.vala \
history-widget.vala \
@@ -38,7 +43,9 @@
activity_log_manager_SOURCES = \
$(SOURCES) alm.vala
libactivity_log_manager_la_SOURCES = \
- $(SOURCES) alm-cc.c
+ $(SOURCES) alm-cc.c \
+diagnostics-widget.c \
+diagnostics/whoopsie-generated.c
activity_log_manager_LDFLAGS = \
-Wl,--export-dynamic
@@ -53,6 +60,7 @@
$(SHARED_LIBS)
libactivity_log_manager_la_LIBADD = \
$(SHARED_LIBS) \
+$(POLKIT_LIBS) \
$(CCPANEL_LIBS)
GENERATED_C_FILES = $(alm_SOURCES:.vala=.c)
@@ -62,7 +70,3 @@
CLEANFILES = \
$(GENERATED_C_FILES) \
$(GENERATED_O_FILES)
-
-
-
-
=== modified file 'src/activity-log-manager.vala'
--- src/activity-log-manager.vala 2012-02-18 21:38:27 +
+++ src/activity-log-manager.vala 2012-02-20 20:39:19 +
@@ -71,6 +71,10 @@
this.show_all();
}
+public void append_page (Gtk.Widget widget, string label) {
+ var app_label = new Gtk.Label(_(label));
+ notebook.append_page(widget, app_label);
+}
public void on_incognito_toggled(bool status) {
this.logging_switch.set_active(!status);
}
=== modified file 'src/alm-cc.c'
--- src/alm-cc.c 2012-02-11 16:53:55 +
+++ src/alm-cc.c 2012-02-20 20:39:19 +
@@ -21,6 +21,8 @@
#include "config.h"
extern void* alm_activity_log_manager_new (void);
+extern void alm_activity_log_manager_append_page (void* alm, GtkWidget* widget, const gchar* label);
+extern void* whoopsie
