[Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/unity-control-center2 into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/unity-control-center2 into lp:activity-log-manager has been updated. Commit Message changed to: Add support for Unity Control Center. 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. ___ 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:~robert-ancell/activity-log-manager/unity-control-center2 into lp:activity-log-manager
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 +
+++ configure.ac 2014-01-27 22:54:43 +
@@ -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 +
+++ data/Makefile.am 2014-01-27 22:54:43 +
@@ -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 +
+++ data/unity-activity-log-manager-panel.desktop.in 2014-01-27 22:54:43 +
@@ -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 +
+++ po/POTFILES.in 2014-01-27 22:54:43 +
@@ -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 fil
[Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/files-and-apps-description into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/files-and-apps-description into lp:activity-log-manager has been updated. Commit Message changed to: Set descriptive text in Files and Applications tab to match design in https://wiki.ubuntu.com/SecurityAndPrivacySettings#files For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/files-and-apps-description/+merge/204148 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/files-and-apps-description/+merge/204148 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/files-and-apps-description 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:~robert-ancell/activity-log-manager/files-and-apps-description into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/files-and-apps-description into
lp:activity-log-manager.
Commit message:
Set descriptive text in Files and Applications tab to match design in
https://wiki.ubuntu.com/SecurityAndPrivacySettings#files
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #1263123 in Activity Log Manager: ""Security & Privacy" > "Files &
Applications" refers mysteriously to "This Operating System" and
"functionality""
https://bugs.launchpad.net/activity-log-manager/+bug/1263123
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/files-and-apps-description/+merge/204148
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/files-and-apps-description/+merge/204148
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/files-and-apps-description into
lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-11 02:13:34 +
+++ src/unified-privacy.vala 2014-01-31 02:15:00 +
@@ -170,7 +170,7 @@
private void setup_ui() {
this.set_border_width(12);
- string text = _("This Operating System keeps track of Files and Applications you've used to provide extra functionality. If other people can see or access your user account, you may wish to limit which items are recorded.");
+ string text = _("Files and applications you’ve used recently can be shown in the Dash and elsewhere. If other people can see or access your user account, you may wish to limit which items are recorded.");
var label = new Label("");
label.set_markup("%s".printf(text));
label.set_line_wrap(true);
___
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:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager has been updated. Commit Message changed to: Stop control center panel from expanding too wide For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/panel-width/+merge/204452 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/panel-width/+merge/204452 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/panel-width 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:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager
Robert Ancell has proposed merging lp:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager. Commit message: Stop control center panel from expanding too wide Requested reviews: Activity Log Manager (activity-log-manager) Related bugs: Bug #1265239 in activity-log-manager (Ubuntu): "Security and Privacy in System Settings is too big" https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1265239 For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/panel-width/+merge/204452 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/panel-width/+merge/204452 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager. === modified file 'src/unified-privacy.vala' --- src/unified-privacy.vala 2013-07-11 02:13:34 + +++ src/unified-privacy.vala 2014-02-03 10:59:45 + @@ -176,6 +176,7 @@ label.set_line_wrap(true); label.set_line_wrap_mode(Pango.WrapMode.WORD); label.set_alignment(0, 0.5f); + label.set_max_width_chars(60); this.pack_start(label, false); record_button = new Switch(); @@ -250,7 +251,7 @@ al.add (checkbox_label); var checkbox_vbox = new Box(Orientation.VERTICAL, 0); - checkbox_vbox.pack_start (al, false); + checkbox_vbox.pack_start (al, false, false, 5); checkbox_vbox.pack_start (checkbox_hbox, true); //Exception List @@ -328,8 +329,8 @@ exception_vbox.pack_start(exception_toolbar, false, false); - var general_hbox = new Box(Orientation.HORIZONTAL, 0); - general_hbox.pack_start(checkbox_vbox, true); + var general_hbox = new Box(Orientation.HORIZONTAL, 5); + general_hbox.pack_start(checkbox_vbox, false); general_hbox.pack_start(exception_vbox, true); this.pack_start(general_hbox, false); ___ 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:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager has been updated. Commit Message changed to: Destroy DBus proxy when preferences widget is destroyed For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/proxy-unref/+merge/204489 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/proxy-unref/+merge/204489 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/proxy-unref 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:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager.
Commit message:
Destroy DBus proxy when preferences widget is destroyed
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #1275736 in activity-log-manager (Ubuntu):
"/usr/bin/gnome-control-center.real:11:gtk_builder_get_object:on_properties_changed:ffi_call_unix64:ffi_call:g_cclosure_marshal_generic"
https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1275736
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/proxy-unref/+merge/204489
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/proxy-unref/+merge/204489
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager.
=== modified file 'src/diagnostics-widget.c'
--- src/diagnostics-widget.c 2013-07-19 10:31:55 +
+++ src/diagnostics-widget.c 2014-02-03 13:48:17 +
@@ -8,8 +8,6 @@
#include "whoopsie-preferences/libwhoopsie-preferences.h"
-static WhoopsiePreferences* proxy = NULL;
-
#define POL_PATH "com.ubuntu.whoopsiepreferences.change"
#define PRIVACY_URL "http://www.ubuntu.com/aboutus/privacypolicy?crashdb";
#define SYSTEM_ERRORS_URL "https://errors.ubuntu.com/user";
@@ -31,6 +29,7 @@
{
GtkBuilder* builder;
GPermission* permission;
+WhoopsiePreferences* proxy;
};
struct _WhoopsieDaisyPreferences
@@ -59,6 +58,10 @@
g_object_unref (priv->permission);
priv->permission = NULL;
}
+if (priv->proxy) {
+g_object_unref (priv->proxy);
+priv->proxy = NULL;
+}
}
static void
@@ -79,10 +82,12 @@
static void
on_show_previous_reports_clicked (GtkWidget* button, gpointer user_data)
{
+WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (user_data)->priv;
GError* error = NULL;
gchar* identifier = NULL;
gchar* command = NULL;
-whoopsie_preferences_call_get_identifier_sync (proxy, &identifier, NULL, &error);
+
+whoopsie_preferences_call_get_identifier_sync (priv->proxy, &identifier, NULL, &error);
if (!error) {
asprintf (&command, "xdg-open " SYSTEM_ERRORS_URL "/%s", identifier);
@@ -117,9 +122,10 @@
static void
on_submit_error_reports_checked (GtkToggleButton* button, gpointer user_data)
{
+WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (user_data)->priv;
GError* error = NULL;
-whoopsie_preferences_call_set_report_crashes_sync (proxy,
+whoopsie_preferences_call_set_report_crashes_sync (priv->proxy,
gtk_toggle_button_get_active (button), NULL, &error);
if (error != NULL) {
g_printerr ("Error setting crash reporting: %s\n", error->message);
@@ -130,9 +136,10 @@
static void
on_submit_metrics_reports_checked (GtkToggleButton* button, gpointer user_data)
{
+WhoopsieDaisyPreferencesPrivate* priv = WHOOPSIE_DAISY_PREFERENCES (user_data)->priv;
GError* error = NULL;
-whoopsie_preferences_call_set_report_metrics_sync (proxy,
+whoopsie_preferences_call_set_report_metrics_sync (priv->proxy,
gtk_toggle_button_get_active (button), NULL, &error);
if (error != NULL) {
g_printerr ("Error setting metrics reporting: %s\n", error->message);
@@ -166,17 +173,19 @@
static void
whoopsie_daisy_preferences_setup_dbus (WhoopsieDaisyPreferences *self, GError *error)
{
-proxy = whoopsie_preferences_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+WhoopsieDaisyPreferencesPrivate* priv = self->priv;
+
+priv->proxy = whoopsie_preferences_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_NONE,
"com.ubuntu.WhoopsiePreferences",
"/com/ubuntu/WhoopsiePreferences",
NULL, &error);
-if (!proxy)
+if (!priv->proxy)
return;
-g_signal_connect (proxy, "g-properties-changed",
+g_signal_connect (priv->proxy, "g-properties-changed",
G_CALLBACK (on_properties_changed), self);
-on_properties_changed (proxy, NULL, NULL, self);
+on_properties_changed (priv->proxy, NULL, NULL, self);
}
static void
whoopsie_daisy_preferences_init (WhoopsieDaisyPreferences *self)
@@ -237,13 +246,13 @@
}
g_signal_connect (submit_error_reports, "toggled",
- G_CALLBACK (on_submit_error_reports_checked), NULL);
+ G_CALLBACK (on_submit_error_reports_checked), self);
g_signal_connect (submit_metrics_reports, "toggled&
[Zeitgeist] [Merge] lp:~robert-ancell/activity-log-manager/no-directory-icons into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/no-directory-icons into lp:activity-log-manager has been updated. Commit Message changed to: Fix directory icons not showing due to an unconstructed HashMap For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/no-directory-icons/+merge/204504 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/no-directory-icons/+merge/204504 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/no-directory-icons 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:~robert-ancell/activity-log-manager/no-directory-icons into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/no-directory-icons into
lp:activity-log-manager.
Commit message:
Fix directory icons not showing due to an unconstructed HashMap
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/no-directory-icons/+merge/204504
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/no-directory-icons/+merge/204504
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/no-directory-icons into
lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-11 02:13:34 +
+++ src/unified-privacy.vala 2014-02-03 14:49:32 +
@@ -136,6 +136,7 @@
UserDirectory.VIDEOS
};
+ defined_dirs = new HashMap(str_hash, str_equal);
for(int i = 0; i < special_dirs.length; i++) {
string dir_path = Environment.get_user_special_dir(special_dirs[i]);
if (dir_path != null) {
___
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:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager has been updated. Commit Message changed to: Remove margin around security page as it is inconsistent with the other pages For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/security-spacing/+merge/204532 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/security-spacing/+merge/204532 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/security-spacing 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:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager
Robert Ancell has proposed merging lp:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager. Commit message: Remove margin around security page as it is inconsistent with the other pages Requested reviews: Activity Log Manager (activity-log-manager) For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/security-spacing/+merge/204532 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/security-spacing/+merge/204532 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager. === modified file 'src/security-widget.vala' --- src/security-widget.vala 2013-07-09 01:34:49 + +++ src/security-widget.vala 2014-02-03 16:38:29 + @@ -63,8 +63,6 @@ var grid = new Grid(); grid.set_halign(Align.START); grid.set_valign(Align.START); - grid.set_margin_top(25); - grid.set_margin_left(25); grid.set_column_spacing(25); grid.set_row_spacing(5); grid.set_row_homogeneous(true); ___ 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:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager.
Commit message:
Gtk.Stock is deprecated
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/no-stock/+merge/204512
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/no-stock/+merge/204512
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager.
=== modified file 'src/history-widget.vala'
--- src/history-widget.vala 2013-07-10 06:24:51 +
+++ src/history-widget.vala 2014-02-03 15:17:45 +
@@ -99,8 +99,7 @@
this.pack_end(new Gtk.Box(Orientation.HORIZONTAL, 0), true, true);
this.pack_end(this.button_box, false, false);
- this.del_button = new Button.from_stock(Stock.DELETE);
- del_button.set_label(_("Delete history"));
+ this.del_button = new Button.with_label(_("Delete history"));
// Create Calendar
this.calendar_box = new CalendarWidget(del_button);
@@ -141,8 +140,8 @@
yield;
var dialog = new Gtk.Dialog();
- dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);
- dialog.add_button(Stock.YES, ResponseType.OK);
+ dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
+ dialog.add_button(_("_Yes"), ResponseType.OK);
dialog.set_title("");
var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));
=== modified file 'src/unified-privacy-applications.vala'
--- src/unified-privacy-applications.vala 2013-07-09 01:34:49 +
+++ src/unified-privacy-applications.vala 2014-02-03 15:17:45 +
@@ -531,7 +531,7 @@
this.treeview = new AppSelectionTreeView (this.app_blacklist);
var area = this.get_content_area () as Gtk.Box;
area.pack_start(this.treeview);
- this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);
+ this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
this.treeview.show_all ();
}
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-11 02:13:34 +
+++ src/unified-privacy.vala 2014-02-03 15:17:45 +
@@ -144,7 +144,7 @@
}
//FIXME: Not sure if the correct icon is being fetched for stock folder
- stock_folder_icon = this.render_icon_pixbuf(Stock.DIRECTORY, IconSize.LARGE_TOOLBAR);
+ stock_folder_icon = this.render_icon_pixbuf("gtk-directory", IconSize.LARGE_TOOLBAR);
//Application Stuffs
this.blocked_list = new HashTable(str_hash, str_equal);
@@ -194,8 +194,7 @@
}
});
- this.del_button = new Button.from_stock(Stock.DELETE);
- del_button.set_label(_("Clear Usage Data…"));
+ this.del_button = new Button.with_label(_("Clear Usage Data…"));
del_button.clicked.connect(()=> {
delete_dialog.on_delete_history ();
@@ -389,7 +388,7 @@
var chooser = new FileChooserDialog(
_("Select a folder to blacklist"),
null, FileChooserAction.SELECT_FOLDER);
- chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
+ chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
int res = chooser.run();
chooser.hide();
if(res == ResponseType.OK)
@@ -407,7 +406,7 @@
var chooser = new FileChooserDialog(
_("Select a file to blacklist"),
null, FileChooserAction.OPEN);
- chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
+ chooser.add_buttons (_("_OK"), ResponseType.OK, _("_Cancel"), ResponseType.CANCEL);
int res = chooser.run();
chooser.hide();
if(res == ResponseType.OK)
@@ -808,7 +807,7 @@
var area = this.get_content_area () as Gtk.Box;
area.pack_start(vbox, false, false, 0);
- this.add_buttons (Stock.CANCEL, ResponseType.CANCEL, Stock.OK, ResponseType.OK);
+ this.add_buttons (_("_Cancel"), ResponseType.CANCEL, _("_OK"), ResponseType.OK);
}
public int get_active_radio_button () {
@@ -868,8 +867,8 @@
yield;
var dialog = new Gtk.Dialog();
- dialog.add_button(Stock.CANCEL, ResponseType.CANCEL);
- dialog.add_button(Stock.YES, ResponseType.OK);
+ dialog.add_button(_("_Cancel"), ResponseType.CANCEL);
+ dialog.add_button(_("_Yes"), ResponseType.OK);
dialog.set_title("");
var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));
___
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:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/no-stock into lp:activity-log-manager has been updated. Commit Message changed to: Gtk.Stock is deprecated For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/no-stock/+merge/204512 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/no-stock/+merge/204512 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/no-stock 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:~robert-ancell/activity-log-manager/comma-splice into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/comma-splice into
lp:activity-log-manager.
Commit message:
Remove comma splices
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #1264587 in Activity Log Manager: "Punctuation errors in dialog"
https://bugs.launchpad.net/activity-log-manager/+bug/1264587
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/comma-splice/+merge/204542
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/comma-splice/+merge/204542
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/comma-splice into
lp:activity-log-manager.
=== modified file 'src/history-widget.vala'
--- src/history-widget.vala 2013-07-10 06:24:51 +
+++ src/history-widget.vala 2014-02-03 17:32:41 +
@@ -145,7 +145,7 @@
dialog.add_button(Stock.YES, ResponseType.OK);
dialog.set_title("");
- var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));
+ var label = new Gtk.Label(_("This operation cannot be undone. Are you sure you want to delete this activity?"));
label.set_line_wrap(true);
label.set_line_wrap_mode(Pango.WrapMode.WORD);
label.set_padding(9,9);
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-11 02:13:34 +
+++ src/unified-privacy.vala 2014-02-03 17:32:41 +
@@ -872,7 +872,7 @@
dialog.add_button(Stock.YES, ResponseType.OK);
dialog.set_title("");
- var label = new Gtk.Label(_("This operation cannot be undone, are you sure you want to delete this activity?"));
+ var label = new Gtk.Label(_("This operation cannot be undone. Are you sure you want to delete this activity?"));
label.set_line_wrap(true);
label.set_line_wrap_mode(Pango.WrapMode.WORD);
label.set_padding(9,9);
___
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:~robert-ancell/activity-log-manager/comma-splice into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/comma-splice into lp:activity-log-manager has been updated. Commit Message changed to: Remove comma splices For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/comma-splice/+merge/204542 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/comma-splice/+merge/204542 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/comma-splice 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:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/time-combo-translation into
lp:activity-log-manager.
Commit message:
Mark time combo values as translatable
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #1241028 in Activity Log Manager: "Menu not translated"
https://bugs.launchpad.net/activity-log-manager/+bug/1241028
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/time-combo-translation into
lp:activity-log-manager.
=== modified file 'src/security-widget.vala'
--- src/security-widget.vala 2013-07-09 01:34:49 +
+++ src/security-widget.vala 2014-02-03 17:33:03 +
@@ -42,23 +42,23 @@
var liststore_delay = new ListStore (2, typeof (string), typeof (int));
TreeIter iter;
liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "1 second", 1, 0);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "30 seconds", 1, 30);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "1 minute", 1, 60);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "2 minutes", 1, 120);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "3 minutes", 1, 180);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "5 minutes", 1, 300);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "10 minutes", 1, 600);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "30 minutes", 1, 1800);
- liststore_delay.append (out iter);
- liststore_delay.set (iter, 0, "1 hour", 1, 3600);
+ liststore_delay.set (iter, 0, _("1 second"), 1, 0);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("30 seconds"), 1, 30);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("1 minute"), 1, 60);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("2 minutes"), 1, 120);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("3 minutes"), 1, 180);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("5 minutes"), 1, 300);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("10 minutes"), 1, 600);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("30 minutes"), 1, 1800);
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, _("1 hour"), 1, 3600);
var grid = new Grid();
grid.set_halign(Align.START);
___
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] [Bug 983690] Re: symbolic links circumvent blacklist
Closing activity-log-manager task since we set the directories correctly, it's just Zeitgeist that isn't handling them. ** No longer affects: activity-log-manager -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/983690 Title: symbolic links circumvent blacklist Status in Zeitgeist Framework: Confirmed Bug description: By blacklisting path "/home/user/folder", I would expect Zeitgeist to stop logging all activities regarding files within that folder. Still, logging happens to those files, if their path include symlinks like "/home/user/Desktop/folder" pointing to "/home/user/folder". To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/983690/+subscriptions ___ 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] [Bug 930091] Re: offer deletion of existing events for newly-added blacklists
** Changed in: activity-log-manager Status: Confirmed => Triaged ** Changed in: activity-log-manager Importance: Undecided => Medium ** Changed in: activity-log-manager Importance: Medium => Wishlist -- You received this bug notification because you are a member of Activity Log Manager, which is subscribed to the bug report. https://bugs.launchpad.net/bugs/930091 Title: offer deletion of existing events for newly-added blacklists Status in Privacy Manager for Zeitgeist: Triaged Bug description: seiflotfy, btw when someone adds a blacklist do you offer him to delete events that already match the newly-added blacklist To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/930091/+subscriptions ___ 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] [Bug 1064916] Re: Excluded directory shown in recent files when accessed
Reassigning to Zeitgeist since it does the filtering. ** Project changed: activity-log-manager => zeitgeist ** Package changed: activity-log-manager (Ubuntu) => zeitgeist (Ubuntu) -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1064916 Title: Excluded directory shown in recent files when accessed Status in Zeitgeist Framework: Triaged Status in “zeitgeist” package in Ubuntu: Confirmed Bug description: With the "Privacy" tool, I set /home/user/Private to be excluded. I browsed to the folder in Nautilus, then opened files inside the folder. FIles inside the folder are not logged, but the folder itself is. Thus "Private" shows up in my recent files, negating the point of excluding it. Ubuntu 12.04 64-bit. user@office:~$ dpkg -l | grep zeitgeist ii libzeitgeist-1.0-1 0.3.18-1ubuntu1 library to access Zeitgeist - shared library ii python-zeitgeist 0.9.0-1ubuntu1 event logging framework - Python bindings ii rhythmbox-plugin-zeitgeist 2.96-0ubuntu4.2 zeitgeist plugin for rhythmbox music player ii zeitgeist 0.9.0-1ubuntu1 event logging framework ii zeitgeist-core 0.9.0-1ubuntu1 event logging framework - engine ii zeitgeist-datahub 0.8.2-1ubuntu2 event logging framework - passive logging daemon To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1064916/+subscriptions ___ 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:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager has been updated. Commit Message changed to: Mark time combo values as translatable For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/time-combo-translation 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:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager has been updated. Commit Message changed to: Open control center links in unity-control-center if appropriate For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/ucc-links/+merge/215790 -- https://code.launchpad.net/~robert-ancell/activity-log-manager/ucc-links/+merge/215790 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/ucc-links 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:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager
Robert Ancell has proposed merging
lp:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager.
Commit message:
Open control center links in unity-control-center if appropriate
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #1306840 in activity-log-manager (Ubuntu): "There are dead link in System
Settings -> Security & Privacy -> Security"
https://bugs.launchpad.net/ubuntu/+source/activity-log-manager/+bug/1306840
For more details, see:
https://code.launchpad.net/~robert-ancell/activity-log-manager/ucc-links/+merge/215790
--
https://code.launchpad.net/~robert-ancell/activity-log-manager/ucc-links/+merge/215790
Your team Activity Log Manager is requested to review the proposed merge of
lp:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager.
=== modified file 'src/security-widget.vala'
--- src/security-widget.vala 2014-02-06 16:12:21 +
+++ src/security-widget.vala 2014-04-15 02:03:59 +
@@ -111,7 +111,12 @@
var link_password = new Gtk.LinkButton (_("Password Settings"));
link_password.activate_link.connect (() => {
try {
- Process.spawn_command_line_async ("gnome-control-center user-accounts");
+ var have_ucc = Environment.find_program_in_path ("unity-control-center") != null;
+ var have_gcc = Environment.find_program_in_path ("gnome-control-center") != null;
+ if (have_ucc && (!have_gcc || Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity"))
+ Process.spawn_command_line_async ("unity-control-center user-accounts");
+ else
+ Process.spawn_command_line_async ("gnome-control-center user-accounts");
} catch (SpawnError e) {
warning ("%s", e.message);
}
@@ -124,7 +129,12 @@
var link_power = new Gtk.LinkButton(_("Power Settings"));
link_power.activate_link.connect (() => {
try {
- Process.spawn_command_line_async ("gnome-control-center power");
+ var have_ucc = Environment.find_program_in_path ("unity-control-center") != null;
+ var have_gcc = Environment.find_program_in_path ("gnome-control-center") != null;
+ if (have_ucc && (!have_gcc || Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity"))
+ Process.spawn_command_line_async ("unity-control-center power");
+ else
+ Process.spawn_command_line_async ("gnome-control-center power");
} catch (SpawnError e) {
warning ("%s", e.message);
}
___
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:~luolei/activity-log-manager/fix-1375598 into lp:activity-log-manager
Review: Approve Looks great, thanks Luo! -- https://code.launchpad.net/~luolei/activity-log-manager/fix-1375598/+merge/241236 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:~luolei/activity-log-manager/fix-1375598 into lp:activity-log-manager
I think it will occur when the next upload occurs. I don't know when that will be - activity-log-manager doesn't seem to be actively developed anymore. Which release are you expecting this update to land into? -- https://code.launchpad.net/~luolei/activity-log-manager/fix-1375598/+merge/241236 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:~luolei/activity-log-manager/fix-1375598 into lp:activity-log-manager
If you want this in 14.04 you'll have to propose a SRU -- https://code.launchpad.net/~luolei/activity-log-manager/fix-1375598/+merge/241236 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:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager
Oh, I now have access to merge into trunk. I'll do it myself. -- https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/time-combo-translation 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:~laney/activity-log-manager/toolbar-iconsize into lp:activity-log-manager
The proposal to merge lp:~laney/activity-log-manager/toolbar-iconsize into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~laney/activity-log-manager/toolbar-iconsize/+merge/235132 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~laney/activity-log-manager/toolbar-iconsize 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:~robert-ancell/activity-log-manager/unity-control-center2 into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/unity-control-center2 into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: 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. ___ 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:~robert-ancell/activity-log-manager/files-and-apps-description into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/files-and-apps-description into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/files-and-apps-description/+merge/204148 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/files-and-apps-description 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:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/proxy-unref into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/proxy-unref/+merge/204489 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/proxy-unref 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:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/panel-width into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/panel-width/+merge/204452 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/panel-width 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:~kelemeng/activity-log-manager/bug1409550 into lp:activity-log-manager
The proposal to merge lp:~kelemeng/activity-log-manager/bug1409550 into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~kelemeng/activity-log-manager/bug1409550/+merge/246083 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~kelemeng/activity-log-manager/bug1409550 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:~robert-ancell/activity-log-manager/no-directory-icons into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/no-directory-icons into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/no-directory-icons/+merge/204504 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/no-directory-icons 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:~ballogy/activity-log-manager/gee-0.8 into lp:activity-log-manager
The proposal to merge lp:~ballogy/activity-log-manager/gee-0.8 into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~ballogy/activity-log-manager/gee-0.8/+merge/245270 -- 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. ___ 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:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/ucc-links/+merge/215790 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/ucc-links 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:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/ucc-links into lp:activity-log-manager has been updated. Status: Rejected => Merged For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/ucc-links/+merge/215790 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/ucc-links 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:~robert-ancell/activity-log-manager/time-combo-translation into lp:activity-log-manager
Trunk didn't have the updated packaging. I've brought all those changes over and applied the patches that should be on trunk. -- https://code.launchpad.net/~robert-ancell/activity-log-manager/time-combo-translation/+merge/204543 Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/time-combo-translation 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:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager
The proposal to merge lp:~robert-ancell/activity-log-manager/security-spacing into lp:activity-log-manager has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~robert-ancell/activity-log-manager/security-spacing/+merge/204532 -- Your team Activity Log Manager is requested to review the proposed merge of lp:~robert-ancell/activity-log-manager/security-spacing 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] [Bug 1440373] Re: please build a python3-zeitgeist package and let zeitgeist depend on it
** Changed in: zeitgeist (Ubuntu) Status: New => Triaged ** Changed in: zeitgeist (Ubuntu) Importance: Undecided => Medium -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1440373 Title: please build a python3-zeitgeist package and let zeitgeist depend on it Status in Zeitgeist Framework: Confirmed Status in zeitgeist package in Ubuntu: Triaged Bug description: There is still the goal to remove Python2 from the desktop images, and to use Python3 only. please build a python3-zeitgeist package and let zeitgeist depend on it To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1440373/+subscriptions ___ 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] [Bug 1440373] Re: please build a python3-zeitgeist package and let zeitgeist depend on it
We also need to add zeitgeist-datahub to the seed so this is not removed from the images. ** Also affects: ubuntu-meta (Ubuntu) Importance: Undecided Status: New ** Changed in: ubuntu-meta (Ubuntu) Status: New => Triaged ** Changed in: ubuntu-meta (Ubuntu) Importance: Undecided => Medium -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1440373 Title: please build a python3-zeitgeist package and let zeitgeist depend on it Status in Zeitgeist Framework: Confirmed Status in ubuntu-meta package in Ubuntu: Triaged Status in zeitgeist package in Ubuntu: Triaged Bug description: There is still the goal to remove Python2 from the desktop images, and to use Python3 only. please build a python3-zeitgeist package and let zeitgeist depend on it To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1440373/+subscriptions ___ 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] [Bug 1440373] Re: please build a python3-zeitgeist package and let zeitgeist depend on it
This turns out to be quite simple. libzeitgeist-2.0-0 has Recommends: zeitgeist | zeitgeist-core. If we switch these around we should avoid pulling in the metapackage that pulls in python-zeitgeist (which nothing uses). We already have Python 3 support by using the GIR package. -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1440373 Title: please build a python3-zeitgeist package and let zeitgeist depend on it Status in Zeitgeist Framework: Confirmed Status in ubuntu-meta package in Ubuntu: Triaged Status in zeitgeist package in Ubuntu: Triaged Bug description: There is still the goal to remove Python2 from the desktop images, and to use Python3 only. please build a python3-zeitgeist package and let zeitgeist depend on it To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1440373/+subscriptions ___ 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] [Bug 1440373]
I'm going to close this since Zeitgeist provides GIR bindings which can be accessed from Python 3. -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1440373 Title: please build a python3-zeitgeist package and let zeitgeist depend on it Status in Zeitgeist Framework: Fix Released Status in ubuntu-meta package in Ubuntu: Fix Released Status in zeitgeist package in Ubuntu: Fix Released Bug description: There is still the goal to remove Python2 from the desktop images, and to use Python3 only. please build a python3-zeitgeist package and let zeitgeist depend on it To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1440373/+subscriptions ___ 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] [Bug 1199221]
I'm going to close this since Zeitgeist provides GIR bindings which can be accessed from Python 3. -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1199221 Title: Package zeitgeist-python for python3 aka make package python3-zeitgeist Status in Zeitgeist Framework: Fix Released Status in zeitgeist package in Ubuntu: Confirmed Bug description: At the moment the package python-zeitgeist installs in python2.7 location and does not have a python3.x installation which makes python3 migration tougher. Expectation: Have a second package python3-zeitgeist which installs in python3.x location To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1199221/+subscriptions ___ 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] [Bug 1475623] Re: zeitgeist ftbfs with GCC 5
** Bug watch added: freedesktop.org Bugzilla #91443 https://bugs.freedesktop.org/show_bug.cgi?id=91443 ** Also affects: zeitgeist via https://bugs.freedesktop.org/show_bug.cgi?id=91443 Importance: Unknown Status: Unknown -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1475623 Title: zeitgeist ftbfs with GCC 5 Status in Zeitgeist Framework: Unknown Status in zeitgeist package in Ubuntu: In Progress Bug description: see https://launchpadlibrarian.net/211752996/buildlog_ubuntu-wily-amd64.zeitgeist_0.9.14-2.2ubuntu6~gcc5.1_BUILDING.txt.gz To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1475623/+subscriptions ___ 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] [Bug 1475623] Re: zeitgeist ftbfs with GCC 5
Patch filed upstream and upload to the GCC 5.1 PPA. ** Changed in: zeitgeist (Ubuntu) Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Framework. https://bugs.launchpad.net/bugs/1475623 Title: zeitgeist ftbfs with GCC 5 Status in Zeitgeist Framework: Unknown Status in zeitgeist package in Ubuntu: Fix Committed Bug description: see https://launchpadlibrarian.net/211752996/buildlog_ubuntu-wily-amd64.zeitgeist_0.9.14-2.2ubuntu6~gcc5.1_BUILDING.txt.gz To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist/+bug/1475623/+subscriptions ___ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp
