diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-02-19 09:35:51 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-02-19 09:35:51 -0600 |
| commit | 29ca2a552d7a7dcb6487c27ae4d036608aa68320 (patch) | |
| tree | ae60e379a905cc017bc323e79cdc62d2d37c1177 /src | |
| parent | bf68bbe34cf8a8769345d1f36cc09cdc5d0ae07c (diff) | |
| parent | 372b0a77f8840a35bb131ecf507313056170c403 (diff) | |
| download | ayatana-indicator-datetime-29ca2a552d7a7dcb6487c27ae4d036608aa68320.tar.gz ayatana-indicator-datetime-29ca2a552d7a7dcb6487c27ae4d036608aa68320.tar.bz2 ayatana-indicator-datetime-29ca2a552d7a7dcb6487c27ae4d036608aa68320.zip | |
sync with trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/actions-live.cpp | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fdf3e5e..7b1d7df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,11 +7,6 @@ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS} ${GCO add_definitions (-DTIMEZONE_FILE="/etc/timezone" -DG_LOG_DOMAIN="Indicator-Datetime") -# let service know how to launch gnome-control-center on the desktop -if (BUILD_PANEL) - add_definitions (-DHAVE_CCPANEL) -endif () - add_library (${SERVICE_LIB} STATIC actions.cpp actions-live.cpp diff --git a/src/actions-live.cpp b/src/actions-live.cpp index 32d41ad..ccc7fcf 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -68,11 +68,7 @@ void LiveActions::open_desktop_settings() } else { -#ifdef HAVE_CCPANEL - execute_command("gnome-control-center indicator-datetime"); -#else execute_command("gnome-control-center datetime"); -#endif } g_free (path); |