aboutsummaryrefslogtreecommitdiff
path: root/panel
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:02:40 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:02:40 -0600
commitef84548e3025184c4f631a23fceefb008dd6968b (patch)
tree84d25ec1d82475d7b10a7ab0fe4531cfdca3709e /panel
parentf320760f20b282e9b2695477ab602d4041a3ada8 (diff)
parentad76159088202f6e4390843cfed6dd712b8e2544 (diff)
downloadayatana-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')
-rw-r--r--panel/CMakeLists.txt27
-rw-r--r--panel/datetime-prefs.c13
2 files changed, 11 insertions, 29 deletions
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
deleted file mode 100644
index c165326..0000000
--- a/panel/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-set (PANEL_LIB "indicator-datetime")
-
-add_definitions (-DPKGDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}")
-
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS}")
-
-add_library (${PANEL_LIB} SHARED
- datetime-prefs.c
- datetime-prefs-locations.c
- datetime-prefs-locations.h
- ${CMAKE_SOURCE_DIR}/src/utils.cpp
- ${CMAKE_SOURCE_DIR}/include/datetime/utils.h
- ${CMAKE_SOURCE_DIR}/include/datetime/settings-shared.h)
-
-include_directories (${PANEL_DEPS_INCLUDE_DIRS})
-
-link_directories (${PANEL_DEPS_LIBRARY_DIRS})
-
-set_property (TARGET ${PANEL_LIB}
- APPEND_STRING PROPERTY COMPILE_FLAGS
- " -g ${CC_WARNING_ARGS} ${GCOV_FLAGS}")
-
-target_link_libraries (${PANEL_LIB} ${PANEL_DEPS_LIBRARIES} ${GCOV_LIBS})
-
-install (TARGETS ${PANEL_LIB}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/control-center-1/panels)
-
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()