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 | |
| 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')
| -rw-r--r-- | panel/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | panel/datetime-prefs.c | 10 |
2 files changed, 9 insertions, 26 deletions
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt deleted file mode 100644 index b3fcc7b..0000000 --- a/panel/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -set (PANEL_LIB "indicator-datetime") - -add_definitions (-DPKGDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}") - -add_library (${PANEL_LIB} SHARED - datetime-prefs.c - datetime-prefs-locations.c - datetime-prefs-locations.h - ${CMAKE_SOURCE_DIR}/src/utils.c - ${CMAKE_SOURCE_DIR}/src/utils.h - ${CMAKE_SOURCE_DIR}/src/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 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() |