diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2014-01-17 02:06:39 +0000 |
---|---|---|
committer | Tarmac <Unknown> | 2014-01-17 02:06:39 +0000 |
commit | 4a8f2d77ab357fe62db2a0577db4666e785c06bb (patch) | |
tree | 08a752a80cd4dc13629dac8435aadbe48985f8e4 /panel/datetime-prefs.c | |
parent | 2c8955bb8c4c2d6914255d914bf2460dfd2723d7 (diff) | |
parent | ad76159088202f6e4390843cfed6dd712b8e2544 (diff) | |
download | ayatana-indicator-datetime-4a8f2d77ab357fe62db2a0577db4666e785c06bb.tar.gz ayatana-indicator-datetime-4a8f2d77ab357fe62db2a0577db4666e785c06bb.tar.bz2 ayatana-indicator-datetime-4a8f2d77ab357fe62db2a0577db4666e785c06bb.zip |
Support both gnome-control-center and unity-control-center. Fixes: https://bugs.launchpad.net/bugs/1257505.
Approved by Charles Kerr, PS Jenkins bot.
Diffstat (limited to 'panel/datetime-prefs.c')
-rw-r--r-- | panel/datetime-prefs.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/panel/datetime-prefs.c b/panel/datetime-prefs.c index 55456ac..c1e70b1 100644 --- a/panel/datetime-prefs.c +++ b/panel/datetime-prefs.c @@ -33,7 +33,11 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <polkit/polkit.h> +#if USE_UNITY +#include <libunity-control-center/cc-panel.h> +#else #include <libgnome-control-center/cc-panel.h> +#endif #include <timezonemap/cc-timezone-map.h> #include <timezonemap/timezone-completion.h> @@ -42,7 +46,11 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "utils.h" #include "datetime-prefs-locations.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 INDICATOR_DATETIME_TYPE_PANEL indicator_datetime_panel_get_type() |