From 405a6969a0b2409d5f013e8d2845945b51146eb9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sat, 14 Nov 2015 22:07:18 +0100
Subject: Fork from Ubuntu's indicator-session project.

---
 src/backend-dbus/CMakeLists.txt                    |  5 +-
 src/backend-dbus/actions.c                         | 19 ++---
 .../com.canonical.indicators.webcredentials.xml    | 82 ----------------------
 .../org.ayatana.indicators.webcredentials.xml      | 82 ++++++++++++++++++++++
 4 files changed, 90 insertions(+), 98 deletions(-)
 delete mode 100644 src/backend-dbus/com.canonical.indicators.webcredentials.xml
 create mode 100644 src/backend-dbus/org.ayatana.indicators.webcredentials.xml

(limited to 'src/backend-dbus')

diff --git a/src/backend-dbus/CMakeLists.txt b/src/backend-dbus/CMakeLists.txt
index 1fb9d7c..a08851b 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
-                   com.canonical.indicators
-                   ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.indicators.webcredentials.xml)
+                   org.ayatana.indicators
+                   ${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicators.webcredentials.xml)
 
 add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-accounts
                    org.freedesktop
@@ -58,4 +58,3 @@ set_source_files_properties (${SOURCES}
 include_directories (${CMAKE_CURRENT_BINARY_DIR} ${SERVICE_INCLUDE_DIRS})
 
 add_library (backenddbus STATIC ${SOURCES} ${BACKEND_GENERATED_SOURCES})
-
diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
index 0fcdc08..a958731 100644
--- a/src/backend-dbus/actions.c
+++ b/src/backend-dbus/actions.c
@@ -19,7 +19,6 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <url-dispatcher.h>
 
 #include "dbus-end-session-dialog.h"
 #include "dbus-login1-manager.h"
@@ -863,9 +862,7 @@ have_unity_control_center (void)
 static void
 my_settings (IndicatorSessionActions * self G_GNUC_UNUSED)
 {
-  if (g_getenv ("MIR_SOCKET") != NULL)
-    url_dispatch_send("settings:///system", NULL, NULL);
-  else if (have_unity_control_center ())
+  if (have_unity_control_center ())
     run_outside_app ("unity-control-center");
   else
     run_outside_app ("gnome-control-center");
@@ -874,9 +871,7 @@ my_settings (IndicatorSessionActions * self G_GNUC_UNUSED)
 static void
 my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED)
 {
-  if (g_getenv ("MIR_SOCKET") != NULL)
-    url_dispatch_send("settings:///system/online-accounts", NULL, NULL);
-  else if (have_unity_control_center ())
+  if (have_unity_control_center ())
     run_outside_app ("unity-control-center credentials");
   else
     run_outside_app ("gnome-control-center credentials");
@@ -885,9 +880,7 @@ my_online_accounts (IndicatorSessionActions * self G_GNUC_UNUSED)
 static void
 my_about (IndicatorSessionActions * self G_GNUC_UNUSED)
 {
-  if (g_getenv ("MIR_SOCKET") != NULL)
-    url_dispatch_send("settings:///system/about", NULL, NULL);
-  else if (have_unity_control_center ())
+  if (have_unity_control_center ())
     run_outside_app ("unity-control-center info");
   else
     run_outside_app ("gnome-control-center info");
@@ -1091,7 +1084,7 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self)
                             G_CALLBACK(indicator_session_actions_notify_can_switch), self);
   p->lockdown_settings = s;
 
-  s = g_settings_new ("com.canonical.indicator.session");
+  s = g_settings_new ("org.ayatana.indicator.session");
   g_signal_connect_swapped (s, "changed::suppress-logout-restart-shutdown",
                             G_CALLBACK(indicator_session_actions_notify_can_prompt), self);
   g_signal_connect_swapped (s, "changed::suppress-logout-restart-shutdown",
@@ -1128,8 +1121,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,
-                                    "com.canonical.indicators.webcredentials",
-                                    "/com/canonical/indicators/webcredentials",
+                                    "org.ayatana.indicators.webcredentials",
+                                    "/org/ayatana/indicators/webcredentials",
                                     p->cancellable,
                                     on_webcredentials_proxy_ready,
                                     self);
diff --git a/src/backend-dbus/com.canonical.indicators.webcredentials.xml b/src/backend-dbus/com.canonical.indicators.webcredentials.xml
deleted file mode 100644
index d215081..0000000
--- a/src/backend-dbus/com.canonical.indicators.webcredentials.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<node>
-<!--
-  com.canonical.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.canonical.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
new file mode 100644
index 0000000..d7c46b0
--- /dev/null
+++ b/src/backend-dbus/org.ayatana.indicators.webcredentials.xml
@@ -0,0 +1,82 @@
+<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>
-- 
cgit v1.2.3