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

[Sebastien Bacher]

Use the correct location for datetime-dialog.ui

Use the correct location for datetime-dialog.ui

[Sebastien Bacher (seb128)]

(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

[PS Jenkins bot (ps-jenkins)]

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)

[Charles Kerr (charlesk)]

review: Approve

[Charles Kerr (charlesk)]

Thanks seb!

=== modified file 'panel/datetime-prefs-locations.c'
--- panel/datetime-prefs-locations.c	2013-10-30 23:49:58 +0000
+++ panel/datetime-prefs-locations.c	2014-01-29 18:52:07 +0000
@@ -34,7 +34,11 @@
 #include "settings-shared.h"
 #include "utils.h"
 
-#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/datetime-dialog.ui"
+#if USE_UNITY
+#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/unity-control-center/datetime-dialog.ui"
+#else
+#define DATETIME_DIALOG_UI_FILE PKGDATADIR "/gnome-control-center/datetime-dialog.ui"
+#endif
 
 #define COL_NAME         0
 #define COL_TIME         1