Indicator Date and Time

Merge lp:~seb128/indicator-datetime/use-correct-gtkbuilder-location into lp:indicator-datetime/14.04

  1. use-correct-gtkbuilder-location
  2. Merge into trunk.14.04
Proposed by Sebastien Bacher
Status: Merged
Approved by: Charles Kerr
Approved revision: 297
Merged at revision: 297
Proposed branch: lp:~seb128/indicator-datetime/use-correct-gtkbuilder-location
Merge into: lp:indicator-datetime/14.04
Diff against target: 16 lines (+5/-1)
1 file modified
panel/datetime-prefs-locations.c (+5/-1)
To merge this branch: bzr merge lp:~seb128/indicator-datetime/use-correct-gtkbuilder-location
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+203817@code.launchpad.net

Commit message

Use the correct location for datetime-dialog.ui

Description of the change

Use the correct location for datetime-dialog.ui

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

(that change is similar to the one in bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.14.04/revision/293/panel/datetime-prefs.c

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/160/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/40/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/160/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
Revision history for this message
Charles Kerr (charlesk) wrote :

Thanks seb!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/datetime-prefs-locations.c'
2--- panel/datetime-prefs-locations.c 2013-10-30 23:49:58 +0000
3+++ panel/datetime-prefs-locations.c 2014-01-29 18:52:07 +0000
4@@ -34,7 +34,11 @@
5 #include "settings-shared.h"
6 #include "utils.h"
7
8-#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/datetime-dialog.ui"
9+#if USE_UNITY
10+#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/unity-control-center/datetime-dialog.ui"
11+#else
12+#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/gnome-control-center/datetime-dialog.ui"
13+#endif
14
15 #define COL_NAME 0
16 #define COL_TIME 1

Subscribers

People subscribed via source and target branches