From 18a091e005bffe0c32d6e7efdfe368cdfd8aae55 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 28 Aug 2013 10:09:19 +0000 Subject: Releasing 13.10.0+13.10.20130828.2-0ubuntu1, based on r245 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 81abd59..60f8cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -indicator-datetime (13.10.0-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (13.10.0+13.10.20130828.2-0ubuntu1) saucy; urgency=low + [ Ted Gould ] * Updating version to make the Conflicts/Replace nicer * Split out gnome-control-center panel into it's own package - -- Ted Gould Tue, 27 Aug 2013 10:26:47 -0500 + [ Ubuntu daily release ] + * Automatic snapshot from revision 245 + + -- Ubuntu daily release Wed, 28 Aug 2013 10:09:19 +0000 indicator-datetime (12.10.3+13.10.20130822.1-0ubuntu1) saucy; urgency=low -- cgit v1.2.3 From eed6a021223e34437d8df21a7c428a3dd74f5ae5 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sun, 1 Sep 2013 15:32:51 -0400 Subject: Really delete *.la file --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index a350b13..4762c8f 100755 --- a/debian/rules +++ b/debian/rules @@ -12,8 +12,7 @@ override_dh_auto_configure: dh_auto_configure -- --disable-static --disable-silent-rules override_dh_install: - find debian/indicator-datetime -name \*.la -delete - find debian/indicator-datetime -name \*.a -delete + find $(CURDIR) -name \*.la -delete cd po; intltool-update --pot --verbose dh_install --fail-missing # Language packs -- cgit v1.2.3 From 2f4de37b9cb610931e41980de4acc3c07286918b Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Mon, 2 Sep 2013 10:08:49 -0400 Subject: Don't install *.la files instead of deleting them --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 4762c8f..25854b8 100755 --- a/debian/rules +++ b/debian/rules @@ -12,9 +12,8 @@ override_dh_auto_configure: dh_auto_configure -- --disable-static --disable-silent-rules override_dh_install: - find $(CURDIR) -name \*.la -delete cd po; intltool-update --pot --verbose - dh_install --fail-missing + dh_install -X.la --fail-missing # Language packs for d in $$(find debian/indicator-datetime -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \ sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ -- cgit v1.2.3 From 3dbb294322444364cd1e5e9caa333c44338ea392 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 3 Sep 2013 02:08:17 +0000 Subject: Releasing 13.10.0+13.10.20130903-0ubuntu1, based on r247 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 60f8cfe..d2bd251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-datetime (13.10.0+13.10.20130903-0ubuntu1) saucy; urgency=low + + [ Jeremy Bicha ] + * Really don't install *.la file. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 247 + + -- Ubuntu daily release Tue, 03 Sep 2013 02:08:17 +0000 + indicator-datetime (13.10.0+13.10.20130828.2-0ubuntu1) saucy; urgency=low [ Ted Gould ] -- cgit v1.2.3 From 67f71fb0f277f1a4ad9f7551732cede667c2849c Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 13 Sep 2013 15:16:38 +0000 Subject: Releasing 13.10.0+13.10.20130913-0ubuntu1, based on r256 --- debian/changelog | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d2bd251..03a19db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +indicator-datetime (13.10.0+13.10.20130913-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Make the EDS planner nonblocking. (LP: #1204532) + * Minor changes that eliminate unnecessary temporary strings. + * This change adds a GSettings* arg to the utils functions so that + they don't have to churn through temporary GSettings objects. These + functions are usually called in a loop, causing a lot of GSettings + temporaries, even though the calling code already has an instance + for that GSettings schema. + * name says it all; this branch is for improving indicator-datetime + test coverage. + * Remove code duplication between timezone-file and timezone-geoclue. + * Adds a title in the header's action state. (LP: #1223635) + + [ Ted Gould ] + * Fix GeoClue signal handler to have proper prototype. (LP: #1195874) + * Protect against invalid begin or end dates. (LP: #1216263) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 256 + + -- Ubuntu daily release Fri, 13 Sep 2013 15:16:38 +0000 + indicator-datetime (13.10.0+13.10.20130903-0ubuntu1) saucy; urgency=low [ Jeremy Bicha ] -- cgit v1.2.3 From 244b8007da33ee7bbaa66eb4da12f9db0001d51c Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 24 Sep 2013 08:58:52 +0000 Subject: Releasing 13.10.0+13.10.20130924.2-0ubuntu1, based on r258 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 03a19db..69b0521 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-datetime (13.10.0+13.10.20130924.2-0ubuntu1) saucy; urgency=low + + [ Timo Jyrinki ] + * Add X-Ubuntu-Gettext-Domain in .desktop file to use translations + (LP: #1223498). (LP: #1223498) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 258 + + -- Ubuntu daily release Tue, 24 Sep 2013 08:58:52 +0000 + indicator-datetime (13.10.0+13.10.20130913-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From 158a962cee927c7b4cb9a70266681886a8895b48 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Sep 2013 17:16:22 -0500 Subject: Use url-dispatcher instead of invoking system-settings directly. --- configure.ac | 14 ++++++++------ debian/control | 1 + src/service.c | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/configure.ac b/configure.ac index c165a3b..8b95695 100644 --- a/configure.ac +++ b/configure.ac @@ -51,15 +51,17 @@ GEOCLUE_REQUIRED_VERSION=0.12.0 ICAL_REQUIRED_VERSION=0.48 ECAL_REQUIRED_VERSION=3.5 EDS_REQUIRED_VERSION=3.5 +URL_DISPATCHER_1_REQUIRED_VERSION=1 GTK3_REQUIRED_VERSION=3.1.4 -PKG_CHECK_MODULES(SERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - geoclue >= $GEOCLUE_REQUIRED_VERSION - libical >= $ICAL_REQUIRED_VERSION - libecal-1.2 >= $ECAL_REQUIRED_VERSION - libedataserver-1.2 >= EDS_REQUIRED_VERSION) +PKG_CHECK_MODULES(SERVICE, [glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_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]) ########################### # Control Center panel diff --git a/debian/control b/debian/control index ae07129..67938bf 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9), libgconf2-dev (>= 2.31), libgnome-control-center-dev, libtimezonemap1-dev, + liburl-dispatcher1-dev, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-datetime # If you aren't a member of ~indicator-applet-developers but need to upload diff --git a/src/service.c b/src/service.c index ce8139f..2528f41 100644 --- a/src/service.c +++ b/src/service.c @@ -24,6 +24,7 @@ #include #include +#include #include "dbus-shared.h" #include "planner-eds.h" @@ -1282,7 +1283,7 @@ on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { - execute_command ("system-settings time-date"); + url_dispatch_send ("settings://system/time-date", NULL, NULL); } static void -- cgit v1.2.3 From 0f52c0f5344ccb91157541301f91b4ca9087948f Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Mon, 30 Sep 2013 06:32:59 +0000 Subject: Releasing 13.10.0+13.10.20130930-0ubuntu1, based on r260 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 69b0521..3ac0eaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-datetime (13.10.0+13.10.20130930-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Use url-dispatcher instead of invoking system-settings directly. + (LP: #1230819) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 260 + + -- Ubuntu daily release Mon, 30 Sep 2013 06:32:59 +0000 + indicator-datetime (13.10.0+13.10.20130924.2-0ubuntu1) saucy; urgency=low [ Timo Jyrinki ] -- cgit v1.2.3 From d3ae965a5bdc7d82aeff4ad515bad8c1f74bcaf9 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 4 Oct 2013 02:29:27 +0000 Subject: Releasing 13.10.0+13.10.20131004-0ubuntu1, based on r264 --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3ac0eaa..918b53c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +indicator-datetime (13.10.0+13.10.20131004-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Change the tablet time format string to remove leading zeroes from + the hour component of the time format (ie, H:MM rather than HH:MM). + (LP: #1234483) + * on the phone, show appointments at 1AM as '1 AM', clock times as + '1:00 AM'. (LP: #1220297) + * Update settings URL to settings:///system. (LP: #1231444) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 264 + + -- Ubuntu daily release Fri, 04 Oct 2013 02:29:26 +0000 + indicator-datetime (13.10.0+13.10.20130930-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From a52e3b86ee0dbce56221d1327c6c62a6d8e163e3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 9 Oct 2013 21:33:15 -0500 Subject: preliminary implementation of snap decision --- configure.ac | 2 ++ debian/control | 1 + src/main.c | 6 +++++ src/service.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++----------- 4 files changed, 73 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/configure.ac b/configure.ac index 8b95695..5b9dda6 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ GEOCLUE_REQUIRED_VERSION=0.12.0 ICAL_REQUIRED_VERSION=0.48 ECAL_REQUIRED_VERSION=3.5 EDS_REQUIRED_VERSION=3.5 +LIBNOTIFY_REQUIRED_VERSION=0.7.6 URL_DISPATCHER_1_REQUIRED_VERSION=1 GTK3_REQUIRED_VERSION=3.1.4 @@ -61,6 +62,7 @@ PKG_CHECK_MODULES(SERVICE, [glib-2.0 >= $GLIB_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION libedataserver-1.2 >= EDS_REQUIRED_VERSION + libnotify >= $LIBNOTIFY_REQUIRED_VERSION url-dispatcher-1 >= URL_DISPATCHER_1_REQUIRED_VERSION]) ########################### diff --git a/debian/control b/debian/control index 67938bf..0815e1b 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9), libxorg-gtest-dev, libgtest-dev, libglib2.0-dev (>= 2.35.4), + libnotify-dev (>= 0.7.6), libido3-0.1-dev (>= 0.2.90), libgeoclue-dev (>= 0.12.0), libecal1.2-dev (>= 3.5), diff --git a/src/main.c b/src/main.c index 073c876..34e9b98 100644 --- a/src/main.c +++ b/src/main.c @@ -24,6 +24,7 @@ #include #include +#include #include "planner-eds.h" #include "planner-mock.h" @@ -52,6 +53,11 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED) bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); textdomain (GETTEXT_PACKAGE); + /* init libnotify */ + if (!notify_init ("indicator-datetime-service")) + g_critical ("libnotify initialization failed"); + + /* get the planner */ if (g_getenv ("INDICATOR_DATETIME_USE_FAKE_PLANNER") != NULL) { diff --git a/src/service.c b/src/service.c index 57d0a7e..c76b07e 100644 --- a/src/service.c +++ b/src/service.c @@ -24,6 +24,7 @@ #include #include +#include #include #include "dbus-shared.h" @@ -431,31 +432,80 @@ dispatch_alarm_url (const struct IndicatorDatetimeAppt * appt) url_dispatch_send (appt->url, NULL, NULL); } -/* Check for alarms that start at the current time. - If we find any, we dispatch the URL associated with them. */ +#if 0 static void -dispatch_alarm_urls (IndicatorDatetimeService * self) +on_notification_closed (NotifyNotification * nn, gpointer gself) { - GDateTime * now = indicator_datetime_service_get_localtime (self); - GSList * l; + //IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (gself); - for (l=self->priv->upcoming_appointments; l!=NULL; l=l->next) - { - const struct IndicatorDatetimeAppt * appt = l->data; + g_message ("hello world"); - if (appointment_has_alarm_url (appt) && datetimes_have_the_same_minute (now, appt->begin)) - dispatch_alarm_url (appt); - } + /* cleanup */ + g_signal_handlers_disconnect_by_data (nn, gself); + g_object_unref (nn); +} +#endif - g_date_time_unref (now); +static void +on_alarm_popup_ok_clicked (NotifyNotification * nn G_GNUC_UNUSED, char * action G_GNUC_UNUSED, gpointer gurl) +{ + const char * url = gurl; + url_dispatch_send (url, NULL, NULL); } +#define ALARM_ICON_NAME "alarm-symbolic" + static void update_appointment_lists (IndicatorDatetimeService * self); static gboolean -on_alarm_timer (gpointer self) +on_alarm_timer (gpointer gself) { - dispatch_alarm_urls (self); + GDateTime * now; + GSList * l; + IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (gself); + + /* Check for alarms that start at the current time. + * If we find one, trigger a snap decision displaying + * the appointment text and a single button to dismiss */ + now = indicator_datetime_service_get_localtime (self); + for (l=self->priv->upcoming_appointments; l!=NULL; l=l->next) + { + gchar * title; + const gchar * body; + const struct IndicatorDatetimeAppt * appt = l->data; + NotifyNotification * nn; + GError * error; + + if (!appointment_has_alarm_url (appt)) + continue; + + if (!datetimes_have_the_same_minute (now, appt->begin)) + continue; + + title = g_date_time_format (now, get_terse_time_format_string (now)); + body = appt->summary; + nn = notify_notification_new (title, body, ALARM_ICON_NAME); + + notify_notification_set_hint (nn, "x-canonical-snap-decisions", + g_variant_new_boolean(TRUE)); + notify_notification_set_hint (nn, "x-canonical-private-button-tint", + g_variant_new_boolean(TRUE)); + notify_notification_add_action (nn, "ok", _("OK"), + on_alarm_popup_ok_clicked, + g_strdup (appt->url), g_free); + //g_signal_connect (nn, "closed", G_CALLBACK(on_notification_closed), self); + + error = NULL; + notify_notification_show (nn, &error); + if (error != NULL) + { + g_warning ("Unable to show alarm '%s' popup: %s", body, error->message); + g_error_free (error); + dispatch_alarm_url (appt); + } + g_free (title); + } + g_date_time_unref (now); /* rebuild the alarm list asynchronously. when it's done, set_upcoming_appointments() will update the alarm timer */ -- cgit v1.2.3 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