diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/changelog | 43 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/service.c | 117 |
5 files changed, 153 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 5b9dda6..040f222 100644 --- a/configure.ac +++ b/configure.ac @@ -53,6 +53,7 @@ ECAL_REQUIRED_VERSION=3.5 EDS_REQUIRED_VERSION=3.5 LIBNOTIFY_REQUIRED_VERSION=0.7.6 URL_DISPATCHER_1_REQUIRED_VERSION=1 +JSON_GLIB_REQUIRED_VERSION=0.16.2 GTK3_REQUIRED_VERSION=3.1.4 @@ -61,9 +62,10 @@ PKG_CHECK_MODULES(SERVICE, [glib-2.0 >= $GLIB_REQUIRED_VERSION geoclue >= $GEOCLUE_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION - libedataserver-1.2 >= EDS_REQUIRED_VERSION + libedataserver-1.2 >= $EDS_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION - url-dispatcher-1 >= URL_DISPATCHER_1_REQUIRED_VERSION]) + url-dispatcher-1 >= $URL_DISPATCHER_1_REQUIRED_VERSION + json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION]) ########################### # Control Center panel diff --git a/debian/changelog b/debian/changelog index 918b53c..fc74793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +indicator-datetime (13.10.0+13.10.20131016.2-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Remove the g_error() call that caused an abort() in the call to + on_name_lost() in our bus handler. (LP: #1238737) + + [ Didier Roche ] + * remove invalid click recommends and downgrade to Suggests + + [ Ubuntu daily release ] + * Automatic snapshot from revision 274 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 16 Oct 2013 15:30:10 +0000 + +indicator-datetime (13.10.0+13.10.20131016-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Use the Unity Mobile icon name for the alarm clock icon. + * cache our internal GTimeZone instead of constantly re-creating it. + (LP: #1238043) + * Changes the phone profile's "Clock" menuitem in two ways: 1. instead + of using a stock icon, try to use the clock app's icon. 2. when + clicked, launch the clock app. (LP: #1227106) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 271 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 16 Oct 2013 02:35:10 +0000 + +indicator-datetime (13.10.0+13.10.20131011-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * start tracking failure-to-connect-to-bus errors on indicator- + datetime. (LP: #1227519) + * When an unsupported date format is being used, improve the error + message to also include the unsupported date format so that users + can include it in their bug reports. (LP: #1196059) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 267 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 11 Oct 2013 04:27:40 +0000 + indicator-datetime (13.10.0+13.10.20131004-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/debian/control b/debian/control index 0815e1b..548f7b0 100644 --- a/debian/control +++ b/debian/control @@ -42,6 +42,7 @@ Depends: ${shlibs:Depends}, Recommends: indicator-applet | indicator-renderer, evolution-data-server, gnome-control-center-datetime | ubuntu-system-settings, +Suggests: click, Conflicts: indicator-datetime (<< 13.10.0) Replaces: indicator-datetime (<< 13.10.0) Description: Simple clock @@ -21,7 +21,6 @@ #include <locale.h> #include <stdlib.h> /* exit() */ -#include <stdio.h> #include <glib/gi18n.h> #include <gio/gio.h> @@ -44,7 +43,7 @@ static GOptionEntry entries[] = { }; static void -on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop G_GNUC_UNUSED) +on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop) { g_message ("exiting: service couldn't acquire or lost ownership of busname"); diff --git a/src/service.c b/src/service.c index 09ee4d4..e83410e 100644 --- a/src/service.c +++ b/src/service.c @@ -25,6 +25,7 @@ #include <glib/gi18n.h> #include <gio/gio.h> #include <libnotify/notify.h> +#include <json-glib/json-glib.h> #include <url-dispatcher.h> #include "dbus-shared.h" @@ -36,6 +37,7 @@ #define SKEW_CHECK_INTERVAL_SEC 10 #define SKEW_DIFF_THRESHOLD_USEC ((SKEW_CHECK_INTERVAL_SEC+5) * G_USEC_PER_SEC) +#define ALARM_CLOCK_ICON_NAME "alarm-clock" G_DEFINE_TYPE (IndicatorDatetimeService, indicator_datetime_service, @@ -103,6 +105,16 @@ struct _IndicatorDatetimeServicePrivate IndicatorDatetimeTimezone * tz_geoclue; IndicatorDatetimePlanner * planner; + /* cached GTimeZone for use by indicator_datetime_service_get_localtime() */ + GTimeZone * internal_timezone; + + /* the clock app's icon filename */ + gchar * clock_app_icon_filename; + + /* Whether or not we've tried to load the clock app's icon. + This way we don't keep trying to reload it on the desktop */ + gboolean clock_app_icon_initialized; + guint own_id; guint actions_export_id; GDBusConnection * conn; @@ -403,8 +415,6 @@ appointment_has_alarm_url (const struct IndicatorDatetimeAppt * appt) static gboolean datetimes_have_the_same_minute (GDateTime * a G_GNUC_UNUSED, GDateTime * b G_GNUC_UNUSED) { -return TRUE; -#if 0 int ay, am, ad; int by, bm, bd; @@ -416,7 +426,6 @@ return TRUE; (ad == bd) && (g_date_time_get_hour (a) == g_date_time_get_hour (b)) && (g_date_time_get_minute (a) == g_date_time_get_minute (b)); -#endif } static void @@ -462,7 +471,7 @@ show_snap_decision_for_alarm (const struct IndicatorDatetimeAppt * appt) title = g_date_time_format (appt->begin, get_terse_time_format_string (appt->begin)); body = appt->summary; - icon_name = "alarm-clock"; + icon_name = ALARM_CLOCK_ICON_NAME; g_debug ("creating a snap decision with title '%s', body '%s', icon '%s'", title, body, icon_name); @@ -501,8 +510,6 @@ on_alarm_timer (gpointer gself) { const struct IndicatorDatetimeAppt * appt = l->data; -g_message ("[%s][%s]", g_date_time_format (appt->begin, "%F %T"), appt->url); - if (appointment_has_alarm_url (appt)) if (datetimes_have_the_same_minute (now, appt->begin)) show_snap_decision_for_alarm (appt); @@ -578,6 +585,23 @@ set_alarm_timer (IndicatorDatetimeService * self) **** ***/ +static void +update_internal_timezone (IndicatorDatetimeService * self) +{ + priv_t * p = self->priv; + const char * id; + + /* find the id from tz_file or tz_geoclue if possible; NULL otherwise */ + id = NULL; + if (!id && p->tz_file) + id = indicator_datetime_timezone_get_timezone (p->tz_file); + if (!id && p->tz_geoclue) + id = indicator_datetime_timezone_get_timezone (p->tz_geoclue); + + g_clear_pointer (&p->internal_timezone, g_time_zone_unref); + p->internal_timezone = g_time_zone_new (id); +} + /** * General purpose handler for rebuilding sections and restarting their timers * when time jumps for whatever reason: @@ -596,6 +620,7 @@ on_local_time_jumped (IndicatorDatetimeService * self) 1. rebuild the necessary states / menuitems when time jumps 2. restart the timers so their new wait interval is correct */ + update_internal_timezone (self); on_header_timer (self); on_timezone_timer (self); } @@ -707,7 +732,7 @@ create_phone_header_state (IndicatorDatetimeService * self) if ((has_alarms = service_has_alarms (self))) { GIcon * icon; - icon = g_themed_icon_new_with_default_fallbacks ("alarm-symbolic"); + icon = g_themed_icon_new_with_default_fallbacks (ALARM_CLOCK_ICON_NAME); g_variant_builder_add (&b, "{sv}", "icon", g_icon_serialize (icon)); g_object_unref (icon); } @@ -950,7 +975,10 @@ add_appointments (IndicatorDatetimeService * self, GMenu * menu, gboolean phone) menu_item = g_menu_item_new (appt->summary, NULL); - if (appt->color && !appt->has_alarms) + if (appt->has_alarms) + g_menu_item_set_attribute (menu_item, G_MENU_ATTRIBUTE_ICON, + "s", ALARM_CLOCK_ICON_NAME); + else if (appt->color != NULL) g_menu_item_set_attribute (menu_item, "x-canonical-color", "s", appt->color); @@ -980,14 +1008,60 @@ add_appointments (IndicatorDatetimeService * self, GMenu * menu, gboolean phone) g_date_time_unref (now); } + +/* try to extract the clock app's filename from click. (/$pkgdir/$icon) */ +static gchar * +get_clock_app_icon_filename (void) +{ + gchar * icon_filename = NULL; + gchar * pkgdir; + + pkgdir = NULL; + g_spawn_command_line_sync ("click pkgdir com.ubuntu.clock", &pkgdir, NULL, NULL, NULL); + if (pkgdir != NULL) + { + gchar * manifest = NULL; + g_strstrip (pkgdir); + g_spawn_command_line_sync ("click info com.ubuntu.clock", &manifest, NULL, NULL, NULL); + if (manifest != NULL) + { + JsonParser * parser = json_parser_new (); + if (json_parser_load_from_data (parser, manifest, -1, NULL)) + { + JsonNode * root = json_parser_get_root (parser); /* transfer-none */ + if ((root != NULL) && (JSON_NODE_TYPE(root) == JSON_NODE_OBJECT)) + { + JsonObject * o = json_node_get_object (root); /* transfer-none */ + const gchar * icon_name = json_object_get_string_member (o, "icon"); + if (icon_name != NULL) + icon_filename = g_build_filename (pkgdir, icon_name, NULL); + } + } + g_object_unref (parser); + g_free (manifest); + } + g_free (pkgdir); + } + + return icon_filename; +} + static GMenuModel * create_phone_appointments_section (IndicatorDatetimeService * self) { + priv_t * p = self->priv; GMenu * menu = g_menu_new (); GMenuItem * menu_item; - menu_item = g_menu_item_new (_("Clock"), NULL); - g_menu_item_set_attribute (menu_item, G_MENU_ATTRIBUTE_ICON, "s", "clock"); + if (G_UNLIKELY (!p->clock_app_icon_initialized)) + { + p->clock_app_icon_initialized = TRUE; + p->clock_app_icon_filename = get_clock_app_icon_filename (); + } + + menu_item = g_menu_item_new (_("Clock"), "indicator.activate-phone-clock-app"); + if (p->clock_app_icon_filename != NULL) + g_menu_item_set_attribute (menu_item, G_MENU_ATTRIBUTE_ICON, "s", p->clock_app_icon_filename); g_menu_append_item (menu, menu_item); g_object_unref (menu_item); @@ -1537,6 +1611,15 @@ on_activate_appointment (GSimpleAction * a G_GNUC_UNUSED, } static void +on_phone_clock_activated (GSimpleAction * a G_GNUC_UNUSED, + GVariant * param G_GNUC_UNUSED, + gpointer gself G_GNUC_UNUSED) +{ + const char * url = "appid://com.ubuntu.clock/clock/current-user-version"; + url_dispatch_send (url, NULL, NULL); +} + +static void on_activate_planner (GSimpleAction * a G_GNUC_UNUSED, GVariant * param, gpointer gself) @@ -1589,6 +1672,7 @@ init_gactions (IndicatorDatetimeService * self) GActionEntry entries[] = { { "activate-desktop-settings", on_desktop_settings_activated }, { "activate-phone-settings", on_phone_settings_activated }, + { "activate-phone-clock-app", on_phone_clock_activated }, { "activate-planner", on_activate_planner, "x", NULL }, { "activate-appointment", on_activate_appointment, "s", NULL }, { "set-location", on_set_location, "s" } @@ -1823,7 +1907,7 @@ set_upcoming_appointments (IndicatorDatetimeService * self, rebuild_appointments_section_soon (self); /* alarm timer is keyed off of the next alarm time, - so it needs to be rebuilt when tehe appointment list changes */ + so it needs to be rebuilt when the appointment list changes */ set_alarm_timer (self); } @@ -2080,6 +2164,7 @@ my_dispose (GObject * o) for (i=0; i<N_PROFILES; ++i) g_clear_object (&p->menus[i].menu); + g_clear_pointer (&p->internal_timezone, g_time_zone_unref); g_clear_object (&p->calendar_action); g_clear_object (&p->desktop_header_action); g_clear_object (&p->phone_header_action); @@ -2094,6 +2179,7 @@ my_finalize (GObject * o) IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE(o); priv_t * p = self->priv; + g_free (p->clock_app_icon_filename); g_clear_pointer (&p->skew_time, g_date_time_unref); g_clear_pointer (&p->calendar_date, g_date_time_unref); @@ -2284,9 +2370,14 @@ indicator_datetime_service_new (IndicatorDatetimePlanner * planner) /* This currently just returns the system time, As we add test coverage, we'll need this to bypass the system time. */ GDateTime * -indicator_datetime_service_get_localtime (IndicatorDatetimeService * self G_GNUC_UNUSED) +indicator_datetime_service_get_localtime (IndicatorDatetimeService * self) { - return g_date_time_new_now_local (); + priv_t * p = self->priv; + + if (G_UNLIKELY (p->internal_timezone == NULL)) + update_internal_timezone (self); + + return g_date_time_new_now (p->internal_timezone); } void |