From 5f78edb1e798eb7b8257c212163442a49d60be8f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:47:51 -0500 Subject: Sadly, no more oobs for us. --- configure.ac | 3 --- src/datetime-service.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 88c7b20..b05f3f1 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,6 @@ GIO_REQUIRED_VERSION=2.25.11 # Note: the GIO check below also ensures the proper glib with gsettings support is present INDICATOR_DISPLAY_OBJECTS=0.2.2 GEOCLUE_REQUIRED_VERSION=0.12.0 -OOBS_REQUIRED_VERSION=2.31.0 ECAL_REQUIRED_VERSION=2.30 EDS_REQUIRED_VERSION=2.30 ICAL_REQUIRED_VERSION=0.44 @@ -93,7 +92,6 @@ AS_IF([test "x$with_gtk" = x3], libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS gio-2.0 >= $GIO_REQUIRED_VERSION geoclue >= $GEOCLUE_REQUIRED_VERSION - liboobs-1 >= $OOBS_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libedataserver-1.2 >= EDS_REQUIRED_VERSION @@ -109,7 +107,6 @@ AS_IF([test "x$with_gtk" = x3], libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS gio-2.0 >= $GIO_REQUIRED_VERSION geoclue >= $GEOCLUE_REQUIRED_VERSION - liboobs-1 >= $OOBS_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libedataserver-1.2 >= EDS_REQUIRED_VERSION diff --git a/src/datetime-service.c b/src/datetime-service.c index 18fa583..615010c 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -47,8 +47,6 @@ with this program. If not, see . #include #include -#include - #include "datetime-interface.h" #include "dbus-shared.h" #include "settings-shared.h" -- cgit v1.2.3 From a8cdacf07d258d6ddd5fe0411d0c7c7785f46b81 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Thu, 17 Mar 2011 15:48:46 +0000 Subject: Never prompt for password, causes segfault --- src/datetime-service.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 18fa583..2791693 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -481,16 +481,6 @@ auth_func (ECal *ecal, gchar *password = e_passwords_get_password (component_name, key); - if (password == NULL) { - password = e_passwords_ask_password ( - _("Enter password"), - component_name, key, prompt, - E_PASSWORDS_REMEMBER_FOREVER | - E_PASSWORDS_SECRET | - E_PASSWORDS_ONLINE, - &remember, NULL); - } - g_free (auth_domain); return password; -- cgit v1.2.3 From f46b11e29842f87f5cc3bef8c6dfb8abe090e99f Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Thu, 17 Mar 2011 15:53:28 +0000 Subject: Unused variable --- src/datetime-service.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 2791693..bd9a9c9 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -471,7 +471,6 @@ auth_func (ECal *ecal, const gchar *key, gpointer user_data) { - gboolean remember; // TODO: Is this useful? Should we be storing it somewhere? ESource *source = e_cal_get_source (ecal); gchar *auth_domain = e_source_get_duped_property (source, "auth-domain"); -- cgit v1.2.3 From 847357e2b3d41d10b8971c9714326def74dcbc61 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 20 Mar 2011 22:08:35 -0500 Subject: Translator comment from answers --- src/settings-shared.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/settings-shared.h b/src/settings-shared.h index ef1183c..0fee4b7 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -54,6 +54,8 @@ enum { #define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT #define DEFAULT_TIME_12_FORMAT_WITH_DAY N_("%a %l:%M %p") +/* TRANSLATORS: Information is available in this Launchpad + answer: https://answers.launchpad.net/ubuntu/+source/indicator-datetime/+question/149752 */ #define DEFAULT_TIME_24_FORMAT_WITH_DAY N_("%a %H:%M") #endif -- cgit v1.2.3 From 13c3a183a9e32d5e0e115038d4bb62c26b0d81db Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 21 Mar 2011 15:13:07 +0100 Subject: Mark date format string as translatable, and add translator comment. Fixes: LP:737326 --- src/datetime-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 615010c..8b5e5b6 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -252,8 +252,8 @@ update_datetime (gpointer user_data) return FALSE; } - /* Note: may require some localization tweaks */ - strftime(longstr, 128, "%A, %e %B %Y", ltime); + /* Translators: strftime(3) style date format on top of the menu when you click on the clock */ + strftime(longstr, 128, _("%A, %e %B %Y"), ltime); gchar * utf8 = g_locale_to_utf8(longstr, -1, NULL, NULL, NULL); dbusmenu_menuitem_property_set(date, DBUSMENU_MENUITEM_PROP_LABEL, utf8); -- cgit v1.2.3 From e3b43db557ce398bea7c6e62ca820c2af947c6bd Mon Sep 17 00:00:00 2001 From: David Planella Date: Mon, 21 Mar 2011 19:17:44 +0100 Subject: Added translator comments to strftime strings --- src/settings-shared.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/settings-shared.h b/src/settings-shared.h index 0fee4b7..cdbb063 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -53,9 +53,15 @@ enum { #define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT #define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT +/* TRANSLATORS: A format string for the strftime function for + a clock showing the day of the week and the time in 12-hour format without + seconds. */ #define DEFAULT_TIME_12_FORMAT_WITH_DAY N_("%a %l:%M %p") -/* TRANSLATORS: Information is available in this Launchpad - answer: https://answers.launchpad.net/ubuntu/+source/indicator-datetime/+question/149752 */ + +/* TRANSLATORS: A format string for the strftime function for + a clock showing the day of the week and the time in 24-hour format without + seconds. Information is available in this Launchpad answer: + https://answers.launchpad.net/ubuntu/+source/indicator-datetime/+question/149752 */ #define DEFAULT_TIME_24_FORMAT_WITH_DAY N_("%a %H:%M") #endif -- cgit v1.2.3 From 890d5bb440d7a5f73b4f9e6af62102a4844dcfda Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Wed, 23 Mar 2011 12:03:21 +0000 Subject: String change and small behaviour change mpt tagged "sniffles" --- src/datetime-service.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index eacce36..65df77e 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -371,11 +371,15 @@ check_for_calendar (gpointer user_data) dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); + dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); + g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, + G_CALLBACK (activate_cb), "evolution -c calendar"); + events_separator = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); dbusmenu_menuitem_child_add_position(root, events_separator, 2); add_appointment = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Appointment")); + dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event...")); dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "evolution -c calendar"); dbusmenu_menuitem_child_add_position (root, add_appointment, 3); -- cgit v1.2.3 From 445b748be0786f2d5ba9d469490bce7d277d653d Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Wed, 23 Mar 2011 12:20:47 +0000 Subject: Date and time -> Date and month *sniffles* --- data/datetime-dialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui index 7ec485f..7545227 100644 --- a/data/datetime-dialog.ui +++ b/data/datetime-dialog.ui @@ -474,7 +474,7 @@ - _Date and time + _Date and month True True False -- cgit v1.2.3 From 74fe3165a907c7e7948c7a2066188eda2f234b59 Mon Sep 17 00:00:00 2001 From: karl-qdh Date: Wed, 23 Mar 2011 12:25:12 +0000 Subject: Removed comma from date time indicator --- src/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.c b/src/utils.c index 7471926..6580f3b 100644 --- a/src/utils.c +++ b/src/utils.c @@ -183,7 +183,7 @@ generate_format_string_full (gboolean show_day, gboolean show_date) /* TRANSLATORS: This is a format string passed to strftime to combine the date and the time. The value of "%s, %s" would result in a string like this in US English 12-hour time: 'Fri Jul 16, 11:50 AM' */ - return g_strdup_printf(T_("%s, %s"), date_string, time_string); + return g_strdup_printf(T_("%s %s"), date_string, time_string); } gchar * -- cgit v1.2.3 From 09dc8ae0299f9288ba6c2a34f4df8ef9ceab53b6 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 23 Mar 2011 09:08:24 -0400 Subject: avoid duplicates in geonames data --- src/timezone-completion.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/timezone-completion.c b/src/timezone-completion.c index f570c33..1138d0b 100644 --- a/src/timezone-completion.c +++ b/src/timezone-completion.c @@ -74,6 +74,9 @@ json_parse_ready (GObject *object, GAsyncResult *res, gpointer user_data) TimezoneCompletion * completion = TIMEZONE_COMPLETION (user_data); TimezoneCompletionPrivate * priv = TIMEZONE_COMPLETION_GET_PRIVATE(completion); GError * error = NULL; + const gchar * prev_name = NULL; + const gchar * prev_admin1 = NULL; + const gchar * prev_country = NULL; json_parser_load_from_stream_finish (JSON_PARSER (object), res, &error); @@ -112,6 +115,7 @@ json_parse_ready (GObject *object, GAsyncResult *res, gpointer user_data) const gchar * country = NULL; const gchar * longitude = NULL; const gchar * latitude = NULL; + gboolean skip = FALSE; if (json_reader_read_member (reader, "name")) { name = json_reader_get_string_value (reader); json_reader_end_member (reader); @@ -133,16 +137,30 @@ json_parse_ready (GObject *object, GAsyncResult *res, gpointer user_data) json_reader_end_member (reader); } - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - TIMEZONE_COMPLETION_ZONE, NULL, - TIMEZONE_COMPLETION_NAME, name, - TIMEZONE_COMPLETION_ADMIN1, admin1, - TIMEZONE_COMPLETION_COUNTRY, country, - TIMEZONE_COMPLETION_LONGITUDE, longitude, - TIMEZONE_COMPLETION_LATITUDE, latitude, - -1); + if (g_strcmp0(name, prev_name) == 0 && + g_strcmp0(admin1, prev_admin1) == 0 && + g_strcmp0(country, prev_country) == 0) { + // Sometimes the data will have duplicate entries that only differ + // in longitude and latitude. e.g. "rio de janeiro", "wellington" + skip = TRUE; + } + + if (!skip) { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + TIMEZONE_COMPLETION_ZONE, NULL, + TIMEZONE_COMPLETION_NAME, name, + TIMEZONE_COMPLETION_ADMIN1, admin1, + TIMEZONE_COMPLETION_COUNTRY, country, + TIMEZONE_COMPLETION_LONGITUDE, longitude, + TIMEZONE_COMPLETION_LATITUDE, latitude, + -1); + } + + prev_name = name; + prev_admin1 = admin1; + prev_country = country; } json_reader_end_element (reader); -- cgit v1.2.3 From 03660972bff4b77a8d6079e325b799e1a6e74d37 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 23 Mar 2011 09:12:45 -0400 Subject: free json memory and sink model ref --- src/timezone-completion.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/timezone-completion.c b/src/timezone-completion.c index f570c33..5a0e31b 100644 --- a/src/timezone-completion.c +++ b/src/timezone-completion.c @@ -63,7 +63,7 @@ save_and_use_model (TimezoneCompletion * completion, GtkTreeModel * model) { TimezoneCompletionPrivate * priv = TIMEZONE_COMPLETION_GET_PRIVATE(completion); - g_hash_table_insert (priv->request_table, g_strdup (priv->request_text), g_object_ref (model)); + g_hash_table_insert (priv->request_table, g_strdup (priv->request_text), g_object_ref_sink (model)); gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), model); gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion)); } @@ -149,7 +149,7 @@ json_parse_ready (GObject *object, GAsyncResult *res, gpointer user_data) } save_and_use_model (completion, GTK_TREE_MODEL (store)); - g_object_unref (G_OBJECT (store)); + g_object_unref (G_OBJECT (reader)); } static void -- cgit v1.2.3 From 531bbc3ffff45f8ac6295d403161dbca53b7043c Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 23 Mar 2011 09:15:08 -0400 Subject: one more free --- src/timezone-completion.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/timezone-completion.c b/src/timezone-completion.c index 5a0e31b..183dfd5 100644 --- a/src/timezone-completion.c +++ b/src/timezone-completion.c @@ -98,8 +98,10 @@ json_parse_ready (GObject *object, GAsyncResult *res, gpointer user_data) JsonReader * reader = json_reader_new (json_parser_get_root (JSON_PARSER (object))); - if (!json_reader_is_array (reader)) + if (!json_reader_is_array (reader)) { + g_object_unref (G_OBJECT (reader)); return; + } gint i, count = json_reader_count_elements (reader); for (i = 0; i < count; ++i) { -- cgit v1.2.3 From 4e06269da6ce04853361a2d212011d25a4717064 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 23 Mar 2011 08:35:18 -0500 Subject: use default matching algorithm when using initial_model (i.e. no internet) --- src/timezone-completion.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/timezone-completion.c b/src/timezone-completion.c index f570c33..f32c051 100644 --- a/src/timezone-completion.c +++ b/src/timezone-completion.c @@ -58,12 +58,26 @@ static void timezone_completion_finalize (GObject *object); G_DEFINE_TYPE (TimezoneCompletion, timezone_completion, GTK_TYPE_ENTRY_COMPLETION); +static gboolean +match_func (GtkEntryCompletion *completion, const gchar *key, + GtkTreeIter *iter, gpointer user_data) +{ + // geonames does the work for us + return TRUE; +} + static void save_and_use_model (TimezoneCompletion * completion, GtkTreeModel * model) { TimezoneCompletionPrivate * priv = TIMEZONE_COMPLETION_GET_PRIVATE(completion); g_hash_table_insert (priv->request_table, g_strdup (priv->request_text), g_object_ref (model)); + + if (model == priv->initial_model) + gtk_entry_completion_set_match_func (GTK_ENTRY_COMPLETION (completion), NULL, NULL, NULL); + else + gtk_entry_completion_set_match_func (GTK_ENTRY_COMPLETION (completion), match_func, NULL, NULL); + gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), model); gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion)); } @@ -317,14 +331,6 @@ data_func (GtkCellLayout *cell_layout, GtkCellRenderer *cell, g_value_unset (&country_val); } -static gboolean -match_func (GtkEntryCompletion *completion, const gchar *key, - GtkTreeIter *iter, gpointer user_data) -{ - // geonames does the work for us - return TRUE; -} - static void timezone_completion_class_init (TimezoneCompletionClass *klass) { @@ -345,7 +351,6 @@ timezone_completion_init (TimezoneCompletion * self) priv->initial_model = GTK_TREE_MODEL (get_initial_model ()); - gtk_entry_completion_set_match_func (GTK_ENTRY_COMPLETION (self), match_func, NULL, NULL); g_object_set (G_OBJECT (self), "text-column", TIMEZONE_COMPLETION_NAME, "popup-set-width", FALSE, -- cgit v1.2.3 From 6173eb97685ea535f5e804460d6000964745f612 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 23 Mar 2011 10:58:50 -0500 Subject: make location completions a bit more robust in terms of when the popup is shown or not --- src/timezone-completion.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/timezone-completion.c b/src/timezone-completion.c index fd6c97b..aaf6bdc 100644 --- a/src/timezone-completion.c +++ b/src/timezone-completion.c @@ -80,6 +80,11 @@ save_and_use_model (TimezoneCompletion * completion, GtkTreeModel * model) gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), model); gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion)); + + /* By this time, the changed signal has come and gone. We didn't give a + model to use, so no popup appeared for user. Poke the entry again to show + popup in 300ms. */ + g_signal_emit_by_name (priv->entry, "changed"); } static void @@ -116,6 +121,8 @@ json_parse_ready (GObject *object, GAsyncResult *res, gpointer user_data) JsonReader * reader = json_reader_new (json_parser_get_root (JSON_PARSER (object))); if (!json_reader_is_array (reader)) { + g_warning ("Could not parse geoname JSON data"); + save_and_use_model (completion, priv->initial_model); g_object_unref (G_OBJECT (reader)); return; } @@ -223,15 +230,6 @@ request_zones (TimezoneCompletion * completion) return FALSE; } - const gchar * text = gtk_entry_get_text (priv->entry); - - gpointer data; - if (g_hash_table_lookup_extended (priv->request_table, text, NULL, &data)) { - gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), GTK_TREE_MODEL (data)); - gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion)); - return FALSE; - } - /* Cancel any ongoing request */ if (priv->cancel) { g_cancellable_cancel (priv->cancel); @@ -239,6 +237,7 @@ request_zones (TimezoneCompletion * completion) } g_free (priv->request_text); + const gchar * text = gtk_entry_get_text (priv->entry); priv->request_text = g_strdup (text); gchar * escaped = g_uri_escape_string (text, NULL, FALSE); @@ -259,7 +258,18 @@ entry_changed (GtkEntry * entry, TimezoneCompletion * completion) if (priv->queued_request) { g_source_remove (priv->queued_request); } - priv->queued_request = g_timeout_add (300, (GSourceFunc)request_zones, completion); + + /* See if we've already got this one */ + const gchar * text = gtk_entry_get_text (priv->entry); + gpointer data; + if (g_hash_table_lookup_extended (priv->request_table, text, NULL, &data)) { + gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), GTK_TREE_MODEL (data)); + } + else { + priv->queued_request = g_timeout_add (300, (GSourceFunc)request_zones, completion); + gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), NULL); + } + gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion)); } void @@ -267,6 +277,10 @@ timezone_completion_watch_entry (TimezoneCompletion * completion, GtkEntry * ent { TimezoneCompletionPrivate * priv = TIMEZONE_COMPLETION_GET_PRIVATE (completion); + if (priv->queued_request) { + g_source_remove (priv->queued_request); + priv->queued_request = 0; + } if (priv->entry) { g_source_remove (priv->changed_id); g_object_remove_weak_pointer (G_OBJECT (priv->entry), (gpointer *)&priv->entry); -- cgit v1.2.3 From 1daab282087696f4e83dd0da5ffd794d94e3622a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Mar 2011 16:03:40 -0500 Subject: 0.2.0 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b05f3f1..ef49e53 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.1.98, ted@canonical.com) +AC_INIT(indicator-datetime, 0.2.0, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.1.98) +AM_INIT_AUTOMAKE(indicator-datetime, 0.2.0) AM_MAINTAINER_MODE -- cgit v1.2.3