Merge lp:~marcokarlo/indicator-datetime/ubuntu14.10rtm into lp:indicator-datetime/15.10

[Marco A. Harrendorf]

Up to now a short notification for calendar reminders is only shown.
It is important that the notification is also shown in the notification area, so that one can have a look on missed reminders.

Unmerged revisions

401. By Marco A. Harrendorf on 2015-05-16

Snap.cc: Show notifications for calendar entry if missed

400. By CI Train Bot Account on 2015-03-18

Releasing 13.10.0+15.04.20150318~rtm-0ubuntu1

399. By Charles Kerr on 2015-03-18

Work around glib's type initialization deadlock.

https://bugzilla.gnome.org/show_bug.cgi?id=674885 Fixes: #1425297
Approved by: Ted Gould

398. By CI Train Bot Account on 2015-02-26

Releasing 13.10.0+15.04.20150226~rtm-0ubuntu1

397. By Charles Kerr on 2015-02-26

Avoid ECANCELED errors in calls to timerfd_settime() Fixes: #1424966
Approved by: Ted Gould

396. By CI Train Bot Account on 2015-02-13

Releasing 13.10.0+15.04.20150213~rtm-0ubuntu1

395. By Charles Kerr on 2015-02-13

change the WallClock to detect time changes from TFD_TIMER_CANCEL_ON_SET, e.g. when ntp<-->manual is toggled
Approved by: Ted Gould

394. By CI Train Bot Account on 2015-01-22

Releasing 13.10.0+15.04.20150122~rtm-0ubuntu1

393. By Charles Kerr on 2015-01-22

Don't play calendar alarm sounds if Silent Mode is enabled. Use the alarm sound role for both clock and calendar alarms. Fixes: #1410874
Approved by: Antti Kaijanmäki

392. By CI Train Bot Account on 2015-01-15

Releasing 13.10.0+15.04.20150115~rtm-0ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-15 16:41:41 +0000
+++ debian/changelog	2015-05-16 16:30:00 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 indicator-datetime (13.10.0+15.10.20150515-0ubuntu1) wily; urgency=medium
 
   [ Charles Kerr ]
@@ -90,13 +91,59 @@
   * Add support for x-canonical-alarm and x-canonical-disabled tags in
     VTODO categories so that disabled alarms will not be displayed. (LP:
     #1387231)
+=======
+indicator-datetime (13.10.0+15.04.20150318~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Charles Kerr ]
+  * Work around glib's type initialization deadlock. (LP: #1425297)
+
+ -- CI Train Bot <[e-mail]>  Wed, 18 Mar 2015 17:28:20 +0000
+
+indicator-datetime (13.10.0+15.04.20150226~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Charles Kerr ]
+  * Avoid ECANCELED errors in calls to timerfd_settime() (LP: #1424966)
+
+ -- CI Train Bot <[e-mail]>  Thu, 26 Feb 2015 05:29:29 +0000
+
+indicator-datetime (13.10.0+15.04.20150213~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Charles Kerr ]
+  * change the WallClock to detect time changes from
+    TFD_TIMER_CANCEL_ON_SET, e.g. when ntp<-->manual is toggled
+
+ -- CI Train Bot <[e-mail]>  Fri, 13 Feb 2015 20:51:45 +0000
+
+indicator-datetime (13.10.0+15.04.20150122~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Charles Kerr ]
+  * Don't play calendar alarm sounds if Silent Mode is enabled. Use the
+    alarm sound role for both clock and calendar alarms. (LP: #1410874)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 22 Jan 2015 22:25:52 +0000
+
+indicator-datetime (13.10.0+15.04.20150115~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Charles Kerr ]
+  * Fix bug that misidentified repeating alarms as one-time alarms,
+    causing them to be disabled after triggering. (LP: #1411171)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 15 Jan 2015 20:57:21 +0000
+
+indicator-datetime (13.10.0+15.04.20141210~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Charles Kerr ]
+>>>>>>> MERGE-SOURCE
   * Change notifications for calendar events s.t. the sound is
     nonrepeating and the notification is temporary, not requiring user
-    interaction to disappear. (LP: #1320880)
+    interaction to disappear.
   * After a one-time Ubuntu alarm's notification is displayed, disable
     the alarm. (LP: #1362341)
 
- -- Ubuntu daily release <[e-mail]>  Mon, 08 Dec 2014 23:09:20 +0000
+ -- Ubuntu daily release <[e-mail]>  Wed, 10 Dec 2014 04:16:19 +0000
 
 indicator-datetime (13.10.0+15.04.20141103-0ubuntu1) vivid; urgency=low
 
 
=== modified file 'src/clock-live.cpp'
=== modified file 'src/engine-eds.cpp'
=== modified file 'src/main.cpp'
=== modified file 'src/snap.cpp'
--- src/snap.cpp	2015-04-08 23:48:24 +0000
+++ src/snap.cpp	2015-05-16 16:30:00 +0000
@@ -96,8 +96,13 @@
         std::shared_ptr<uin::Sound> sound;
         if (appointment.is_ubuntu_alarm() || !silent_mode()) {
             // create the sound.
+<<<<<<< TREE
             const auto role = appointment.is_ubuntu_alarm() ? "alarm" : "alert";
             const auto uri = get_alarm_uri(alarm, m_settings);
+=======
+            const auto role = appointment.is_ubuntu_alarm() ? "alarm" : "alert";
+            const auto uri = get_alarm_uri(appointment, m_settings);
+>>>>>>> MERGE-SOURCE
             const auto volume = m_settings->alarm_volume.get();
             const bool loop = interactive;
             sound = std::make_shared<uin::Sound>(role, uri, volume, loop);
@@ -139,6 +144,10 @@
             b.add_action ("ok", _("OK"));
             b.add_action ("snooze", _("Snooze"));
         }
+        // Show calendar notification in notification area
+        else {
+            b.add_hint (uin::Builder::HINT_SNAP);
+        }
 
         // add 'sound', 'haptic', and 'awake' objects to the capture so
         // they stay alive until the closed callback is called; i.e.,
 
=== modified file 'src/wakeup-timer-powerd.cpp'
--- src/wakeup-timer-powerd.cpp	2014-11-04 18:27:27 +0000
+++ src/wakeup-timer-powerd.cpp	2015-05-16 16:30:00 +0000
@@ -192,13 +192,8 @@
         ret = g_dbus_connection_call_finish(G_DBUS_CONNECTION(o), res, &error);
         if (ret == nullptr)
         {
-            /* powerd isn't on the desktop, but we don't need hardware wakeups there
-               anyway... so no need to warn on SERVICE_UNKNOWN */
-            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
-                !g_error_matches(error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
-            {
+            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
                 g_warning("%s Could not set hardware wakeup: %s", G_STRLOC, error->message);
-            }
         }
         else
         {