From 997adcbfac7b345b2dd638b95fc7710178f3316f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 2 Feb 2021 20:27:50 +0100 Subject: Switch from URL Dispatcher to Lomiri URL Dispatcher. --- CMakeLists.txt | 4 ++-- src/backend-dbus/actions.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 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/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 #ifdef HAS_URLDISPATCHER -# include +# include #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 ()) -- cgit v1.2.3 From 117365b55e5a8d33ecdb1e4323c235a9d2afa087 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 2 Feb 2021 20:28:23 +0100 Subject: debian/control: Replace liburl-dispatcher1-dev by liblomiri-url-dispatcher-dev in B-D field. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 70acec32119d53c81e46a88ab6b3c7896c1485a4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 2 Feb 2021 22:30:28 +0100 Subject: tests/backend-dbus/CMakeLists.txt: Make sure gdbus-codegen commands (backend-dbus) have run before building the desktopmock tests. Fixes parallel build issues. --- tests/backend-dbus/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/backend-dbus/CMakeLists.txt b/tests/backend-dbus/CMakeLists.txt index 5750d9d..5ffdbd9 100644 --- a/tests/backend-dbus/CMakeLists.txt +++ b/tests/backend-dbus/CMakeLists.txt @@ -32,6 +32,8 @@ add_library (desktopmock STATIC mock-webcredentials.cc mock-webcredentials.h) +add_dependencies(desktopmock dbusbackend) + include_directories (${SERVICE_INCLUDE_DIRS}) include_directories (${CMAKE_SOURCE_DIR}/src) include_directories (${CMAKE_BINARY_DIR}/src) -- cgit v1.2.3