Indicator Date and Time

Merge lp:~flexiondotorg/indicator-datetime/mate-time-admin into lp:indicator-datetime

  1. mate-time-admin
  2. Merge into trunk.16.10
Proposed by Martin Wimpress 
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 500
Merged at revision: 500
Proposed branch: lp:~flexiondotorg/indicator-datetime/mate-time-admin
Merge into: lp:indicator-datetime
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
src/actions-live.cpp (+1/-1)
To merge this branch: bzr merge lp:~flexiondotorg/indicator-datetime/mate-time-admin
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+379329@code.launchpad.net

Description of the change

This merge proposal adds support for the MATE time admin capplet added in MATE Desktop 1.24.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

change looks fine

review: Approve

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 2020-02-17 14:09:46 +0000
3+++ debian/changelog 2020-02-17 14:34:54 +0000
4@@ -1,3 +1,9 @@
5+indicator-datetime (15.10+20.04.20200217-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Add support for MATE Time Admin.
8+
9+ -- Martin Wimpress <martin.wimpress@ubuntu.com> Mon, 17 Feb 2020 14:19:40 +0000
10+
11 indicator-datetime (15.10+19.10.20190819.1-0ubuntu1) eoan; urgency=medium
12
13 * engine-eds: Stop accidentally freeing an alarm trigger.
14
15=== modified file 'src/actions-live.cpp'
16--- src/actions-live.cpp 2019-05-18 06:48:53 +0000
17+++ src/actions-live.cpp 2020-02-17 14:34:54 +0000
18@@ -148,7 +148,7 @@
19 execute_command("unity-control-center datetime");
20 break;
21 case LiveActions::MATE:
22- execute_command("time-admin");
23+ execute_command("mate-time-admin");
24 break;
25 default:
26 execute_command("gnome-control-center datetime");

Subscribers

People subscribed via source and target branches