From 666f701fb14d68f05756138b3274c286bf637bb9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 14 Jun 2024 21:36:48 +0000
Subject: Switch from com.canonical.indicators.webcredentials D-Bus service to
 new com.lomiri.indicators.webcredentials.

---
 src/backend-dbus/CMakeLists.txt                    |  4 +-
 src/backend-dbus/actions.c                         |  4 +-
 .../com.lomiri.indicators.webcredentials.xml       | 82 ++++++++++++++++++++++
 .../org.ayatana.indicators.webcredentials.xml      | 82 ----------------------
 tests/backend-dbus/mock-webcredentials.cc          |  4 +-
 5 files changed, 88 insertions(+), 88 deletions(-)
 create mode 100644 src/backend-dbus/com.lomiri.indicators.webcredentials.xml
 delete mode 100644 src/backend-dbus/org.ayatana.indicators.webcredentials.xml

diff --git a/src/backend-dbus/CMakeLists.txt b/src/backend-dbus/CMakeLists.txt
index bd87e27..d98a2ae 100644
--- a/src/backend-dbus/CMakeLists.txt
+++ b/src/backend-dbus/CMakeLists.txt
@@ -8,8 +8,8 @@ add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-display-manager
                    ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.DisplayManager.Seat.xml)
 
 add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-webcredentials
-                   org.ayatana.indicators
-                   ${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicators.webcredentials.xml)
+                   com.lomiri.indicators
+                   ${CMAKE_CURRENT_SOURCE_DIR}/com.lomiri.indicators.webcredentials.xml)
 
 add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-accounts
                    org.freedesktop
diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
index 331c1bf..e154ed7 100644
--- a/src/backend-dbus/actions.c
+++ b/src/backend-dbus/actions.c
@@ -1169,8 +1169,8 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self)
 
   webcredentials_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                     G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-                                    "org.ayatana.indicators.webcredentials",
-                                    "/org/ayatana/indicators/webcredentials",
+                                    "com.lomiri.indicators.webcredentials",
+                                    "/com/lomiri/indicators/webcredentials",
                                     p->cancellable,
                                     on_webcredentials_proxy_ready,
                                     self);
diff --git a/src/backend-dbus/com.lomiri.indicators.webcredentials.xml b/src/backend-dbus/com.lomiri.indicators.webcredentials.xml
new file mode 100644
index 0000000..77861ed
--- /dev/null
+++ b/src/backend-dbus/com.lomiri.indicators.webcredentials.xml
@@ -0,0 +1,82 @@
+<node>
+<!--
+  com.lomiri.indicators.webcredentials:
+  @short_description: interface for handling login failures.
+
+  The service implementing this interface keeps track of login failures.
+  Failures are reported (usually by signon-ui) using the ReportFailure method,
+  are listed in the Failures property and can be removed by calling
+  RemoveFailures.
+
+  The ClearErrorStatus method can be called to clear the error indicator from
+  the system user menu.
+-->
+<interface name="com.lomiri.indicators.webcredentials">
+  <!--
+    ReportFailure:
+    @account-id: the libaccounts ID of the account which failed to login.
+    @notification: dictionary of parameters for the OSD notification.
+
+    Inform the service about a failing account. The @account-id is added to the
+    list of the accounts in the Failures property, and a notification might be
+    displayed to the user.
+
+    The parameters currently recognized for the @notification argument are:
+    - DisplayName: string, description of the account (usually it's the
+      username)
+  -->
+  <method name="ReportFailure">
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+    <arg name="account_id" type="u" direction="in"/>
+    <arg name="notification" type="a{sv}" direction="in"/>
+  </method>
+
+  <!--
+    RemoveFailures:
+    @account-ids: the libaccounts IDs of the accounts.
+
+    Remove the given account IDs from the list of the failed accounts.
+  -->
+  <method name="RemoveFailures">
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSet&lt;uint>"/>
+    <arg name="account_ids" type="au" direction="in"/>
+  </method>
+
+  <!--
+    ReauthenticateAccount:
+    @account-id: the libaccounts ID of the account.
+    @extra-parameters: dictionary of extra parameters (typically used to
+    specify a XWindowID).
+    @reauthenticated: %TRUE if the account could be reauthenticated and the
+    failure status has been cleared, %FALSE otherwise.
+
+    Tries to replay the failed authentications on the account. If all of them
+    succeed, then the account failure is cleared.
+  -->
+  <method name="ReauthenticateAccount">
+    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+    <arg name="account_id" type="u" direction="in"/>
+    <arg name="extra_parameters" type="a{sv}" direction="in"/>
+    <arg name="reauthenticated" type="b" direction="out"/>
+  </method>
+
+  <!--
+    ClearErrorStatus:
+
+    Unsets the error indicator (if any) from the system user menu.
+  -->
+  <method name="ClearErrorStatus"/>
+
+  <!--
+    Failures: list of the libaccounts IDs of the failing accounts.
+  -->
+  <property name="Failures" type="au" access="read">
+    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSet&lt;uint>"/>
+  </property>
+
+  <!--
+    ErrorStatus: true if the indicator should display an error status.
+  -->
+  <property name="ErrorStatus" type="b" access="read"/>
+</interface>
+</node>
diff --git a/src/backend-dbus/org.ayatana.indicators.webcredentials.xml b/src/backend-dbus/org.ayatana.indicators.webcredentials.xml
deleted file mode 100644
index d7c46b0..0000000
--- a/src/backend-dbus/org.ayatana.indicators.webcredentials.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<node>
-<!--
-  org.ayatana.indicators.webcredentials:
-  @short_description: interface for handling login failures.
-
-  The service implementing this interface keeps track of login failures.
-  Failures are reported (usually by signon-ui) using the ReportFailure method,
-  are listed in the Failures property and can be removed by calling
-  RemoveFailures.
-
-  The ClearErrorStatus method can be called to clear the error indicator from
-  the system user menu.
--->
-<interface name="org.ayatana.indicators.webcredentials">
-  <!--
-    ReportFailure:
-    @account-id: the libaccounts ID of the account which failed to login.
-    @notification: dictionary of parameters for the OSD notification.
-
-    Inform the service about a failing account. The @account-id is added to the
-    list of the accounts in the Failures property, and a notification might be
-    displayed to the user.
-
-    The parameters currently recognized for the @notification argument are:
-    - DisplayName: string, description of the account (usually it's the
-      username)
-  -->
-  <method name="ReportFailure">
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-    <arg name="account_id" type="u" direction="in"/>
-    <arg name="notification" type="a{sv}" direction="in"/>
-  </method>
-
-  <!--
-    RemoveFailures:
-    @account-ids: the libaccounts IDs of the accounts.
-
-    Remove the given account IDs from the list of the failed accounts.
-  -->
-  <method name="RemoveFailures">
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSet&lt;uint>"/>
-    <arg name="account_ids" type="au" direction="in"/>
-  </method>
-
-  <!--
-    ReauthenticateAccount:
-    @account-id: the libaccounts ID of the account.
-    @extra-parameters: dictionary of extra parameters (typically used to
-    specify a XWindowID).
-    @reauthenticated: %TRUE if the account could be reauthenticated and the
-    failure status has been cleared, %FALSE otherwise.
-
-    Tries to replay the failed authentications on the account. If all of them
-    succeed, then the account failure is cleared.
-  -->
-  <method name="ReauthenticateAccount">
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-    <arg name="account_id" type="u" direction="in"/>
-    <arg name="extra_parameters" type="a{sv}" direction="in"/>
-    <arg name="reauthenticated" type="b" direction="out"/>
-  </method>
-
-  <!--
-    ClearErrorStatus:
-
-    Unsets the error indicator (if any) from the system user menu.
-  -->
-  <method name="ClearErrorStatus"/>
-
-  <!--
-    Failures: list of the libaccounts IDs of the failing accounts.
-  -->
-  <property name="Failures" type="au" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSet&lt;uint>"/>
-  </property>
-
-  <!--
-    ErrorStatus: true if the indicator should display an error status.
-  -->
-  <property name="ErrorStatus" type="b" access="read"/>
-</interface>
-</node>
diff --git a/tests/backend-dbus/mock-webcredentials.cc b/tests/backend-dbus/mock-webcredentials.cc
index 6406fc1..7886dcf 100644
--- a/tests/backend-dbus/mock-webcredentials.cc
+++ b/tests/backend-dbus/mock-webcredentials.cc
@@ -21,8 +21,8 @@
 
 namespace
 {
-  const char * const MY_NAME = "org.ayatana.indicators.webcredentials";
-  const char * const MY_PATH = "/org/ayatana/indicators/webcredentials";
+  const char * const MY_NAME = "com.lomiri.indicators.webcredentials";
+  const char * const MY_PATH = "/com/lomiri/indicators/webcredentials";
 }
 
 MockWebcredentials :: MockWebcredentials (GMainLoop       * loop,
-- 
cgit v1.2.3