diff options
| author | Robert Tari <robert@tari.in> | 2021-02-03 11:47:38 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-02-03 11:47:38 +0100 |
| commit | 697f09a14532b503d7d3ef3053ac2d7ce848e82d (patch) | |
| tree | 89f1c48d1966a1de86063c53d8ae677b872f607b | |
| parent | 8d6ed865df14b732a9be38b37322c3e82416849b (diff) | |
| parent | a0a8973de115d91f5318ec0bf3b5856e0aeda20f (diff) | |
| download | ayatana-indicator-bluetooth-697f09a14532b503d7d3ef3053ac2d7ce848e82d.tar.gz ayatana-indicator-bluetooth-697f09a14532b503d7d3ef3053ac2d7ce848e82d.tar.bz2 ayatana-indicator-bluetooth-697f09a14532b503d7d3ef3053ac2d7ce848e82d.zip | |
Merge branch 'sunweaver-pr/finalize-lomiri-url-dispatcher-port'
Attributes GH PR #20: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/pull/20
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/desktop.vala | 2 | ||||
| -rw-r--r-- | src/phone.vala | 2 | ||||
| -rw-r--r-- | vapi/lomiri-url-dispatcher.vapi (renamed from vapi/url-dispatcher.vapi) | 6 |
4 files changed, 6 insertions, 6 deletions
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/url-dispatcher.vapi b/vapi/lomiri-url-dispatcher.vapi index ed751ec..9e9e925 100644 --- a/vapi/url-dispatcher.vapi +++ b/vapi/lomiri-url-dispatcher.vapi @@ -1,9 +1,9 @@ -[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "liburl-dispatcher-1/url-dispatcher.h")] +[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "liblomiri-url-dispatcher/lomiri-url-dispatcher.h")] -namespace UrlDispatch +namespace LomiriUrlDispatch { public delegate void DispatchCallback (); - [CCode (cname = "url_dispatch_send")] + [CCode (cname = "lomiri_url_dispatch_send")] public static void send (string url, DispatchCallback? func = null); } |