From a0a8973de115d91f5318ec0bf3b5856e0aeda20f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 3 Feb 2021 10:47:19 +0100
Subject: Finalize incomplete switch to Lomiri URL Dispatcher.

---
 CMakeLists.txt                  | 2 +-
 src/desktop.vala                | 2 +-
 src/phone.vala                  | 2 +-
 vapi/lomiri-url-dispatcher.vapi | 9 +++++++++
 vapi/url-dispatcher.vapi        | 9 ---------
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 vapi/lomiri-url-dispatcher.vapi
 delete mode 100644 vapi/url-dispatcher.vapi

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f66c1..68b6078 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ pkg_check_modules(
 
 include_directories(${BLUETOOTHSERVICE_INCLUDE_DIRS})
 
-set(URL_DISPATCHER_REQUIRED_VERSION 0.1)
+set(URL_DISPATCHER_REQUIRED_VERSION 0)
 
 pkg_check_modules(
   URLDISPATCHER
diff --git a/src/desktop.vala b/src/desktop.vala
index cab782b..7102a21 100644
--- a/src/desktop.vala
+++ b/src/desktop.vala
@@ -244,7 +244,7 @@ class Desktop: Profile
 
         if (Environment.get_variable ("MIR_SOCKET") != null)
         {
-            UrlDispatch.send ("settings:///system/bluetooth");
+            LomiriUrlDispatch.send ("settings:///system/bluetooth");
 
             return;
         }
diff --git a/src/phone.vala b/src/phone.vala
index 5338fc2..3490768 100644
--- a/src/phone.vala
+++ b/src/phone.vala
@@ -65,7 +65,7 @@ class Phone: Profile
 
 #if HAS_URLDISPATCHER
 
-    UrlDispatch.send ("settings:///system/bluetooth");
+    LomiriUrlDispatch.send ("settings:///system/bluetooth");
 
 #endif
 
diff --git a/vapi/lomiri-url-dispatcher.vapi b/vapi/lomiri-url-dispatcher.vapi
new file mode 100644
index 0000000..9e9e925
--- /dev/null
+++ b/vapi/lomiri-url-dispatcher.vapi
@@ -0,0 +1,9 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "liblomiri-url-dispatcher/lomiri-url-dispatcher.h")]
+
+namespace LomiriUrlDispatch
+{
+  public delegate void DispatchCallback ();
+
+  [CCode (cname = "lomiri_url_dispatch_send")]
+  public static void send (string url, DispatchCallback? func = null);
+}
diff --git a/vapi/url-dispatcher.vapi b/vapi/url-dispatcher.vapi
deleted file mode 100644
index ed751ec..0000000
--- a/vapi/url-dispatcher.vapi
+++ /dev/null
@@ -1,9 +0,0 @@
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "liburl-dispatcher-1/url-dispatcher.h")]
-
-namespace UrlDispatch
-{
-  public delegate void DispatchCallback ();
-
-  [CCode (cname = "url_dispatch_send")]
-  public static void send (string url, DispatchCallback? func = null);
-}
-- 
cgit v1.2.3