Merge lp:~renatofilho/indicator-datetime/new-event-icon into lp:indicator-datetime/15.10

Proposed by Renato Araujo Oliveira Filho on 2016-03-16
Status: Work in progress
Proposed branch: lp:~renatofilho/indicator-datetime/new-event-icon
Merge into: lp:indicator-datetime/15.10
Prerequisite: lp:~charlesk/indicator-datetime/lp-1440111-friendlier-calendar-items
Diff against target: 29 lines (+3/-3)
1 file modified
src/menu.cpp (+3/-3)
To merge this branch: bzr merge lp:~renatofilho/indicator-datetime/new-event-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2016-03-17
Indicator Applet Developers 2016-03-16 Pending
Review via email: mp+289230@code.launchpad.net

Commit message

Use a generic icon for events in the indicator.

Avoid to use the calendar app one because it contains the number '25' and it causes confusion with the real day of the event.

Unmerged revisions

443. By Renato Araujo Oliveira Filho on 2016-03-17

Trunk merged.

442. By Renato Araujo Oliveira Filho on 2016-03-16

Use a generic icon for events in the indicator.

Avoid to use the calendar app one because it contains the number '25' and it causes confusion with the real day of the event.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/menu.cpp'
2--- src/menu.cpp 2015-11-17 13:48:47 +0000
3+++ src/menu.cpp 2016-03-17 17:11:26 +0000
4@@ -63,7 +63,7 @@
5
6
7 #define ALARM_ICON_NAME "alarm-clock"
8-#define CALENDAR_ICON_NAME "calendar"
9+#define CALENDAR_ICON_NAME "appointment"
10
11 class MenuImpl: public Menu
12 {
13@@ -160,7 +160,7 @@
14 for(const auto& a : m_state->calendar_upcoming->appointments().get())
15 if (begin <= a.begin)
16 upcoming.push_back(a);
17-
18+
19 if (m_upcoming != upcoming)
20 {
21 m_upcoming.swap(upcoming);
22@@ -590,7 +590,7 @@
23 g_warn_if_reached();
24 break;
25 }
26-
27+
28 return menu;
29 }
30

Subscribers

People subscribed via source and target branches