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

Proposed by Marco A. Harrendorf on 2015-05-16
Status: Needs review
Proposed branch: lp:~marcokarlo/indicator-datetime/ubuntu14.10rtm
Merge into: lp:indicator-datetime/15.10
Diff against target: 121 lines (+59/-8) (has conflicts)
3 files modified
debian/changelog (+49/-2)
src/snap.cpp (+9/-0)
src/wakeup-timer-powerd.cpp (+1/-6)
Text conflict in debian/changelog
Text conflict in src/snap.cpp
To merge this branch: bzr merge lp:~marcokarlo/indicator-datetime/ubuntu14.10rtm
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2015-05-16 Pending
Review via email: mp+259315@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-05-15 16:41:41 +0000
3+++ debian/changelog 2015-05-16 16:30:00 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 indicator-datetime (13.10.0+15.10.20150515-0ubuntu1) wily; urgency=medium
7
8 [ Charles Kerr ]
9@@ -90,13 +91,59 @@
10 * Add support for x-canonical-alarm and x-canonical-disabled tags in
11 VTODO categories so that disabled alarms will not be displayed. (LP:
12 #1387231)
13+=======
14+indicator-datetime (13.10.0+15.04.20150318~rtm-0ubuntu1) 14.09; urgency=medium
15+
16+ [ Charles Kerr ]
17+ * Work around glib's type initialization deadlock. (LP: #1425297)
18+
19+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 18 Mar 2015 17:28:20 +0000
20+
21+indicator-datetime (13.10.0+15.04.20150226~rtm-0ubuntu1) 14.09; urgency=medium
22+
23+ [ Charles Kerr ]
24+ * Avoid ECANCELED errors in calls to timerfd_settime() (LP: #1424966)
25+
26+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 26 Feb 2015 05:29:29 +0000
27+
28+indicator-datetime (13.10.0+15.04.20150213~rtm-0ubuntu1) 14.09; urgency=medium
29+
30+ [ Charles Kerr ]
31+ * change the WallClock to detect time changes from
32+ TFD_TIMER_CANCEL_ON_SET, e.g. when ntp<-->manual is toggled
33+
34+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 13 Feb 2015 20:51:45 +0000
35+
36+indicator-datetime (13.10.0+15.04.20150122~rtm-0ubuntu1) 14.09; urgency=low
37+
38+ [ Charles Kerr ]
39+ * Don't play calendar alarm sounds if Silent Mode is enabled. Use the
40+ alarm sound role for both clock and calendar alarms. (LP: #1410874)
41+
42+ [ Ubuntu daily release ]
43+ * New rebuild forced
44+
45+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 22 Jan 2015 22:25:52 +0000
46+
47+indicator-datetime (13.10.0+15.04.20150115~rtm-0ubuntu1) 14.09; urgency=low
48+
49+ [ Charles Kerr ]
50+ * Fix bug that misidentified repeating alarms as one-time alarms,
51+ causing them to be disabled after triggering. (LP: #1411171)
52+
53+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 15 Jan 2015 20:57:21 +0000
54+
55+indicator-datetime (13.10.0+15.04.20141210~rtm-0ubuntu1) 14.09; urgency=low
56+
57+ [ Charles Kerr ]
58+>>>>>>> MERGE-SOURCE
59 * Change notifications for calendar events s.t. the sound is
60 nonrepeating and the notification is temporary, not requiring user
61- interaction to disappear. (LP: #1320880)
62+ interaction to disappear.
63 * After a one-time Ubuntu alarm's notification is displayed, disable
64 the alarm. (LP: #1362341)
65
66- -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 08 Dec 2014 23:09:20 +0000
67+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 10 Dec 2014 04:16:19 +0000
68
69 indicator-datetime (13.10.0+15.04.20141103-0ubuntu1) vivid; urgency=low
70
71
72=== modified file 'src/clock-live.cpp'
73=== modified file 'src/engine-eds.cpp'
74=== modified file 'src/main.cpp'
75=== modified file 'src/snap.cpp'
76--- src/snap.cpp 2015-04-08 23:48:24 +0000
77+++ src/snap.cpp 2015-05-16 16:30:00 +0000
78@@ -96,8 +96,13 @@
79 std::shared_ptr<uin::Sound> sound;
80 if (appointment.is_ubuntu_alarm() || !silent_mode()) {
81 // create the sound.
82+<<<<<<< TREE
83 const auto role = appointment.is_ubuntu_alarm() ? "alarm" : "alert";
84 const auto uri = get_alarm_uri(alarm, m_settings);
85+=======
86+ const auto role = appointment.is_ubuntu_alarm() ? "alarm" : "alert";
87+ const auto uri = get_alarm_uri(appointment, m_settings);
88+>>>>>>> MERGE-SOURCE
89 const auto volume = m_settings->alarm_volume.get();
90 const bool loop = interactive;
91 sound = std::make_shared<uin::Sound>(role, uri, volume, loop);
92@@ -139,6 +144,10 @@
93 b.add_action ("ok", _("OK"));
94 b.add_action ("snooze", _("Snooze"));
95 }
96+ // Show calendar notification in notification area
97+ else {
98+ b.add_hint (uin::Builder::HINT_SNAP);
99+ }
100
101 // add 'sound', 'haptic', and 'awake' objects to the capture so
102 // they stay alive until the closed callback is called; i.e.,
103
104=== modified file 'src/wakeup-timer-powerd.cpp'
105--- src/wakeup-timer-powerd.cpp 2014-11-04 18:27:27 +0000
106+++ src/wakeup-timer-powerd.cpp 2015-05-16 16:30:00 +0000
107@@ -192,13 +192,8 @@
108 ret = g_dbus_connection_call_finish(G_DBUS_CONNECTION(o), res, &error);
109 if (ret == nullptr)
110 {
111- /* powerd isn't on the desktop, but we don't need hardware wakeups there
112- anyway... so no need to warn on SERVICE_UNKNOWN */
113- if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
114- !g_error_matches(error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
115- {
116+ if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
117 g_warning("%s Could not set hardware wakeup: %s", G_STRLOC, error->message);
118- }
119 }
120 else
121 {

Subscribers

People subscribed via source and target branches