[Zeitgeist] [Merge] lp:~kelemeng/activity-log-manager/bug957891 into lp:activity-log-manager
Gabor Kelemen has proposed merging lp:~kelemeng/activity-log-manager/bug957891
into lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
Related bugs:
Bug #957891 in Activity Log Manager: Diagnostics tab i18n problems in a-l-m
https://bugs.launchpad.net/activity-log-manager/+bug/957891
For more details, see:
https://code.launchpad.net/~kelemeng/activity-log-manager/bug957891/+merge/98054
--
https://code.launchpad.net/~kelemeng/activity-log-manager/bug957891/+merge/98054
Your team Activity Log Manager is requested to review the proposed merge of
lp:~kelemeng/activity-log-manager/bug957891 into lp:activity-log-manager.
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2012-03-01 21:26:12 +
+++ po/POTFILES.in 2012-03-17 13:05:18 +
@@ -2,6 +2,7 @@
data/activity-log-manager.desktop.in
src/activity-log-manager.vala
src/alm.vala
+src/alm-cc.c
src/blacklist-dbus.vala
src/applications-widget.vala
src/files-widget.vala
=== modified file 'src/alm-cc.c'
--- src/alm-cc.c 2012-02-21 23:14:24 +
+++ src/alm-cc.c 2012-03-17 13:05:18 +
@@ -16,9 +16,10 @@
* along with this program. If not, see http://www.gnu.org/licenses/.;
*/
+#include config.h
+#include glib/gi18n-lib.h
#include gtk/gtk.h
#include libgnome-control-center/cc-panel.h
-#include config.h
extern void* alm_activity_log_manager_new (void);
#ifdef HAVE_WHOOPSIE
@@ -59,7 +60,7 @@
GtkWidget *widget = GTK_WIDGET (alm_activity_log_manager_new ());
#ifdef HAVE_WHOOPSIE
GtkWidget *whoopsie = GTK_WIDGET (whoopsie_daisy_preferences_new ());
- alm_activity_log_manager_append_page (widget, whoopsie, Diagnostics);
+ alm_activity_log_manager_append_page (widget, whoopsie, _(Diagnostics));
#endif
gtk_widget_show_all (widget);
gtk_container_add (GTK_CONTAINER (self), widget);
=== modified file 'src/diagnostics-widget.c'
--- src/diagnostics-widget.c 2012-02-21 23:37:33 +
+++ src/diagnostics-widget.c 2012-03-17 13:05:18 +
@@ -142,6 +142,7 @@
priv = self-priv = WHOOPSIE_DAISY_PREFERENCES_PRIVATE (self);
priv-builder = gtk_builder_new ();
+gtk_builder_set_translation_domain (priv-builder, GETTEXT_PACKAGE);
gtk_builder_add_from_file(priv-builder, GNOMECC_UI_DIR /whoopsie.ui, error);
if (error != NULL) {
g_warning (Could not load interface file: %s, error-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] [Bug 957891] [NEW] Diagnostics tab i18n problems in a-l-m
Public bug reported: The strings on the Diagnostics tab of the Privacy control center panel do not appear translated. This is because of two problems: - the Diagnostics tab label is not marked for translation - the strings from the whoopsie.ui file are translated in the po files, but the translation domain is not set for the file before the gtk_builder_add_from_file call. ** Affects: activity-log-manager Importance: Undecided Status: New ** Affects: ubuntu-translations Importance: Medium Assignee: Gabor Kelemen (kelemeng) Status: Triaged ** Affects: activity-log-manager (Ubuntu) Importance: Undecided Status: New ** Also affects: activity-log-manager Importance: Undecided Status: New ** Also affects: activity-log-manager (Ubuntu) Importance: Undecided Status: New ** Branch linked: lp:~kelemeng/activity-log-manager/bug957891 -- 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/957891 Title: Diagnostics tab i18n problems in a-l-m Status in Activity Log Manager for Zeitgeist: New Status in Ubuntu Translations: Triaged Status in “activity-log-manager” package in Ubuntu: New Bug description: The strings on the Diagnostics tab of the Privacy control center panel do not appear translated. This is because of two problems: - the Diagnostics tab label is not marked for translation - the strings from the whoopsie.ui file are translated in the po files, but the translation domain is not set for the file before the gtk_builder_add_from_file call. To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/957891/+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] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 433: Merged Trever's fixes for bug 953041
Merge authors:
Trever Fischer (tdfischer)
Related merge proposals:
https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026
proposed by: Trever Fischer (tdfischer)
review: Approve - Seif Lotfy (seif)
revno: 433 [merge]
committer: Seif Lotfy s...@lotfy.com
branch nick: zeitgeist
timestamp: Sat 2012-03-17 15:47:09 +0100
message:
Merged Trever's fixes for bug 953041
modified:
extensions/ds-registry.vala
src/db-reader.vala
src/engine.vala
src/table-lookup.vala
--
lp:zeitgeist
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird
Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
To unsubscribe from this branch go to
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala 2012-03-12 13:41:16 +
+++ extensions/ds-registry.vala 2012-03-12 14:10:17 +
@@ -144,7 +144,7 @@
return registry;
}
-private static Variant to_variant (
+public static Variant to_variant (
HashTablestring, DataSource sources)
{
var vb = new VariantBuilder (new VariantType (SIG_DATASOURCES));
=== modified file 'src/db-reader.vala'
--- src/db-reader.vala 2012-03-14 12:31:51 +
+++ src/db-reader.vala 2012-03-17 14:47:09 +
@@ -667,7 +667,7 @@
where.add_wildcard_condition (actor, val, negated);
else
where.add_match_condition (actor,
-actors_table.get_id (val), negated);
+actors_table.id_try_string (val), negated);
}
// Origin
@@ -727,7 +727,7 @@
subj_mimetype, val, negated);
else
where.add_match_condition (subj_mimetype,
-mimetypes_table.get_id (val), negated);
+mimetypes_table.id_try_string (val), negated);
}
// URI
@@ -866,14 +866,14 @@
if (symbols.length () == 1)
{
subwhere.add_match_condition (table_name,
-lookup_table.get_id (_symbol));
+lookup_table.id_try_string (_symbol));
}
else
{
var sb = new StringBuilder ();
foreach (unowned string uri in symbols)
{
-sb.append_printf (%d,, lookup_table.get_id (uri));
+sb.append_printf (%d,, lookup_table.id_try_string (uri));
}
sb.truncate (sb.len - 1);
=== modified file 'src/engine.vala'
--- src/engine.vala 2012-02-21 18:17:16 +
+++ src/engine.vala 2012-03-14 14:26:11 +
@@ -212,10 +212,10 @@
insert_stmt.bind_int64 (1, event.id);
insert_stmt.bind_int64 (2, event.timestamp);
insert_stmt.bind_int64 (3,
-interpretations_table.get_id (event.interpretation));
+interpretations_table.id_for_string (event.interpretation));
insert_stmt.bind_int64 (4,
-manifestations_table.get_id (event.manifestation));
-insert_stmt.bind_int64 (5, actors_table.get_id (event.actor));
+manifestations_table.id_for_string (event.manifestation));
+insert_stmt.bind_int64 (5, actors_table.id_for_string (event.actor));
insert_stmt.bind_text (6, event.origin);
insert_stmt.bind_int64 (7, payload_id);
@@ -228,12 +228,12 @@
insert_stmt.bind_text (8, subject.uri);
insert_stmt.bind_text (9, subject.current_uri);
insert_stmt.bind_int64 (10,
-interpretations_table.get_id (subject.interpretation));
+interpretations_table.id_for_string (subject.interpretation));
insert_stmt.bind_int64 (11,
-manifestations_table.get_id (subject.manifestation));
+manifestations_table.id_for_string (subject.manifestation));
insert_stmt.bind_text (12, subject.origin);
insert_stmt.bind_int64 (13,
-mimetypes_table.get_id (subject.mimetype));
+mimetypes_table.id_for_string (subject.mimetype));
insert_stmt.bind_text (14, subject.text);
// FIXME: Consider a storages_table table. Too dangerous?
insert_stmt.bind_text (15, subject.storage);
@@ -255,10 +255,10 @@
retrieval_stmt.bind_int64 (1, event.timestamp);
retrieval_stmt.bind_int64 (2,
-interpretations_table.get_id (event.interpretation));
+interpretations_table.id_for_string (event.interpretation));
retrieval_stmt.bind_int64 (3,
-manifestations_table.get_id (event.manifestation));
-retrieval_stmt.bind_int64 (4, actors_table.get_id (event.actor));
+
[Zeitgeist] [Merge] lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist
The proposal to merge lp:~tdfischer/zeitgeist/bluebird into lp:zeitgeist has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 -- https://code.launchpad.net/~tdfischer/zeitgeist/bluebird/+merge/97026 Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist. ___ 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] [Branch ~zeitgeist/zeitgeist/bluebird] Rev 434: DS-Registry: fix vala 0.16 incompatiblity
revno: 434
committer: Seif Lotfy s...@lotfy.com
branch nick: zeitgeist
timestamp: Sat 2012-03-17 15:53:25 +0100
message:
DS-Registry: fix vala 0.16 incompatiblity
modified:
extensions/ds-registry.vala
--
lp:zeitgeist
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird
Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
To unsubscribe from this branch go to
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file 'extensions/ds-registry.vala'
--- extensions/ds-registry.vala 2012-03-12 14:10:17 +
+++ extensions/ds-registry.vala 2012-03-17 14:53:25 +
@@ -144,7 +144,7 @@
return registry;
}
-public static Variant to_variant (
+private static Variant to_variant (
HashTablestring, DataSource sources)
{
var vb = new VariantBuilder (new VariantType (SIG_DATASOURCES));
___
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 957891] Re: Diagnostics tab i18n problems in a-l-m
** Changed in: activity-log-manager Assignee: (unassigned) = Gabor Kelemen (kelemeng) -- 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/957891 Title: Diagnostics tab i18n problems in a-l-m Status in Activity Log Manager for Zeitgeist: New Status in Ubuntu Translations: Triaged Status in “activity-log-manager” package in Ubuntu: New Bug description: The strings on the Diagnostics tab of the Privacy control center panel do not appear translated. This is because of two problems: - the Diagnostics tab label is not marked for translation - the strings from the whoopsie.ui file are translated in the po files, but the translation domain is not set for the file before the gtk_builder_add_from_file call. To manage notifications about this bug go to: https://bugs.launchpad.net/activity-log-manager/+bug/957891/+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 894510] Re: Send all chrome tabs, not just one window's
** Changed in: zeitgeist-datasources Milestone: None = 0.8.1 ** Changed in: zeitgeist-datasources Assignee: (unassigned) = Ross Burton (ross) -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Data-Sources. https://bugs.launchpad.net/bugs/894510 Title: Send all chrome tabs, not just one window's Status in Zeitgeist Data-Sources: Fix Committed Bug description: The chrome plugin only sends the tabs from one window, when it should iterate over all windows. To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist-datasources/+bug/894510/+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 934323] Re: Add gnote datasource
** Changed in: zeitgeist-datasources Milestone: 0.8.1 = 0.8.2 -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Data-Sources. https://bugs.launchpad.net/bugs/934323 Title: Add gnote datasource Status in Zeitgeist Data-Sources: Confirmed Bug description: Just like Tomboy we should have a gnote datasource To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist-datasources/+bug/934323/+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 784884] Re: Bazaar plugin: Commits from others should be WORLD_ACTIVITY
** Branch linked: lp:~manishsinha/zeitgeist-datasources/bzr-plugin- improvements-manish -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Data-Sources. https://bugs.launchpad.net/bugs/784884 Title: Bazaar plugin: Commits from others should be WORLD_ACTIVITY Status in Zeitgeist Data-Sources: Confirmed Bug description: Currently the bzr plugin is using Manifestation.USER_ACTIVITY for everything. It should use WORLD_ACTIVITY when pulling new revision so that applications can discriminate commits by other people. To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist-datasources/+bug/784884/+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 668181] Re: Sites logged by Firefox data provider and later erased by Firefox's Forget About This Site option not removed from Zeitgeist database
** Changed in: zeitgeist-datasources Milestone: 0.8.1 = 0.8.2 -- You received this bug notification because you are a member of Zeitgeist Framework Team, which is subscribed to Zeitgeist Data-Sources. https://bugs.launchpad.net/bugs/668181 Title: Sites logged by Firefox data provider and later erased by Firefox's Forget About This Site option not removed from Zeitgeist database Status in Zeitgeist Data-Sources: Confirmed Bug description: Current Behavior: Sites logged (and viewable in Gnome Activity Journal) by the Zeitgeist data source for Firefox and subsequently erased using the Forget About This Site option in Firefox remain in Zeitgeist logs. Expected Behavior: Zeitgeist data source recognizes when Firefox is told to forget about a site and removes the site from Zeitgeist logs. Steps to Replicate: 1. Compile and install the Firefox data provider from Launchpad in trunk 2. Launch Firefox and browse to a domain you're comfortable with removing from your history. 3. Verify (through Gnome Activity Journal or other interfaces) that site is logged into Zeitgeist 4. View the history for today (History Show All History Today) 5. Right-click on the site to remove from history and click Forget About This Site 6. Go back into Gnome Activity Journal (or Sezen, etc.) and see if the site forgotten by Firefox is still logged by Zeitgeist Software Versions: * Data source for Firefox (extension): 0.1 compiled from Launchpad trunk (but I'm unsure which revision—I'll compile the latest as soon as I can) * Firefox: 3.6.12 from the official Ubuntu repositories * Ubuntu 10.04 (Lucid). Other Notes: The behavior is the same for Delete This Page; the page is not removed from Zeitgeist logs. To manage notifications about this bug go to: https://bugs.launchpad.net/zeitgeist-datasources/+bug/668181/+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
