diff options
| author | Robert Tari <robert@tari.in> | 2021-02-03 07:32:52 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-02-03 07:32:52 +0100 |
| commit | 36aa18a1928de5459ef656261fe10501c6b0904a (patch) | |
| tree | 33409b3cec78b6ffdfca69ee65ea6dcbd1439293 | |
| parent | 240471b3afebaf5693d552dfc66d75dd24678288 (diff) | |
| parent | 70acec32119d53c81e46a88ab6b3c7896c1485a4 (diff) | |
| download | ayatana-indicator-session-36aa18a1928de5459ef656261fe10501c6b0904a.tar.gz ayatana-indicator-session-36aa18a1928de5459ef656261fe10501c6b0904a.tar.bz2 ayatana-indicator-session-36aa18a1928de5459ef656261fe10501c6b0904a.zip | |
Merge branch 'sunweaver-pr/port-to-lomiri-url-dispatcher'
Attributes GH PR #26: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/26
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/backend-dbus/actions.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f040d81..7202bb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,10 +28,10 @@ pkg_check_modules (SERVICE REQUIRED gio-unix-2.0>=2.36) include_directories (${SERVICE_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 4acd8ca..a6ef0c0 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: cmake, intltool, libglib2.0-dev (>= 2.36), libgtest-dev, - liburl-dispatcher1-dev | hello, + liblomiri-url-dispatcher-dev (>= 0.1) | hello, systemd [linux-any], Standards-Version: 4.1.1 Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-session diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index f1c2498..9d65202 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -21,7 +21,7 @@ #include <glib/gi18n.h> #ifdef HAS_URLDISPATCHER -# include <url-dispatcher.h> +# include <lomiri-url-dispatcher.h> #endif #include "dbus-end-session-dialog.h" @@ -783,7 +783,7 @@ my_bug (IndicatorSessionActions * self G_GNUC_UNUSED) #ifdef HAS_URLDISPATCHER if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send(bts_url, NULL, NULL); + lomiri_url_dispatch_send(bts_url, NULL, NULL); else #endif { @@ -1096,7 +1096,7 @@ my_settings (IndicatorSessionActions * self G_GNUC_UNUSED) { #ifdef HAS_URLDISPATCHER if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send("settings:///system", NULL, NULL); + lomiri_url_dispatch_send("settings:///system", NULL, NULL); else #endif if (have_unity_control_center ()) @@ -1118,7 +1118,7 @@ my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED) { #ifdef HAS_URLDISPATCHER if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send("settings:///system/online-accounts", NULL, NULL); + lomiri_url_dispatch_send("settings:///system/online-accounts", NULL, NULL); else #endif if (have_unity_control_center ()) @@ -1136,7 +1136,7 @@ my_about (IndicatorSessionActions * self G_GNUC_UNUSED) { #ifdef HAS_URLDISPATCHER if (g_getenv ("MIR_SOCKET") != NULL) - url_dispatch_send("settings:///system/about", NULL, NULL); + lomiri_url_dispatch_send("settings:///system/about", NULL, NULL); else #endif if (have_unity_control_center ()) |