Replace ual with url-dispatcher.

We don't really hneed ubuntu-app-launch here directly, as the API
provided by url-dispatcher gives us a way to query what app handles
the calendar URL, as the indicator is a trusted process. This removes
the extra dependency and simplifies building slightly.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/notifications.cpp b/src/notifications.cpp
index 49300d8..7098cfc 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -24,9 +24,8 @@
 #include <messaging-menu/messaging-menu-app.h>
 #include <messaging-menu/messaging-menu-message.h>
 
-#ifdef HAS_LOMIRIAPPLAUNCH
-#include <liblomiri-app-launch/lomiri-app-launch/appid.h>
-#include <liblomiri-app-launch/lomiri-app-launch/registry.h>
+#ifdef HAS_URLDISPATCHER
+#include <lomiri-url-dispatcher.h>
 #endif
 
 #include <uuid/uuid.h>
@@ -463,16 +462,17 @@ private:
 
     static std::string calendar_app_id()
     {
-        #ifdef HAS_LOMIRIAPPLAUNCH
-        auto registry = std::make_shared<lomiri::app_launch::Registry>();
-        auto app_id = lomiri::app_launch::AppID::discover(registry, "lomiri-calendar-app");
-
-        if (!app_id.empty())
+        #ifdef HAS_URLDISPATCHER
+        auto urls = g_strsplit("calendar://", ",", 0);
+        auto appids = lomiri_url_dispatch_url_appid(const_cast<const gchar**>(urls));
+        g_strfreev(urls);
+        std::string result;
+        if (appids != nullptr) {
             // Due the use of old API by messaging_menu we need append a extra ".desktop" to the app_id.
-            return std::string(app_id) + ".desktop";
-        else
-            return std::string();
-
+            result = std::string(appids[0]) + ".desktop";
+            g_strfreev(appids);
+        }
+        return result;
         #else
         return std::string();
         #endif