Merge branch 'tari01-pr/drop-lomiri-url-dispatcher'

Attributes GH PR #33: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/33

5 files changed, 18 insertions, 58 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e83d738..67aa92d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,14 +49,6 @@ pkg_check_modules(
 )
 include_directories(${PULSEAUDIO_INCLUDE_DIRS})
 
-set(URL_DISPATCHER_REQUIRED_VERSION 0)
-
-pkg_check_modules(
-  URLDISPATCHER
-  lomiri-url-dispatcher>=${URL_DISPATCHER_REQUIRED_VERSION}
-)
-include_directories(${URLDISPATCHER_INCLUDE_DIRS})
-
 pkg_check_modules(
   SOUNDSERVICE REQUIRED
   gee-0.8
diff --git a/debian/control b/debian/control
index 5af27e6..c7e5c0a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Build-Depends: debhelper (>= 9.0),
 #               libqtdbusmock1-dev (>= 0.3),
 #               libqtdbustest1-dev,
                liblomiri-api-dev (>= 0.1.1) | hello,
-               liblomiri-url-dispatcher-dev (>= 0.1) | hello,
                libpulse-dev (>= 5.0),
                libpulse-mainloop-glib0 (>= 0.9.18),
                libnotify-dev,
diff --git a/debian/copyright b/debian/copyright
index f3e7be7..512d131 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -177,7 +177,6 @@ Files: AUTHORS
  tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml
  tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml
  vapi/config.vapi
- vapi/url-dispatcher.vapi
 Copyright: 2010-2016, Canonical Ltd.
 License: GPL-3
 Comment:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7dae84a..c76f4f2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,11 +6,6 @@ set(HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.h")
 set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def")
 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 "lomiri-url-dispatcher")
-endif()
-
 if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml")
   set (VALA_DEFINE_UBUNTU_SOUND_SCHEMA "--define=HAS_UBUNTU_SOUND_SCHEMA")
 endif()
@@ -67,7 +62,6 @@ vala_init(ayatana-indicator-sound-service
     --vapidir=${CMAKE_SOURCE_DIR}/vapi/
     --vapidir=.
     --pkg=bus-watcher
-    ${VALA_DEFINE_URLDISPATCHER}
     ${VALA_DEFINE_UBUNTU_SOUND_SCHEMA}
     ${VALA_DEFINE_ACCTSERVICE_PRIVACY_SETTINGS}
     ${VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS}
@@ -89,43 +83,24 @@ vala_add(ayatana-indicator-sound-service
   DEPENDS
     notification
 )
-if(URLDISPATCHER_FOUND)
-    vala_add(ayatana-indicator-sound-service
-      service.vala
-      DEPENDS
-        sound-menu
-        volume-control
-        volume-control-pulse
-        notification
-        info-notification
-        volume-warning
-        options
-        options-gsettings
-        media-player
-        media-player-list
-        mpris2-interfaces
-        accounts-service-user
-        accounts-service-access
-    )
-else()
-    vala_add(ayatana-indicator-sound-service
-      service.vala
-      DEPENDS
-        sound-menu
-        volume-control
-        volume-control-pulse
-        notification
-        info-notification
-        volume-warning
-        options
-        options-gsettings
-        media-player
-        media-player-list
-        mpris2-interfaces
-        accounts-service-user
-        accounts-service-access
-    )
-endif()
+
+vala_add(ayatana-indicator-sound-service
+  service.vala
+  DEPENDS
+    sound-menu
+    volume-control
+    volume-control-pulse
+    notification
+    info-notification
+    volume-warning
+    options
+    options-gsettings
+    media-player
+    media-player-list
+    mpris2-interfaces
+    accounts-service-user
+    accounts-service-access
+)
 
 vala_add(ayatana-indicator-sound-service
   options.vala
@@ -305,7 +280,6 @@ add_library(
 target_link_libraries(
   indicator-sound-service-lib
   ${SOUNDSERVICE_LIBRARIES}
-  ${URLDISPATCHER_LIBRARIES}
   -lm
 )
 
diff --git a/src/service.vala b/src/service.vala
index 78c0f99..803e09f 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -193,9 +193,7 @@ public class IndicatorSound.Service: Object {
         { "root", null, null, "@a{sv} {}", null },
         { "scroll", activate_scroll_action, "i", null, null },
         { "desktop-settings", activate_desktop_settings, null, null, null },
-#if HAS_URLDISPATCHER
         { "phone-settings", activate_phone_settings, null, null, null },
-#endif
         { "indicator-shown", null, null, "@b false", null },
     };
 
@@ -273,11 +271,9 @@ public class IndicatorSound.Service: Object {
         }
     }
 
-#if HAS_URLDISPATCHER
     void activate_phone_settings (SimpleAction action, Variant? param) {
         AyatanaCommon.utils_open_url("settings:///system/sound");
     }
-#endif
 
     /* Returns a serialized version of @icon_name suited for the panel */
     static Variant serialize_themed_icon (string icon_name)