aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt17
-rw-r--r--src/accounts-service-privacy-settings.vala2
-rw-r--r--src/accounts-service-system-sound-settings.vala2
3 files changed, 11 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 486ba7e..ba64aa7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi")
if(URLDISPATCHER_FOUND)
set (VALA_DEFINE_URLDISPATCHER "--define=HAS_URLDISPATCHER")
- set (VALA_PKG_URLDISPATCHER "--pkg=url-dispatcher")
+ set (VALA_PKG_URLDISPATCHER "url-dispatcher")
endif()
if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml")
@@ -16,15 +16,19 @@ if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml")
endif()
if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml")
- set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS 1)
+ set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS ON)
set (VALA_FILE_ACCTSERVICE_PRIVACY_SETTINGS "accounts-service-privacy-settings")
set (VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS "--define=HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS")
+else()
+ set (HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS OFF)
endif()
if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml")
- set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS 1)
+ set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON)
set (VALA_FILE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "accounts-service-system-sound-settings")
set (VALA_DEFINE_ACCTSERVICE_SYSTEMSOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS")
+else()
+ set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF)
endif()
vapi_gen(accounts-service
@@ -49,6 +53,7 @@ vala_init(ayatana-indicator-sound-service
libpulse-mainloop-glib
libnotify
accounts-service
+ ${VALA_PKG_URLDISPATCHER}
OPTIONS
--ccode
--thread
@@ -56,7 +61,6 @@ vala_init(ayatana-indicator-sound-service
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
--vapidir=.
--pkg=bus-watcher
- ${VALA_PKG_URLDISPATCHER}
${VALA_DEFINE_URLDISPATCHER}
${VALA_DEFINE_UBUNTU_SOUND_SCHEMA}
${VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS}
@@ -234,13 +238,13 @@ vala_add(ayatana-indicator-sound-service
accounts-service-sound-settings.vala
)
-if(HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS)
+if(${HAVE_UT_ACCTSERVICE_PRIVACY_SETTINGS})
vala_add(ayatana-indicator-sound-service
accounts-service-system-sound-settings.vala
)
endif()
-if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
+if(${HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS})
vala_add(ayatana-indicator-sound-service
accounts-service-privacy-settings.vala
)
@@ -294,6 +298,7 @@ add_library(
target_link_libraries(
indicator-sound-service-lib
${SOUNDSERVICE_LIBRARIES}
+ ${URLDISPATCHER_LIBRARIES}
-lm
)
diff --git a/src/accounts-service-privacy-settings.vala b/src/accounts-service-privacy-settings.vala
index 3a311d0..1f5838c 100644
--- a/src/accounts-service-privacy-settings.vala
+++ b/src/accounts-service-privacy-settings.vala
@@ -17,11 +17,9 @@
* Ted Gould <ted@canonical.com>
*/
-#if HAS_UT_ACCTSERVICE_PRIVACY_SETTINGS
[DBus (name = "com.ubuntu.touch.AccountsService.SecurityPrivacy")]
public interface AccountsServicePrivacySettings : Object {
// properties
public abstract bool stats_welcome_screen {owned get; set;}
public abstract bool messages_welcome_screen {owned get; set;}
}
-#endif
diff --git a/src/accounts-service-system-sound-settings.vala b/src/accounts-service-system-sound-settings.vala
index d445c25..9eb91c4 100644
--- a/src/accounts-service-system-sound-settings.vala
+++ b/src/accounts-service-system-sound-settings.vala
@@ -17,10 +17,8 @@
* Ted Gould <ted@canonical.com>
*/
-#if HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
[DBus (name = "com.ubuntu.touch.AccountsService.Sound")]
public interface AccountsServiceSystemSoundSettings : Object {
// properties
public abstract bool silent_mode {owned get; set;}
}
-#endif