From 72bb408f48b7c63a04ddbf2de53a53abd54df2b9 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Fri, 17 Jul 2020 10:43:40 +0100
Subject: [PATCH] systray - make notes of the freedekstop.org version of
 protocol

there is an FDO version of this. it seems it's not widely supported
but the org.kde is. at some point we probbably have to move over but
for now there isn't a need, but make note of this and have DOMAIN able
to switch in a heartbeat if we want to.
---
 src/modules/systray/e_mod_notifier_host.c         | 6 +++---
 src/modules/systray/e_mod_notifier_host_dbus.c    | 6 +++---
 src/modules/systray/e_mod_notifier_host_private.h | 5 +++++
 src/modules/systray/e_mod_notifier_watcher.c      | 6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c
index ca3c3b646..7d4b9fce4 100644
--- a/src/modules/systray/e_mod_notifier_host.c
+++ b/src/modules/systray/e_mod_notifier_host.c
@@ -1,10 +1,10 @@
 #include "e_mod_notifier_host_private.h"
 
-#define WATCHER_BUS "org.kde.StatusNotifierWatcher"
+#define WATCHER_BUS DOMAIN".StatusNotifierWatcher"
 #define WATCHER_PATH "/StatusNotifierWatcher"
-#define WATCHER_IFACE "org.kde.StatusNotifierWatcher"
+#define WATCHER_IFACE DOMAIN".StatusNotifierWatcher"
 
-#define ITEM_IFACE "org.kde.StatusNotifierItem"
+#define ITEM_IFACE DOMAIN".StatusNotifierItem"
 
 const char *Category_Names[] = {
    "unknown", "SystemServices", NULL
diff --git a/src/modules/systray/e_mod_notifier_host_dbus.c b/src/modules/systray/e_mod_notifier_host_dbus.c
index 79b2fd121..6efbed9a1 100644
--- a/src/modules/systray/e_mod_notifier_host_dbus.c
+++ b/src/modules/systray/e_mod_notifier_host_dbus.c
@@ -1,10 +1,10 @@
 #include "e_mod_notifier_host_private.h"
 
-#define WATCHER_BUS "org.kde.StatusNotifierWatcher"
+#define WATCHER_BUS DOMAIN".StatusNotifierWatcher"
 #define WATCHER_PATH "/StatusNotifierWatcher"
-#define WATCHER_IFACE "org.kde.StatusNotifierWatcher"
+#define WATCHER_IFACE DOMAIN".StatusNotifierWatcher"
 
-#define ITEM_IFACE "org.kde.StatusNotifierItem"
+#define ITEM_IFACE DOMAIN".StatusNotifierItem"
 
 #define HOST_REGISTRER "/bla" //TODO check what watcher expect we send to him
 
diff --git a/src/modules/systray/e_mod_notifier_host_private.h b/src/modules/systray/e_mod_notifier_host_private.h
index a7e2ea8d8..1a1904d52 100644
--- a/src/modules/systray/e_mod_notifier_host_private.h
+++ b/src/modules/systray/e_mod_notifier_host_private.h
@@ -1,5 +1,10 @@
 #include "e_mod_main.h"
 
+// eventually we need to support this too...
+// https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem
+//#define DOMAIN "org.freedesktop"
+#define DOMAIN "org.kde"
+
 typedef enum {
    CATEGORY_UNKNOWN = 0,
    CATEGORY_SYSTEM_SERVICES,
diff --git a/src/modules/systray/e_mod_notifier_watcher.c b/src/modules/systray/e_mod_notifier_watcher.c
index 56beeb021..22189a038 100644
--- a/src/modules/systray/e_mod_notifier_watcher.c
+++ b/src/modules/systray/e_mod_notifier_watcher.c
@@ -1,11 +1,11 @@
 #include "e_mod_notifier_host_private.h"
 
 #define PATH "/StatusNotifierWatcher"
-#define IFACE "org.kde.StatusNotifierWatcher"
+#define IFACE DOMAIN".StatusNotifierWatcher"
 #define PROTOCOL_VERSION 1
 
-#define ERROR_HOST_ALREADY_REGISTERED "org.kde.StatusNotifierWatcher.Host.AlreadyRegistered"
-#define ERROR_ITEM_ALREADY_REGISTERED "org.kde.StatusNotifierWatcher.Item.AlreadyRegistered"
+#define ERROR_HOST_ALREADY_REGISTERED DOMAIN".StatusNotifierWatcher.Host.AlreadyRegistered"
+#define ERROR_ITEM_ALREADY_REGISTERED DOMAIN".StatusNotifierWatcher.Item.AlreadyRegistered"
 
 static Eldbus_Connection *conn = NULL;
 static Eldbus_Service_Interface *iface = NULL;