diff options
| author | Robert Tari <robert@tari.in> | 2021-02-03 11:43:35 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-02-03 11:43:35 +0100 |
| commit | 5df954783b063b882770fd52d500c62279748c72 (patch) | |
| tree | 48d58597577d0e6ece2f38423a11ecd50b46aff3 | |
| parent | 63f44d02e8668290da60934f635b35abae4711dd (diff) | |
| parent | 73877ac5a32a709affffb69c87f924207d9b0dcc (diff) | |
| download | ayatana-indicator-power-5df954783b063b882770fd52d500c62279748c72.tar.gz ayatana-indicator-power-5df954783b063b882770fd52d500c62279748c72.tar.bz2 ayatana-indicator-power-5df954783b063b882770fd52d500c62279748c72.zip | |
Merge branch 'sunweaver-pr/port-to-lomiri-url-dispatcher'
Attributes GH PR #19: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/19
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/utils.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7c62c7..b78a69e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,10 +40,10 @@ pkg_check_modules(SERVICE_DEPS REQUIRED 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 87be803..084acc1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: cmake, lcov, libnotify-dev (>= 0.7.6), libglib2.0-dev (>= 2.36), - liburl-dispatcher1-dev | hello, + liblomiri-url-dispatcher-dev | hello, # for packaging debhelper (>= 9), dpkg-dev (>= 1.16.1.1), diff --git a/src/utils.c b/src/utils.c index 96a9b1b..82c5cf7 100644 --- a/src/utils.c +++ b/src/utils.c @@ -22,7 +22,7 @@ #include "utils.h" #ifdef HAS_URLDISPATCHER -# include <url-dispatcher.h> +# include <lomiri-url-dispatcher.h> #endif /* Run a particular program based on an activation */ @@ -96,7 +96,7 @@ utils_handle_settings_request (void) #ifdef HAS_URLDISPATCHER if (g_getenv ("MIR_SOCKET") != NULL) { - url_dispatch_send("settings:///system/battery", NULL, NULL); + lomiri_url_dispatch_send("settings:///system/battery", NULL, NULL); return; } else |