diff options
| author | Robert Tari <robert@tari.in> | 2021-02-03 11:53:43 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-02-03 11:53:43 +0100 |
| commit | b5decb84dff544564bcb4aeaaac35380fff80a31 (patch) | |
| tree | cf0d14b772b558c7bb5f5b4799bb93910521789e | |
| parent | de8f1a716f46687277e5b1a2f141d54fb25fd169 (diff) | |
| parent | 1dec0b1a97d4b5f218d0d97c3497a6dd69c6338d (diff) | |
| download | ayatana-indicator-datetime-b5decb84dff544564bcb4aeaaac35380fff80a31.tar.gz ayatana-indicator-datetime-b5decb84dff544564bcb4aeaaac35380fff80a31.tar.bz2 ayatana-indicator-datetime-b5decb84dff544564bcb4aeaaac35380fff80a31.zip | |
Merge branch 'sunweaver-pr/port-to-lomiri-url-dispatcher'
Attributes GH PR #22: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/22
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/actions-live.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa7bda5..6fd0239 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,9 +50,9 @@ pkg_check_modules (SERVICE_DEPS REQUIRED libaccounts-glib>=1.18) include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) -set(URL_DISPATCHER_1_REQUIRED_VERSION 1) +set(URL_DISPATCHER_REQUIRED_VERSION 0) pkg_check_modules(URLDISPATCHER - url-dispatcher-1>=${URL_DISPATCHER_1_REQUIRED_VERSION} + lomiri-url-dispatcher>=${URL_DISPATCHER_REQUIRED_VERSION} ) include_directories(${URLDISPATCHER_INCLUDE_DIRS}) diff --git a/debian/control b/debian/control index b33ee50..df4d39f 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: cmake, libical-dev (>= 1.0), libedataserver1.2-dev (>= 3.5), accountsservice-ubuntu-schemas | hello, - liburl-dispatcher1-dev | hello, + liblomiri-url-dispatcher-dev | hello, libproperties-cpp-dev, # for the test harness: libgtest-dev, diff --git a/src/actions-live.cpp b/src/actions-live.cpp index b6d9e8c..271d2f3 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -20,7 +20,7 @@ #include <datetime/actions-live.h> #ifdef HAS_URLDISPATCHER -#include <url-dispatcher.h> +#include <lomiri-url-dispatcher.h> #endif #include <glib.h> @@ -55,7 +55,7 @@ void LiveActions::dispatch_url(const std::string& url) { g_debug("Dispatching url '%s'", url.c_str()); #ifdef HAS_URLDISPATCHER - url_dispatch_send(url.c_str(), nullptr, nullptr); + lomiri_url_dispatch_send(url.c_str(), nullptr, nullptr); #else // FIXME: Deal with this, if we build without liburl-dispatcher... #endif |