webcredentials-monitor: track failures

https://bugzilla.gnome.org/show_bug.cgi?id=683409

diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
index 7e061368fa8b3c614a26394c39231e9bd7de4245..439bbda65c324712861e786fb597f936c8d492ef 100644 (file)
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
@@ -4,6 +4,8 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
+#include <libaccounts-glib/ag-account.h>
+
 #include "empathy-webcredentials-monitor.h"
 
 G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT)
@@ -12,24 +14,30 @@ G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_T
 #define WEBCRED_PATH "/com/canonical/indicators/webcredentials"
 #define WEBCRED_IFACE "com.canonical.indicators.webcredentials"
 
+#define FAILURES_PROP "Failures"
+
 enum
 {
-  FIRST_PROP = 1,
+  PROP_MANAGER = 1,
   N_PROPS
 };
 
-/*
 enum
 {
+  SIG_FAILURE_ADDED,
+  SIG_FAILURE_REMOVED,
   LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL];
-*/
 
 struct _EmpathyWebcredentialsMonitorPriv
 {
+  AgManager *manager;
   GDBusProxy *proxy;
+
+  /* array of owned AgAccount */
+  GPtrArray *failures;
 };
 
 static void
@@ -38,10 +46,13 @@ empathy_webcredentials_monitor_get_property (GObject *object,
     GValue *value,
     GParamSpec *pspec)
 {
-  //EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
+  EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
 
   switch (property_id)
     {
+      case PROP_MANAGER:
+        g_value_set_object (value, self->priv->manager);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -54,10 +65,14 @@ empathy_webcredentials_monitor_set_property (GObject *object,
     const GValue *value,
     GParamSpec *pspec)
 {
-  //EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
+  EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
 
   switch (property_id)
     {
+      case PROP_MANAGER:
+        g_assert (self->priv->manager == NULL); /* construct only */
+        self->priv->manager = g_value_dup_object (value);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -67,11 +82,13 @@ empathy_webcredentials_monitor_set_property (GObject *object,
 static void
 empathy_webcredentials_monitor_constructed (GObject *object)
 {
-  //EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
+  EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
   void (*chain_up) (GObject *) =
       ((GObjectClass *) empathy_webcredentials_monitor_parent_class)->constructed;
 
   chain_up (object);
+
+  g_assert (AG_IS_MANAGER (self->priv->manager));
 }
 
 static void
@@ -81,6 +98,7 @@ empathy_webcredentials_monitor_dispose (GObject *object)
   void (*chain_up) (GObject *) =
       ((GObjectClass *) empathy_webcredentials_monitor_parent_class)->dispose;
 
+  g_clear_object (&self->priv->manager);
   g_clear_object (&self->priv->proxy);
 
   chain_up (object);
@@ -89,10 +107,12 @@ empathy_webcredentials_monitor_dispose (GObject *object)
 static void
 empathy_webcredentials_monitor_finalize (GObject *object)
 {
-  //EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
+  EmpathyWebcredentialsMonitor *self = EMPATHY_WEBCREDENTIALS_MONITOR (object);
   void (*chain_up) (GObject *) =
       ((GObjectClass *) empathy_webcredentials_monitor_parent_class)->finalize;
 
+  g_ptr_array_unref (self->priv->failures);
+
   chain_up (object);
 }
 
@@ -101,6 +121,7 @@ empathy_webcredentials_monitor_class_init (
     EmpathyWebcredentialsMonitorClass *klass)
 {
   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+  GParamSpec *spec;
 
   oclass->get_property = empathy_webcredentials_monitor_get_property;
   oclass->set_property = empathy_webcredentials_monitor_set_property;
@@ -108,9 +129,101 @@ empathy_webcredentials_monitor_class_init (
   oclass->dispose = empathy_webcredentials_monitor_dispose;
   oclass->finalize = empathy_webcredentials_monitor_finalize;
 
+  spec = g_param_spec_object ("manager", "Manager",
+      "AgManager",
+      AG_TYPE_MANAGER,
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_MANAGER, spec);
+
+  signals[SIG_FAILURE_ADDED] = g_signal_new ("failure-added",
+      G_OBJECT_CLASS_TYPE (klass),
+      G_SIGNAL_RUN_LAST,
+      0, NULL, NULL, NULL,
+      G_TYPE_NONE,
+      1, AG_TYPE_ACCOUNT);
+
+  signals[SIG_FAILURE_REMOVED] = g_signal_new ("failure-removed",
+      G_OBJECT_CLASS_TYPE (klass),
+      G_SIGNAL_RUN_LAST,
+      0, NULL, NULL, NULL,
+      G_TYPE_NONE,
+      1, AG_TYPE_ACCOUNT);
+
   g_type_class_add_private (klass, sizeof (EmpathyWebcredentialsMonitorPriv));
 }
 
+static void
+update_failures (EmpathyWebcredentialsMonitor *self)
+{
+  GVariant *failures, *f;
+  GVariantIter iter;
+  GList *new_list = NULL;
+  guint i;
+
+  failures = g_dbus_proxy_get_cached_property (self->priv->proxy,
+      FAILURES_PROP);
+  if (failures == NULL)
+    {
+      g_debug ("Does not implement Failures property");
+      return;
+    }
+
+  g_variant_iter_init (&iter, failures);
+  while ((f = g_variant_iter_next_value (&iter)) != NULL)
+    {
+      guint32 id;
+      AgAccount *account;
+
+      id = g_variant_get_uint32 (f);
+
+      account = ag_manager_get_account (self->priv->manager, id);
+      if (account == NULL)
+        continue;
+
+      /* Pass ownership of 'account' to the list */
+      new_list = g_list_append (new_list, account);
+
+      if (!tp_g_ptr_array_contains (self->priv->failures, account))
+        {
+          g_ptr_array_add (self->priv->failures, g_object_ref (account));
+
+          g_signal_emit (self, signals[SIG_FAILURE_ADDED], 0, account);
+        }
+
+      g_variant_unref (f);
+    }
+
+  g_variant_unref (failures);
+
+  for (i = 0; i < self->priv->failures->len; i++)
+    {
+      AgAccount *account = g_ptr_array_index (self->priv->failures, i);
+
+      if (g_list_find (new_list, account) == NULL)
+        {
+          g_object_ref (account);
+          g_ptr_array_remove (self->priv->failures, account);
+
+          g_signal_emit (self, signals[SIG_FAILURE_REMOVED], 0, account);
+          g_object_unref (account);
+        }
+    }
+
+  g_list_free_full (new_list, g_object_unref);
+}
+
+static void
+properties_changed_cb (GDBusProxy *proxy,
+    GVariant *changed_properties,
+    GStrv invalidated_properties,
+    EmpathyWebcredentialsMonitor *self)
+{
+  if (g_variant_lookup_value (changed_properties, FAILURES_PROP, NULL) == NULL)
+    return;
+
+  update_failures (self);
+}
+
 static void
 proxy_new_cb (GObject *source,
     GAsyncResult *result,
@@ -132,6 +245,11 @@ proxy_new_cb (GObject *source,
       goto out;
     }
 
+  update_failures (self);
+
+  g_signal_connect (self->priv->proxy, "g-properties-changed",
+      G_CALLBACK (properties_changed_cb), self);
+
 out:
   tp_weak_ref_destroy (wr);
   g_clear_object (&self);
@@ -143,14 +261,23 @@ empathy_webcredentials_monitor_init (EmpathyWebcredentialsMonitor *self)
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_WEBCREDENTIALS_MONITOR, EmpathyWebcredentialsMonitorPriv);
 
+  self->priv->failures = g_ptr_array_new_with_free_func (g_object_unref);
+
   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL,
       WEBCRED_BUS_NAME, WEBCRED_PATH, WEBCRED_IFACE,
       NULL, proxy_new_cb, tp_weak_ref_new (self, NULL, NULL));
 }
 
 EmpathyWebcredentialsMonitor *
-empathy_webcredentials_monitor_new (void)
+empathy_webcredentials_monitor_new (AgManager *manager)
 {
   return g_object_new (EMPATHY_TYPE_WEBCREDENTIALS_MONITOR,
+      "manager", manager,
       NULL);
 }
+
+GPtrArray *
+empathy_webcredentials_get_failures (EmpathyWebcredentialsMonitor *self)
+{
+  return self->priv->failures;
+}

diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
index 540a2bea7ba707f5097babd8ce05bb0bc1480a51..cf373a2d4ab1632f1e9b8a3c44ac4c2812bbd245 100644 (file)
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
@@ -3,6 +3,8 @@
 
 #include <glib-object.h>
 
+#include <libaccounts-glib/ag-manager.h>
+
 G_BEGIN_DECLS
 
 typedef struct _EmpathyWebcredentialsMonitor EmpathyWebcredentialsMonitor;
@@ -46,7 +48,11 @@ GType empathy_webcredentials_monitor_get_type (void);
     EMPATHY_TYPE_WEBCREDENTIALS_MONITOR, \
     EmpathyWebcredentialsMonitorClass))
 
-EmpathyWebcredentialsMonitor * empathy_webcredentials_monitor_new (void);
+EmpathyWebcredentialsMonitor * empathy_webcredentials_monitor_new (
+    AgManager *manager);
+
+GPtrArray * empathy_webcredentials_get_failures (
+    EmpathyWebcredentialsMonitor *self);
 
 G_END_DECLS