diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-01-27 11:02:40 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-01-27 11:02:40 -0600 |
| commit | ef84548e3025184c4f631a23fceefb008dd6968b (patch) | |
| tree | 84d25ec1d82475d7b10a7ab0fe4531cfdca3709e /panel/datetime-prefs.c | |
| parent | f320760f20b282e9b2695477ab602d4041a3ada8 (diff) | |
| parent | ad76159088202f6e4390843cfed6dd712b8e2544 (diff) | |
| download | ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.tar.gz ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.tar.bz2 ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.zip | |
merge lp:~robert-ancell/indicator-datetime/unity-control-center2 into lp:indicator-datetime
Diffstat (limited to 'panel/datetime-prefs.c')
| -rw-r--r-- | panel/datetime-prefs.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/panel/datetime-prefs.c b/panel/datetime-prefs.c index 3e7fc3c..02536c7 100644 --- a/panel/datetime-prefs.c +++ b/panel/datetime-prefs.c @@ -32,7 +32,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <datetime/utils.h> #include <polkit/polkit.h> -#include <libgnome-control-center/cc-panel.h> #include <timezonemap/cc-timezone-map.h> #include <timezonemap/timezone-completion.h> @@ -40,12 +39,22 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> +#ifdef USE_UNITY + #include <libunity-control-center/cc-panel.h> +#else + #include <libgnome-control-center/cc-panel.h> +#endif + #include <stdlib.h> #include <libintl.h> #include <locale.h> #include <langinfo.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() |