Re: [Zeitgeist] [Merge] lp:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel into lp:activity-log-manager
Oh, Ubuntu GNOME 13.10 doesn't install gnome-screensaver by default since Ubuntu GNOME doesn't actually use it. Unity does recommend indicator-session which recommends gnome-screensaver but that's not a hard dependency (perhaps so that users can replace it with xscreensaver or whatever). We need to figure out a way to test whether a gsettings key exists before trying to load it (see bug 1195481 for another example of this kind of bug). -- https://code.launchpad.net/~jbicha/activity-log-manager/search-and-security-only-for-ccpanel/+merge/174119 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:~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations into lp:activity-log-manager
Yes, Zeitgeist can handle Spreadsheets separately than Presentations but I can't think of a good reason why a typical user wouldn't just want a single toggle for all document types. I used zg's data/ontology/nfo.trig to see that Spreadsheets and Presentations are subclasses of Documents anyway (as are several other document types that we don't have toggles for). -- https://code.launchpad.net/~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations/+merge/174096 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:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel into lp:activity-log-manager
I can't duplicate that problem and I don't think this merge proposal makes many changes to the code. Which version of gnome-screensaver do you have installed? Because your gdb output seems to say something about a missing ubuntu-lock-on-suspend gsettings key? I've never really learned how to use gdb though. $ XDG_CURRENT_DESKTOP=Unity gdb gnome-control-center GNU gdb (GDB) 7.5.91.20130417-cvs-ubuntu Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type show copying and show warranty for details. This GDB was configured as x86_64-linux-gnu. For bug reporting instructions, please see: http://www.gnu.org/software/gdb/bugs/... Reading symbols from /usr/bin/gnome-control-center...(no debugging symbols found)...done. (gdb) start Temporary breakpoint 1 at 0x71c0 Starting program: /usr/bin/gnome-control-center [Thread debugging using libthread_db enabled] Using host libthread_db library /lib/x86_64-linux-gnu/libthread_db.so.1. Temporary breakpoint 1, 0xb1c0 in main () (gdb) step Single stepping until exit from function main, which has no line number information. [New Thread 0x7fffeedc7700 (LWP 22969)] [New Thread 0x7fffb30c5700 (LWP 22970)] [New Thread 0x7fffb28c4700 (LWP 22971)] [New Thread 0x7fffb1c22700 (LWP 22973)] [Thread 0x7fffb28c4700 (LWP 22971) exited] [New Thread 0x7fffb28c4700 (LWP 22998)] [New Thread 0x7fffb1421700 (LWP 22999)] [New Thread 0x7fffb0c20700 (LWP 23000)] [New Thread 0x7fffa3fff700 (LWP 23001)] ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_set: assertion 'self != NULL' failed [New Thread 0x7fffa37fe700 (LWP 23002)] [New Thread 0x7fffa2ffd700 (LWP 23003)] [New Thread 0x7fffa27fc700 (LWP 23004)] [New Thread 0x7fffa1ffb700 (LWP 23005)] ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed ** (gnome-control-center:22938): CRITICAL **: gee_abstract_map_has_key: assertion 'self != NULL' failed Error setting crash reporting: GDBus.Error:org.freedesktop.DBus.Error.AuthFailed: Not authorized. Error setting metrics reporting: GDBus.Error:org.freedesktop.DBus.Error.AuthFailed: Not authorized. Error setting crash reporting: GDBus.Error:org.freedesktop.DBus.Error.AuthFailed: Not authorized. Error setting metrics reporting: GDBus.Error:org.freedesktop.DBus.Error.AuthFailed: Not authorized. (gnome-control-center:22938): GLib-GObject-CRITICAL **: g_object_unref: assertion 'G_IS_OBJECT (object)' failed 0x7581eea5 in __libc_start_main () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) quit A debugging session is active. Inferior 1 [process 22938] will be killed. Quit anyway? (y or n) y -- https://code.launchpad.net/~jbicha/activity-log-manager/search-and-security-only-for-ccpanel/+merge/174119 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:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel into lp:activity-log-manager
Jeremy Bicha has proposed merging
lp:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel into
lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/search-and-security-only-for-ccpanel/+merge/174119
This way other distros don't have to depend on accountsservice if we add the
remaining proposed items to the Security tab for instance.
--
https://code.launchpad.net/~jbicha/activity-log-manager/search-and-security-only-for-ccpanel/+merge/174119
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/search-and-security-only-for-ccpanel into
lp:activity-log-manager.
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2013-07-09 01:34:49 +
+++ src/Makefile.am 2013-07-11 06:45:38 +
@@ -24,8 +24,6 @@
SHARED_SOURCES = \
blacklist-dbus.vala \
activity-log-manager.vala \
- searchresults-widget.vala \
- security-widget.vala \
unified-privacy-files.vala \
unified-privacy-applications.vala \
unified-privacy-history.vala \
@@ -108,6 +106,8 @@
endif
libactivity_log_manager_la_SOURCES = \
+ searchresults-widget.vala \
+ security-widget.vala \
$(SHARED_SOURCES:.vala=.c) \
alm-cc.c
=== modified file 'src/activity-log-manager.vala'
--- src/activity-log-manager.vala 2013-07-09 23:08:45 +
+++ src/activity-log-manager.vala 2013-07-11 06:45:38 +
@@ -20,7 +20,7 @@
* 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/.;
*/
-
+
#if DIAGNOSTIC
extern Gtk.Widget whoopsie_daisy_preferences_new ();
#endif
@@ -29,8 +29,6 @@
public class ActivityLogManager : Gtk.Box {
private Gtk.Notebook notebook;
- private SecurityWidget security_widget;
- private SearchResultsWidget searchresults_widget;
private PrivacyWidget privacy_widget;
private Gtk.Widget whoopsie;
@@ -50,17 +48,6 @@
var privacy_label = new Gtk.Label(_(Files Applications));
notebook.append_page(privacy_widget, privacy_label);
- if (GLib.Environment.get_variable (XDG_CURRENT_DESKTOP) == Unity)
- {
-security_widget = new SecurityWidget();
-var security_label = new Gtk.Label(_(Security));
-notebook.prepend_page(security_widget, security_label);
-
-searchresults_widget = new SearchResultsWidget();
-var searchresults_label = new Gtk.Label(_(Search));
-notebook.append_page(searchresults_widget, searchresults_label);
- }
-
#if DIAGNOSTIC
whoopsie = whoopsie_daisy_preferences_new ();
var whoopsie_label = new Gtk.Label(_(Diagnostics));
@@ -69,9 +56,9 @@
this.show_all();
}
- public void append_page (Gtk.Widget widget, string label) {
+ public void insert_page (Gtk.Widget widget, string label, int position) {
var app_label = new Gtk.Label(_(label));
- notebook.append_page(widget, app_label);
+ notebook.insert_page(widget, app_label, position);
}
}
}
=== modified file 'src/alm-cc.c'
--- src/alm-cc.c 2013-06-28 16:24:00 +
+++ src/alm-cc.c 2013-07-11 06:45:38 +
@@ -22,6 +22,9 @@
#include libgnome-control-center/cc-panel.h
extern void* alm_activity_log_manager_new (void);
+extern void alm_activity_log_manager_insert_page (void* alm, GtkWidget* widget, const gchar* label, const int* position);
+extern GtkWidget* alm_security_widget_new(void);
+extern GtkWidget* alm_search_results_widget_new(void);
#define ALM_TYPE_MAIN_WINDOW_PANEL alm_main_window_panel_get_type()
@@ -54,6 +57,12 @@
alm_main_window_panel_init (AlmMainWindowPanel *self)
{
GtkWidget *widget = GTK_WIDGET (alm_activity_log_manager_new ());
+
+ GtkWidget *security = GTK_WIDGET (alm_security_widget_new ());
+ alm_activity_log_manager_insert_page (widget, security, _(Security), 0);
+ GtkWidget *search = GTK_WIDGET (alm_search_results_widget_new ());
+ alm_activity_log_manager_insert_page (widget, search, _(Search), 2);
+
gtk_widget_show_all (widget);
gtk_container_add (GTK_CONTAINER (self), widget);
}
___
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:~jbicha/activity-log-manager/add-help-link into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/add-help-link
into lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/add-help-link/+merge/174292
This will make it easy to enable once bug 1200381 is fixed.
(This modifies the generic help link provided in the top menu bar and
keyboard-accessible with F1.)
--
https://code.launchpad.net/~jbicha/activity-log-manager/add-help-link/+merge/174292
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/add-help-link into lp:activity-log-manager.
=== modified file 'src/alm-cc.c'
--- src/alm-cc.c 2013-06-28 16:24:00 +
+++ src/alm-cc.c 2013-07-11 21:01:23 +
@@ -45,9 +45,20 @@
{
}
+static const char *
+alm_main_window_panel_get_help_uri (CcPanel *panel)
+{
+ return help:ubuntu-help/privacy;
+}
+
static void
alm_main_window_panel_class_init (AlmMainWindowPanelClass *klass)
{
+ CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
+
+ /* Disabled until http://pad.lv/1200381 is fixed
+ panel_class-get_help_uri = alm_main_window_panel_get_help_uri;
+ */
}
static void
___
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:~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations into lp:activity-log-manager. Requested reviews: Activity Log Manager (activity-log-manager) Related bugs: Bug #1198724 in Activity Log Manager: Don't show Presentations Spreadsheets in Include list https://bugs.launchpad.net/activity-log-manager/+bug/1198724 For more details, see: https://code.launchpad.net/~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations/+merge/174096 ...and changes the capitalization of Chat Logs to Chat logs which I think fits better in the style Unity is aiming towards in the dash and elsewhere. -- https://code.launchpad.net/~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations/+merge/174096 Your team Activity Log Manager is requested to review the proposed merge of lp:~jbicha/activity-log-manager/add-apps-drop-spreadsheets-presentations into lp:activity-log-manager. === modified file 'src/unified-privacy.vala' --- src/unified-privacy.vala 2013-07-09 23:46:11 + +++ src/unified-privacy.vala 2013-07-11 02:28:33 + @@ -115,13 +115,12 @@ }); mime_dict = new HashMapstring, string(str_hash, str_equal); + mime_dict.set(_(Applications), NFO.SOFTWARE); mime_dict.set(_(Music), NFO.AUDIO); mime_dict.set(_(Videos), NFO.VIDEO); mime_dict.set(_(Pictures), NFO.IMAGE); mime_dict.set(_(Documents), NFO.DOCUMENT); - mime_dict.set(_(Presentations), NFO.PRESENTATION); - mime_dict.set(_(Spreadsheets), NFO.SPREADSHEET); - mime_dict.set(_(Chat Logs), NMO.IMMESSAGE); + mime_dict.set(_(Chat logs), NMO.IMMESSAGE); mime_dict.set(_(Emails), NMO.EMAIL); mime_dict.set(_(Websites), NFO.WEBSITE); ___ 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:~jbicha/activity-log-manager/fix-add-popup into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/fix-add-popup
into lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/fix-add-popup/+merge/173842
This way the Add menu drops down from the entire Add button instead of popping
up wherever it's clicked.
I think it makes bug 1198367 less noticeable.
--
https://code.launchpad.net/~jbicha/activity-log-manager/fix-add-popup/+merge/173842
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/fix-add-popup into lp:activity-log-manager.
=== modified file 'src/activity-log-manager.vala'
--- src/activity-log-manager.vala 2013-07-08 02:42:55 +
+++ src/activity-log-manager.vala 2013-07-09 23:13:24 +
@@ -5,7 +5,7 @@
* Copyright (C) 2012 Manish Sinha manishsi...@ubuntu.com
* Copyright (C) 2012 Intel Corp.
* Authored by: Seif Lotfy seif.lo...@collabora.co.uk
- * Copyright (C) 2013 Jeremey Bicha jbi...@ubuntu.com
+ * Copyright (C) 2013 Jeremy Bicha jbi...@ubuntu.com
*
* alm is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-09 01:34:49 +
+++ src/unified-privacy.vala 2013-07-09 23:13:24 +
@@ -299,15 +299,19 @@
exception_toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
exception_toolbar.get_style_context().set_junction_sides(Gtk.JunctionSides.TOP);
- var exception_add = new ToolButton(null, _(Add Item));
- exception_add.set_icon_name(list-add-symbolic);
- exception_add.clicked.connect(on_add_exception);
+ var container_add = new ToolItem();
+ var exception_add = new Gtk.MenuButton();
+ var icon = new Image.from_icon_name (list-add-symbolic, Gtk.IconSize.MENU);
+ exception_add.set_image((Widget)icon);
+ exception_add.set_tooltip_text(_(Add Item));
var exception_remove = new ToolButton(null, _(Remove Item));
exception_remove.set_icon_name(list-remove-symbolic);
exception_remove.clicked.connect(on_remove_exception);
- exception_toolbar.insert(exception_add, 0);
+ container_add.add(exception_add);
+ container_add.show_all();
+ exception_toolbar.insert(container_add, 0);
exception_toolbar.insert(exception_remove, 1);
exception_menu = new Gtk.Menu ();
@@ -322,6 +326,7 @@
//exception_menu.append(file_menu);
exception_menu.append(app_menu);
exception_menu.show_all ();
+ exception_add.set_popup(exception_menu);
exception_vbox.pack_start(exception_toolbar, false, false);
@@ -358,10 +363,6 @@
add_app_to_view(app);
}
}
-
- private void on_add_exception() {
- exception_menu.popup (null, null, null, 1, get_current_event_time ());
- }
private void on_remove_exception () {
TreeSelection sel = this.exception_list.get_selection ();
@@ -388,7 +389,7 @@
private void on_add_folder() {
var chooser = new FileChooserDialog(
-_(Select a directory to blacklist),
+_(Select a folder to blacklist),
null, FileChooserAction.SELECT_FOLDER);
chooser.add_buttons (Stock.OK, ResponseType.OK, Stock.CANCEL, ResponseType.CANCEL);
int res = chooser.run();
___
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:~jbicha/activity-log-manager/fix-few-warnings into lp:activity-log-manager
Jeremy Bicha has proposed merging
lp:~jbicha/activity-log-manager/fix-few-warnings into lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/fix-few-warnings/+merge/173626
--
https://code.launchpad.net/~jbicha/activity-log-manager/fix-few-warnings/+merge/173626
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/fix-few-warnings into lp:activity-log-manager.
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2013-07-08 01:37:43 +
+++ src/Makefile.am 2013-07-09 01:36:26 +
@@ -1,4 +1,4 @@
-VALAFLAGS = \
+AM_VALAFLAGS = \
--pkg zeitgeist-2.0 \
--pkg glib-2.0 \
--pkg gtk+-3.0 \
@@ -56,7 +56,7 @@
if HAVE_SWITCHBOARD
switchboarddir = $(prefix)/lib/plugs/zeitgeist/alm
switchboard_PROGRAMS = alm-switchboard
-VALAFLAGS += -D SWITCHBOARD \
+AM_VALAFLAGS += -D SWITCHBOARD \
--pkg pantheon
alm_switchboard_LDADD = \
$(SHARED_LIBS) \
@@ -71,7 +71,7 @@
endif
if HAVE_DIAG
-VALAFLAGS += \
+AM_VALAFLAGS += \
-D DIAGNOSTIC
gnomeccuidir = $(datadir)/gnome-control-center/ui/
SUBDIRS = diagnostics
@@ -79,7 +79,7 @@
if HAVE_CCPANEL
-ccpaneldir = $(prefix)/lib/control-center-1/panels
+ccpaneldir = $(libdir)/control-center-1/panels
ccpanel_LTLIBRARIES = libactivity-log-manager.la
endif
=== modified file 'src/searchresults-widget.vala'
--- src/searchresults-widget.vala 2013-07-08 01:37:43 +
+++ src/searchresults-widget.vala 2013-07-09 01:36:26 +
@@ -19,7 +19,6 @@
*/
using Gtk;
-using Gee;
namespace Alm {
=== modified file 'src/security-widget.vala'
--- src/security-widget.vala 2013-07-07 19:51:19 +
+++ src/security-widget.vala 2013-07-09 01:36:26 +
@@ -18,7 +18,6 @@
*/
using Gtk;
-using Gee;
namespace Alm {
@@ -40,8 +39,8 @@
private void set_up_ui () {
- Gtk.ListStore liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
- Gtk.TreeIter iter;
+ 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);
@@ -68,6 +67,7 @@
grid.set_margin_left(25);
grid.set_column_spacing(25);
grid.set_row_spacing(5);
+ grid.set_row_homogeneous(true);
this.add(grid);
var list_focus = new GLib.ListWidget ();
@@ -113,7 +113,7 @@
try {
Process.spawn_command_line_async (gnome-control-center user-accounts);
} catch (SpawnError e) {
- stdout.printf (Error: %s\n, e.message);
+ warning (%s, e.message);
}
return true;
});
@@ -126,7 +126,7 @@
try {
Process.spawn_command_line_async (gnome-control-center power);
} catch (SpawnError e) {
- stdout.printf (Error: %s\n, e.message);
+ warning (%s, e.message);
}
return true;
});
=== modified file 'src/unified-privacy-applications.vala'
--- src/unified-privacy-applications.vala 2013-07-03 08:09:42 +
+++ src/unified-privacy-applications.vala 2013-07-09 01:36:26 +
@@ -23,7 +23,6 @@
using Gtk;
using Gee;
-using GLib;
using Zeitgeist;
namespace Alm {
=== modified file 'src/unified-privacy-history.vala'
--- src/unified-privacy-history.vala 2013-02-15 23:09:09 +
+++ src/unified-privacy-history.vala 2013-07-09 01:36:26 +
@@ -21,7 +21,6 @@
*/
using Gtk;
-using Gee;
using Zeitgeist;
namespace Alm {
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-08 02:42:55 +
+++ src/unified-privacy.vala 2013-07-09 01:36:26 +
@@ -19,7 +19,6 @@
using Gtk;
using Gee;
-using GLib;
using Zeitgeist;
namespace Alm {
@@ -854,7 +853,11 @@
else if (index == 4){
tr = new Zeitgeist.TimeRange.anytime();
get_history.begin (tr);
- recent.purge_items();
+ try {
+ recent.purge_items();
+ } catch (Error err) {
+ warning (%s, err.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
[Zeitgeist] [Merge] lp:~jbicha/activity-log-manager/add-security-tab into lp:activity-log-manager
The proposal to merge lp:~jbicha/activity-log-manager/add-security-tab into lp:activity-log-manager has been updated. Description changed to: Based mostly on https://wiki.ubuntu.com/SecurityAndPrivacySettings - According to the design, there should be one more option for Require my password when logging in (autologin) - Also, I couldn't figure out how to directly call the Change Password widget from user-accounts. I plan to move the other two settings (brightness slider and delay before the screen blanks) from the Brightness Lock panel to the Power panel when we land this in Saucy. That's where those settings are in gnome-control-center 3.8 anyway. For more details, see: https://code.launchpad.net/~jbicha/activity-log-manager/add-security-tab/+merge/173295 -- https://code.launchpad.net/~jbicha/activity-log-manager/add-security-tab/+merge/173295 Your team Activity Log Manager is requested to review the proposed merge of lp:~jbicha/activity-log-manager/add-security-tab 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:~jbicha/activity-log-manager/rename-standalone-title-too into lp:activity-log-manager
The standalone panel shouldn't be named Privacy because that name is already used by GNOME Settings 3.8. -- https://code.launchpad.net/~jbicha/activity-log-manager/rename-standalone-title-too/+merge/173061 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:~jbicha/activity-log-manager/turn-off-recently-used-too into lp:activity-log-manager
Jeremy Bicha has proposed merging
lp:~jbicha/activity-log-manager/turn-off-recently-used-too into
lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #992338 in Activity Log Manager: Privacy settings don't affect Gnome
recently-used list.
https://bugs.launchpad.net/activity-log-manager/+bug/992338
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/turn-off-recently-used-too/+merge/173383
When a user turns off Recording File Application Usage, both Zeitgeist and
the GTK/GNOME recently used feature will stop adding new items to their
databases.
As for the second half of the bug, it looks to me like GNOME's Privacy panel
doesn't yet include an option to clear the recently used database. We could
just remove the recently-used.xbel file if a user chooses to Clear Usage Data
from all time.
--
https://code.launchpad.net/~jbicha/activity-log-manager/turn-off-recently-used-too/+merge/173383
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/turn-off-recently-used-too into
lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-03 08:09:42 +
+++ src/unified-privacy.vala 2013-07-07 21:25:30 +
@@ -66,8 +66,12 @@
private Gtk.Menu exception_menu;
+ private GLib.Settings privacy_settings;
+
public PrivacyWidget (Blacklist blacklist_interface) {
GLib.Object (orientation: Orientation.VERTICAL, spacing:10);
+
+ privacy_settings = new GLib.Settings (org.gnome.desktop.privacy);
this.blacklist = blacklist_interface;
//File/Folder stuffs
@@ -188,6 +192,7 @@
var recording = !blacklist.get_incognito();
if (this.record_button.active != recording) {
blacklist.set_incognito(recording);
+privacy_settings.set_boolean(remember-recent-files, record_button.active);
}
});
___
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:~jbicha/activity-log-manager/use-ellipsis into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/use-ellipsis
into lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/use-ellipsis/+merge/173092
https://wiki.gnome.org/GnomeGoals/UnicodeUsage
--
https://code.launchpad.net/~jbicha/activity-log-manager/use-ellipsis/+merge/173092
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/use-ellipsis into lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-07-03 08:09:42 +
+++ src/unified-privacy.vala 2013-07-04 20:14:31 +
@@ -192,7 +192,7 @@
});
this.del_button = new Button.from_stock(Stock.DELETE);
- del_button.set_label(_(Clear Usage Data...));
+ del_button.set_label(_(Clear Usage Data…));
del_button.clicked.connect(()= {
delete_dialog.on_delete_history ();
___
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:~jbicha/activity-log-manager/use-linkbutton-for-previous-reports into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/use-linkbutton-for-previous-reports into lp:activity-log-manager. Requested reviews: Activity Log Manager (activity-log-manager) For more details, see: https://code.launchpad.net/~jbicha/activity-log-manager/use-linkbutton-for-previous-reports/+merge/170883 To match revision 48 -- https://code.launchpad.net/~jbicha/activity-log-manager/use-linkbutton-for-previous-reports/+merge/170883 Your team Activity Log Manager is requested to review the proposed merge of lp:~jbicha/activity-log-manager/use-linkbutton-for-previous-reports into lp:activity-log-manager. === modified file 'src/diagnostics/whoopsie.ui' --- src/diagnostics/whoopsie.ui 2013-06-19 21:19:46 + +++ src/diagnostics/whoopsie.ui 2013-06-21 17:52:27 + @@ -185,7 +185,7 @@ property name=xalign0/property property name=xscale0/property child - object class=GtkButton id=show_previous_reports + object class=GtkLinkButton id=show_previous_reports property name=label translatable=yesShow Previous Reports/property property name=use_action_appearanceFalse/property property name=visibleTrue/property ___ 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:~jbicha/activity-log-manager/update-for-gnome-38 into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/update-for-gnome-38 into lp:activity-log-manager. Requested reviews: Activity Log Manager (activity-log-manager) For more details, see: https://code.launchpad.net/~jbicha/activity-log-manager/update-for-gnome-38/+merge/169077 GNOME Settings 3.8 expects panel in the form gnome-NAMEOFPANEL-panel.desktop. -- https://code.launchpad.net/~jbicha/activity-log-manager/update-for-gnome-38/+merge/169077 Your team Activity Log Manager is requested to review the proposed merge of lp:~jbicha/activity-log-manager/update-for-gnome-38 into lp:activity-log-manager. === modified file 'data/Makefile.am' --- data/Makefile.am 2013-04-20 08:40:12 + +++ data/Makefile.am 2013-06-12 23:34:23 + @@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications if HAVE_CCPANEL -desktop_in_files = activity-log-manager.desktop.in activity-log-manager-ccpanel.desktop.in +desktop_in_files = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in else desktop_in_files = activity-log-manager.desktop.in endif @@ -36,8 +36,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -EXTRA_DIST = activity-log-manager.desktop.in activity-log-manager-ccpanel.desktop.in alm-switchboard.plug -CLEANFILES = activity-log-manager.desktop activity-log-manager-ccpanel.desktop +EXTRA_DIST = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in alm-switchboard.plug +CLEANFILES = activity-log-manager.desktop gnome-activity-log-manager-panel.desktop check: $(desktop_DATA) for desktop in $(desktop_DATA); do \ === modified file 'data/activity-log-manager.desktop.in' --- data/activity-log-manager.desktop.in 2012-11-12 02:06:34 + +++ data/activity-log-manager.desktop.in 2013-06-12 23:34:23 + @@ -12,3 +12,4 @@ Icon=activity-log-manager Categories=GNOME;GTK;Utility; +NotShowIn=Unity; === renamed file 'data/activity-log-manager-ccpanel.desktop.in' = 'data/gnome-activity-log-manager-panel.desktop.in' --- data/activity-log-manager-ccpanel.desktop.in 2012-11-12 02:06:34 + +++ data/gnome-activity-log-manager-panel.desktop.in 2013-06-12 23:34:23 + @@ -14,7 +14,7 @@ Categories=GNOME;GTK;System;Archiving;Utility;Settings;X-GNOME-PersonalSettings;X-GNOME-Settings-Panel; X-GNOME-Settings-Panel=activity-log-manager -OnlyShowIn=GNOME;Unity; +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. === modified file 'po/POTFILES.in' --- po/POTFILES.in 2013-04-19 06:59:09 + +++ po/POTFILES.in 2013-06-12 23:34:23 + @@ -1,5 +1,5 @@ -data/activity-log-manager-ccpanel.desktop.in data/activity-log-manager.desktop.in +data/gnome-activity-log-manager-panel.desktop.in src/activity-log-manager.vala src/alm.vala src/alm-cc.c ___ 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:~jbicha/activity-log-manager/use-exclude into lp:activity-log-manager
Jeremy Bicha has proposed merging lp:~jbicha/activity-log-manager/use-exclude into lp:activity-log-manager. Requested reviews: Activity Log Manager (activity-log-manager) For more details, see: https://code.launchpad.net/~jbicha/activity-log-manager/use-exclude/+merge/168316 -- https://code.launchpad.net/~jbicha/activity-log-manager/use-exclude/+merge/168316 Your team Activity Log Manager is requested to review the proposed merge of lp:~jbicha/activity-log-manager/use-exclude into lp:activity-log-manager. === modified file 'src/unified-privacy.vala' --- src/unified-privacy.vala 2013-05-08 13:41:46 + +++ src/unified-privacy.vala 2013-06-09 22:14:26 + @@ -247,7 +247,7 @@ //Exception List var exception_vbox = new Box(Orientation.VERTICAL, 0); - var exception_label = new Label (_(Except for:)); + var exception_label = new Label (_(Exclude:)); var al2 = new Alignment (0, 0.5f, 0, 0); al2.add (exception_label); exception_vbox.pack_start (al2, false, false, 5); ___ 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:~jbicha/activity-log-manager/capitalize-Clear-Usage-Data into lp:activity-log-manager
Jeremy Bicha has proposed merging
lp:~jbicha/activity-log-manager/capitalize-Clear-Usage-Data into
lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/capitalize-Clear-Usage-Data/+merge/168317
--
https://code.launchpad.net/~jbicha/activity-log-manager/capitalize-Clear-Usage-Data/+merge/168317
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/capitalize-Clear-Usage-Data into
lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-05-08 13:41:46 +
+++ src/unified-privacy.vala 2013-06-09 22:15:34 +
@@ -192,7 +192,7 @@
});
this.del_button = new Button.from_stock(Stock.DELETE);
- del_button.set_label(_(Clear usage Data...));
+ del_button.set_label(_(Clear Usage Data...));
del_button.clicked.connect(()= {
delete_dialog.on_delete_history ();
___
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:~jbicha/activity-log-manager/tweak-include-names into lp:activity-log-manager
Jeremy Bicha has proposed merging
lp:~jbicha/activity-log-manager/tweak-include-names into
lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/tweak-include-names/+merge/168318
--
https://code.launchpad.net/~jbicha/activity-log-manager/tweak-include-names/+merge/168318
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/tweak-include-names into
lp:activity-log-manager.
=== modified file 'src/unified-privacy.vala'
--- src/unified-privacy.vala 2013-05-08 13:41:46 +
+++ src/unified-privacy.vala 2013-06-09 22:21:27 +
@@ -111,15 +111,15 @@
});
mime_dict = new HashMapstring, string(str_hash, str_equal);
- mime_dict.set(_(Audio), NFO_AUDIO);
- mime_dict.set(_(Video), NFO_VIDEO);
- mime_dict.set(_(Image), NFO_IMAGE);
- mime_dict.set(_(Text), NFO_DOCUMENT);
- mime_dict.set(_(Presentation), NFO_PRESENTATION);
- mime_dict.set(_(Spreadsheet), NFO_SPREADSHEET);
+ mime_dict.set(_(Music), NFO_AUDIO);
+ mime_dict.set(_(Videos), NFO_VIDEO);
+ mime_dict.set(_(Pictures), NFO_IMAGE);
+ mime_dict.set(_(Documents), NFO_DOCUMENT);
+ mime_dict.set(_(Presentations), NFO_PRESENTATION);
+ mime_dict.set(_(Spreadsheets), NFO_SPREADSHEET);
mime_dict.set(_(Instant Messaging), NMO_IMMESSAGE);
- mime_dict.set(_(E-mail), NMO_EMAIL);
- mime_dict.set(_(Website), NFO_WEBSITE);
+ mime_dict.set(_(Emails), NMO_EMAIL);
+ mime_dict.set(_(Websites), NFO_WEBSITE);
UserDirectory[] special_dirs =
{
___
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 928946] Re: The .desktop.in files don't match with executable file name
And by the way, I suggest you get rid of the extra line breaks in the .desktop file. Other .desktops on my computer don't have all that extra space. Thanks! -- You received this bug notification because you are a member of Activity Log Manager, which is the registrant for Activity Log Manager. https://bugs.launchpad.net/bugs/928946 Title: The .desktop.in files don't match with executable file name Status in Activity Log Manager for Zeitgeist: Confirmed Status in “activity-log-manager” package in Ubuntu: Confirmed Bug description: The alm.desktop.in and alm--cpanel.desktop.in still contains line Exec=alm Icon=alm AND Exec=gnome-control-center alm which needs to be changed to activity-log-manager To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/928946/+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
