diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/notifier.c | 12 |
4 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a22ab16..8f8a8e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,11 +68,11 @@ pkg_check_modules(SERVICE_DEPS REQUIRED include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml") - set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) - add_definitions ( -DHAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ) +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") + set (HAS_LOMIRI_ACCTSERVICE_SOUND ON) + add_definitions ( -DHAS_LOMIRI_ACCTSERVICE_SOUND ) else() - set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) + set (HAS_LOMIRI_ACCTSERVICE_SOUND OFF) endif() ## diff --git a/debian/control b/debian/control index 99ceccd..29be09f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: cmake, libayatana-common-dev (>= 0.9.1), libnotify-dev (>= 0.7.6), libglib2.0-dev (>= 2.36), - accountsservice-ubuntu-schemas | hello, + lomiri-common-schemas | hello, # for packaging debhelper (>= 10), dpkg-dev (>= 1.16.1.1), diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 499efb4..d50d065 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,11 +28,11 @@ add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-testing Dbus ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.power.Testing.xml) -if (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) +if (HAS_LOMIRI_ACCTSERVICE_SOUND) add_gdbus_codegen_with_namespace(SERVICE_GENERATED_SOURCES dbus-accounts-sound - com.ubuntu.touch + com.lomiri.touch Dbus - /usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml) + /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml) endif() # add the bin dir to our include path so the code can find the generated header files diff --git a/src/notifier.c b/src/notifier.c index 26a8ce7..4bd55c1 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -21,7 +21,7 @@ #include "datafiles.h" -#ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND #include "dbus-accounts-sound.h" #endif @@ -86,7 +86,7 @@ typedef struct gboolean actions_supported; GCancellable * cancellable; - #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS + #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND DbusAccountsServiceSound * accounts_service_sound_proxy; gboolean accounts_service_sound_proxy_pending; #endif @@ -147,7 +147,7 @@ get_battery_power_level (IndicatorPowerDevice * battery) **** Sounds ***/ -#ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND static void on_sound_proxy_ready (GObject * source_object G_GNUC_UNUSED, GAsyncResult * res, @@ -309,7 +309,7 @@ notification_show(IndicatorPowerNotifier * self) if (are_actions_supported(self)) { - #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS + #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND if (!silent_mode(self)) #endif { @@ -453,7 +453,7 @@ my_dispose (GObject * o) indicator_power_notifier_set_battery (self, NULL); g_clear_object (&p->dbus_battery); - #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS + #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND g_clear_object (&p->accounts_service_sound_proxy); #endif @@ -490,7 +490,7 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self) if (!instance_count++ && !notify_init(SERVICE_EXEC)) g_critical("Unable to initialize libnotify! Notifications might not be shown."); - #ifdef HAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS + #ifdef HAS_LOMIRI_ACCTSERVICE_SOUND p->accounts_service_sound_proxy_pending = TRUE; gchar* object_path = g_strdup_printf("/org/freedesktop/Accounts/User%lu", (gulong)getuid()); dbus_accounts_service_sound_proxy_new_for_bus( |