From 1eeda6d8b289cf9866a0a19eb8a0471ce8e1f345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust@mageia.org>
Date: Mon, 8 Jun 2020 21:35:48 +0200
Subject: Fix dbus APIs

---
 s2u.c    | 12 ++++++------
 s2u.conf |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/s2u.c b/s2u.c
index 5f99830..2254ede 100644
--- a/s2u.c
+++ b/s2u.c
@@ -116,10 +116,10 @@ filter_function (DBusConnection * connection,
 
     /* message, interface, method */
     if (dbus_message_is_signal (message,
-                     "com.mandriva.user",
+                     "org.mageia.user",
                      "message") &&
         strcmp (dbus_message_get_path (message),
-            "/com/mandriva/user") == 0) {
+            "/org/mageia/user") == 0) {
       gchar* args[] =
         {
           "/usr/bin/xauth",
@@ -139,7 +139,7 @@ filter_function (DBusConnection * connection,
 
       return DBUS_HANDLER_RESULT_HANDLED;
     } else if (dbus_message_is_signal (message,
-                     "com.mandriva.user",
+                     "org.mageia.user",
                      "updatemenu")) {
 
           g_print("s2u: updatemenu signal received.\n");
@@ -148,7 +148,7 @@ filter_function (DBusConnection * connection,
 
       return DBUS_HANDLER_RESULT_HANDLED;
     } else if (dbus_message_is_signal (message,
-                     "com.mandriva.user",
+                     "org.mageia.user",
                      "security_notification")) {
         /* msec */
         char *string;
@@ -170,7 +170,7 @@ filter_function (DBusConnection * connection,
         dbus_error_free(&error);
         return DBUS_HANDLER_RESULT_HANDLED;
     } else if (dbus_message_is_signal (message,
-                     "com.mandriva.user",
+                     "org.mageia.user",
                      "custom_notification")) {
         /* msec */
         char *string, *title;
@@ -211,7 +211,7 @@ service_dbus_init (void)
 
          dbus_bus_add_match (dbus_connection,
                              "type='signal',"
-                             "interface='com.mandriva.user'",
+                             "interface='org.mageia.user'",
                 NULL);
 
 
diff --git a/s2u.conf b/s2u.conf
index e78f430..905ea3c 100644
--- a/s2u.conf
+++ b/s2u.conf
@@ -7,11 +7,11 @@
 
   <!-- ../system.conf have denied everything, so we just punch some holes -->
   <policy user="root">
-    <allow send_interface="com.mandriva.user"/>
+    <allow send_interface="org.mageia.user"/>
   </policy>
 
    <policy context="default">
-     <deny send_interface="com.mandriva.user"/>
+     <deny send_interface="org.mageia.user"/>
   </policy>
 
 
-- 
cgit v1.2.1