From b23d4229f6ba49d0171034582dd700c6c2328795 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 11 Oct 2013 04:27:42 +0000 Subject: Releasing 13.10.0+13.10.20131011-0ubuntu1, based on r267 --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 918b53c..dddf7a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 Fri, 11 Oct 2013 04:27:40 +0000 + indicator-datetime (13.10.0+13.10.20131004-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From 50dbb636dc2078b21a7d981b1d4d3c3a25384648 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 15 Oct 2013 14:14:41 -0500 Subject: use the clock app's icon for the 'Clock' menuitem, and launch the clock app when it's clicked. --- configure.ac | 6 ++++-- debian/control | 1 + src/service.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/configure.ac b/configure.ac index 8b95695..c41dc38 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,7 @@ ICAL_REQUIRED_VERSION=0.48 ECAL_REQUIRED_VERSION=3.5 EDS_REQUIRED_VERSION=3.5 URL_DISPATCHER_1_REQUIRED_VERSION=1 +JSON_GLIB_REQUIRED_VERSION=0.16.2 GTK3_REQUIRED_VERSION=3.1.4 @@ -60,8 +61,9 @@ 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 - url-dispatcher-1 >= URL_DISPATCHER_1_REQUIRED_VERSION]) + libedataserver-1.2 >= $EDS_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/control b/debian/control index 67938bf..993d41a 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, + click, gnome-control-center-datetime | ubuntu-system-settings, Conflicts: indicator-datetime (<< 13.10.0) Replaces: indicator-datetime (<< 13.10.0) diff --git a/src/service.c b/src/service.c index 12857bb..2516b2d 100644 --- a/src/service.c +++ b/src/service.c @@ -24,6 +24,7 @@ #include #include +#include #include #include "dbus-shared.h" @@ -783,14 +784,57 @@ add_appointments (IndicatorDatetimeService * self, GMenu * menu, gboolean terse) g_date_time_unref (now); } +static const gchar * +get_clock_app_icon_filename (void) +{ + static gboolean initialized = FALSE; + static gchar * icon_filename = NULL; + + /* try to extract the clock app's filename from click. (/$pkgdir/$icon) */ + if (!initialized) + { + gchar * 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"); + icon_filename = g_build_filename (pkgdir, icon_name, NULL); + } + } + g_object_unref (parser); + g_free (manifest); + } + g_free (pkgdir); + } + + initialized = TRUE; + } + + return icon_filename; +} + static GMenuModel * create_phone_appointments_section (IndicatorDatetimeService * self) { GMenu * menu = g_menu_new (); GMenuItem * menu_item; + const gchar * icon_filename; - menu_item = g_menu_item_new (_("Clock"), NULL); - g_menu_item_set_attribute (menu_item, G_MENU_ATTRIBUTE_ICON, "s", "clock"); + menu_item = g_menu_item_new (_("Clock"), "indicator.activate-phone-clock-app"); + if ((icon_filename = get_clock_app_icon_filename ())) + g_menu_item_set_attribute (menu_item, G_MENU_ATTRIBUTE_ICON, "s", icon_filename); g_menu_append_item (menu, menu_item); g_object_unref (menu_item); @@ -1311,6 +1355,15 @@ on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, url_dispatch_send ("settings:///system/time-date", NULL, NULL); } +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, @@ -1364,6 +1417,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 }, { "set-location", on_set_location, "s" } }; -- cgit v1.2.3 From bd3296deab1f75d92733620c607ea3b2cc6c6d05 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 16 Oct 2013 02:35:10 +0000 Subject: Releasing 13.10.0+13.10.20131016-0ubuntu1, based on r271 --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dddf7a5..a9ae881 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +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 Wed, 16 Oct 2013 02:35:10 +0000 + indicator-datetime (13.10.0+13.10.20131011-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From a5eff35aea5fcbdd97b6d9459e5b05fcb4279676 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 16 Oct 2013 17:01:11 +0200 Subject: remove invalid click recommends and downgrade to Suggests --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 993d41a..22828b5 100644 --- a/debian/control +++ b/debian/control @@ -40,8 +40,8 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - click, gnome-control-center-datetime | ubuntu-system-settings, +Suggests: click, Conflicts: indicator-datetime (<< 13.10.0) Replaces: indicator-datetime (<< 13.10.0) Description: Simple clock -- cgit v1.2.3 From fc8dba4e15736ab90da77fe162573f33cd0ba792 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 16 Oct 2013 15:30:11 +0000 Subject: Releasing 13.10.0+13.10.20131016.2-0ubuntu1, based on r274 --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a9ae881..fc74793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 Wed, 16 Oct 2013 15:30:10 +0000 + indicator-datetime (13.10.0+13.10.20131016-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3