Merge lp:~mardy/indicator-session/online-accounts into lp:indicator-session/12.10

[Alberto Mardegan]

Add the "Online Accounts" item to the session menu.

This item, beside opening the Online Accounts applet of the GNOME Control Center, also acts as an indicator, by turning red when some accounts need to be re-authenticated.

Add the "Online Accounts" item to the session menu.

This item, beside opening the Online Accounts applet of the GNOME Control Center, also acts as an indicator, by turning red when some accounts need to be re-authenticated.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:350
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/3/console

review: Needs Fixing (continuous-integration)

[lp:~mardy/indicator-session/online-accounts]

351. By Alberto Mardegan on 2012-08-21

Fix build

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/4/console

review: Approve (continuous-integration)

[Matthew Paul Thomas (mpt)]

Sorry, "Online Accounts" is not in the design for the system menu because it would be inappropriate there. Ubuntu 12.10 will no longer have a session menu. And part of the merger of the user and session menus was removing all links to individual panels, leaving only "System Settings". Compare with "User Accounts", which used to be in the user menu (like Online Accounts was in 11.10), but which isn't in the combined menu either. <https://wiki.ubuntu.com/SystemMenu>

review: Disapprove (design)

[lp:~mardy/indicator-session/online-accounts]

352. By Alberto Mardegan on 2012-08-23

Show Online Accounts only when needed

[Alberto Mardegan (mardy)]

Hi Matthew, I updated the patch according to John Lea and Calum Pringle suggestions: not the "Online Accounts..." item is shown only if there are some accounts needing the user's attention (and when it's shown, it's shown in red). I hope that that's an acceptable compromise.

However, they also wanted that in error conditions the icon of the system menu would turn red, and I didn't find a way to do that. Setting the "alert" disposition on mgr->top_mi doesn't seem to produce any effect. I hope that some reviewer can give me some hints on how to do that.

(Though ideally, I think that this should be a feature of DbusmenuItem itself: when any of the child items is in "alert" disposition, the parent item should also visually deliver the alert)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:352
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/6/console

review: Approve (continuous-integration)

[Matthew Paul Thomas (mpt)]

review: Approve (design)

[Charles Kerr (charlesk)]

Alberto, there does exist a system-devices-panel-alert alert icon for flagging this information, but the mechanism to activate it isn't plugged in ATM because all of the events that used to trigger it were removed in the 12.10 redesign.

This patch looks fine. I'll merge it, then add a separate patch on top of it to trigger the icon change.

review: Approve

[Charles Kerr (charlesk)]

Xref: https://bugs.launchpad.net/indicator-session/+bug/1044015

[Alberto Mardegan (mardy)]

Thanks Charles!!

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-07-06 20:10:06 +0000
+++ po/POTFILES.in	2012-08-23 12:07:22 +0000
@@ -5,6 +5,7 @@
 src/gen-session-dbus.xml.c
 src/gtk-logout-helper.c
 src/indicator-session.c
+src/online-accounts-mgr.c
 src/session-dbus.c
 src/session-menu-mgr.c
 src/session-service.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-06-18 17:35:05 +0000
+++ src/Makefile.am	2012-08-23 12:07:22 +0000
@@ -133,7 +133,9 @@
 	users-service-dbus.h \
 	users-service-dbus.c \
 	session-menu-mgr.h \
-	session-menu-mgr.c
+	session-menu-mgr.c \
+	online-accounts-mgr.c \
+	online-accounts-mgr.h
 
 indicator_session_service_CFLAGS = \
 	$(SESSIONSERVICE_CFLAGS) \

=== added file 'src/online-accounts-mgr.c'
--- src/online-accounts-mgr.c	1970-01-01 00:00:00 +0000
+++ src/online-accounts-mgr.c	2012-08-23 12:07:22 +0000
@@ -0,0 +1,166 @@
+/*
+Copyright 2012 Canonical Ltd.
+
+Authors:
+    Alberto Mardegan <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <gio/gio.h>
+#include <glib/gi18n.h>
+
+#include "online-accounts-mgr.h"
+
+#include <libdbusmenu-glib/client.h>
+
+struct _OnlineAccountsMgr
+{
+  GObject parent_instance;
+  GDBusProxy *proxy;
+  DbusmenuMenuitem *menu_item;
+};
+
+#define ONLINE_ACCOUNTS_OBJECT_PATH "/com/canonical/indicators/webcredentials"
+#define ONLINE_ACCOUNTS_BUS_NAME "com.canonical.indicators.webcredentials"
+#define ONLINE_ACCOUNTS_INTERFACE ONLINE_ACCOUNTS_BUS_NAME
+
+G_DEFINE_TYPE (OnlineAccountsMgr, online_accounts_mgr, G_TYPE_OBJECT);
+
+static void
+update_disposition (OnlineAccountsMgr *self, GVariant *error_status_prop)
+{
+  gboolean error_status;
+
+  error_status = g_variant_get_boolean (error_status_prop);
+  dbusmenu_menuitem_property_set (self->menu_item,
+                                  DBUSMENU_MENUITEM_PROP_DISPOSITION,
+                                  error_status ?
+                                  DBUSMENU_MENUITEM_DISPOSITION_ALERT :
+                                  DBUSMENU_MENUITEM_DISPOSITION_NORMAL);
+}
+
+static void
+on_properties_changed (GDBusProxy *proxy,
+                       GVariant *changed_properties,
+                       GStrv invalidated_properties,
+                       OnlineAccountsMgr *self)
+{
+  if (g_variant_n_children (changed_properties) > 0) {
+    GVariantIter *iter;
+    const gchar *key;
+    GVariant *value;
+
+    g_variant_get (changed_properties, "a{sv}", &iter);
+    while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
+      if (g_strcmp0 (key, "ErrorStatus") == 0) {
+        update_disposition (self, value);
+      }
+    }
+    g_variant_iter_free (iter);
+  }
+}
+
+static void
+on_menu_item_activated (DbusmenuMenuitem *menu_item,
+                        guint timestamp,
+                        OnlineAccountsMgr *self)
+{
+  GError *error = NULL;
+
+  if (!g_spawn_command_line_async("gnome-control-center credentials", &error))
+  {
+    g_warning("Unable to show control center: %s", error->message);
+    g_error_free(error);
+  }
+}
+
+static void
+online_accounts_mgr_init (OnlineAccountsMgr *self)
+{
+  GError *error = NULL;
+  GVariant *error_status_prop;
+
+  self->menu_item = dbusmenu_menuitem_new ();
+  dbusmenu_menuitem_property_set (self->menu_item,
+                                  DBUSMENU_MENUITEM_PROP_TYPE,
+                                  DBUSMENU_CLIENT_TYPES_DEFAULT);
+  dbusmenu_menuitem_property_set (self->menu_item,
+                                  DBUSMENU_MENUITEM_PROP_LABEL,
+                                  _("Online Accounts\342\200\246"));
+  g_signal_connect (self->menu_item,
+                    DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+                    G_CALLBACK (on_menu_item_activated),
+                    self);
+
+  self->proxy =
+    g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                   NULL,
+                                   ONLINE_ACCOUNTS_BUS_NAME,
+                                   ONLINE_ACCOUNTS_OBJECT_PATH,
+                                   ONLINE_ACCOUNTS_INTERFACE,
+                                   NULL,
+                                   &error);
+  if (G_UNLIKELY (error != NULL)) {
+      g_warning ("Couldn't create online_accounts proxy: %s", error->message);
+      g_clear_error (&error);
+      return;
+  }
+
+  g_signal_connect (self->proxy, "g-properties-changed",
+                    G_CALLBACK (on_properties_changed), self);
+
+  error_status_prop =
+    g_dbus_proxy_get_cached_property (self->proxy, "ErrorStatus");
+  if (error_status_prop != NULL) {
+    update_disposition (self, error_status_prop);
+    g_variant_unref (error_status_prop);
+  }
+}
+
+static void
+online_accounts_mgr_dispose (GObject *object)
+{
+  OnlineAccountsMgr *self = ONLINE_ACCOUNTS_MGR (object);
+
+  if (self->proxy != NULL) {
+    g_object_unref (self->proxy);
+    self->proxy = NULL;
+  }
+
+  if (self->menu_item != NULL) {
+    g_object_unref (self->menu_item);
+    self->menu_item = NULL;
+  }
+
+  G_OBJECT_CLASS (online_accounts_mgr_parent_class)->dispose (object);
+}
+
+static void
+online_accounts_mgr_class_init (OnlineAccountsMgrClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  object_class->dispose = online_accounts_mgr_dispose;
+}
+
+OnlineAccountsMgr *online_accounts_mgr_new ()
+{
+  return g_object_new (ONLINE_ACCOUNTS_TYPE_MGR, NULL);
+}
+
+DbusmenuMenuitem *online_accounts_mgr_get_menu_item (OnlineAccountsMgr *self)
+{
+  g_return_val_if_fail (ONLINE_ACCOUNTS_IS_MGR (self), NULL);
+  return self->menu_item;
+}

=== added file 'src/online-accounts-mgr.h'
--- src/online-accounts-mgr.h	1970-01-01 00:00:00 +0000
+++ src/online-accounts-mgr.h	2012-08-23 12:07:22 +0000
@@ -0,0 +1,50 @@
+/*
+Copyright 2012 Canonical Ltd.
+
+Authors:
+    Alberto Mardegan <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _ONLINE_ACCOUNTS_MGR_H_
+#define _ONLINE_ACCOUNTS_MGR_H_
+
+#include <glib-object.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+G_BEGIN_DECLS
+
+#define ONLINE_ACCOUNTS_TYPE_MGR             (online_accounts_mgr_get_type ())
+#define ONLINE_ACCOUNTS_MGR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), ONLINE_ACCOUNTS_TYPE_MGR, OnlineAccountsMgr))
+#define ONLINE_ACCOUNTS_MGR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), ONLINE_ACCOUNTS_TYPE_MGR, OnlineAccountsMgrClass))
+#define ONLINE_ACCOUNTS_IS_MGR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ONLINE_ACCOUNTS_TYPE_MGR))
+#define ONLINE_ACCOUNTS_IS_MGR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), ONLINE_ACCOUNTS_TYPE_MGR))
+#define ONLINE_ACCOUNTS_MGR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), ONLINE_ACCOUNTS_TYPE_MGR, OnlineAccountsMgrClass))
+
+typedef struct _OnlineAccountsMgrClass OnlineAccountsMgrClass;
+typedef struct _OnlineAccountsMgr OnlineAccountsMgr;
+
+struct _OnlineAccountsMgrClass
+{
+  GObjectClass parent_class;
+};
+
+GType online_accounts_mgr_get_type (void) G_GNUC_CONST;
+OnlineAccountsMgr *online_accounts_mgr_new (void);
+
+DbusmenuMenuitem *online_accounts_mgr_get_menu_item (OnlineAccountsMgr *self);
+
+G_END_DECLS
+
+#endif /* _ONLINE_ACCOUNTS_MGR_H_ */

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-07-04 05:17:57 +0000
+++ src/session-menu-mgr.c	2012-08-23 12:07:22 +0000
@@ -33,6 +33,7 @@
 #include "session-menu-mgr.h"
 #include "shared-names.h"
 #include "users-service-dbus.h"
+#include "online-accounts-mgr.h"
 
 #define DEBUG_SHOW_ALL FALSE
 
@@ -88,6 +89,7 @@
   DbusmenuMenuitem * lock_mi;
   DbusmenuMenuitem * lock_switch_mi;
   DbusmenuMenuitem * guest_mi;
+  DbusmenuMenuitem * online_accounts_mi;
   DbusmenuMenuitem * logout_mi;
   DbusmenuMenuitem * suspend_mi;
   DbusmenuMenuitem * hibernate_mi;
@@ -113,6 +115,7 @@
   DBusUPower * upower_proxy;
   SessionDbus * session_dbus;
   UsersServiceDbus * users_dbus_facade;
+  OnlineAccountsMgr * online_accounts_mgr;
 };
 
 static SwitcherMode get_switcher_mode         (SessionMenuMgr *);
@@ -192,6 +195,9 @@
                     G_CALLBACK(on_guest_logged_in_changed), mgr);
 
   init_upower_proxy (mgr);
+
+  /* Online accounts menu item */
+  mgr->online_accounts_mgr = online_accounts_mgr_new ();
 }
 
 static void
@@ -212,6 +218,7 @@
   g_clear_object (&mgr->users_dbus_facade);
   g_clear_object (&mgr->top_mi);
   g_clear_object (&mgr->session_dbus);
+  g_clear_object (&mgr->online_accounts_mgr);
 
   g_slist_free (mgr->user_menuitems);
   mgr->user_menuitems = NULL;
@@ -362,6 +369,29 @@
   return mi;
 }
 
+static void
+check_online_accounts_status (SessionMenuMgr * mgr, DbusmenuMenuitem * mi)
+{
+  const gchar *disposition;
+  gboolean on_alert;
+
+  disposition =
+    dbusmenu_menuitem_property_get (mi, DBUSMENU_MENUITEM_PROP_DISPOSITION);
+  on_alert = g_strcmp0 (disposition, DBUSMENU_MENUITEM_DISPOSITION_ALERT) == 0;
+
+  mi_set_visible (mi, on_alert);
+}
+
+static void
+on_online_accounts_changed (SessionMenuMgr * mgr, const gchar * property,
+                            GVariant *value, DbusmenuMenuitem *mi)
+{
+  if (g_strcmp0 (property, DBUSMENU_MENUITEM_PROP_DISPOSITION) == 0)
+  {
+    check_online_accounts_status(mgr, mi);
+  }
+}
+
 /***
 ****  Admin Menuitems
 ****  <https://wiki.ubuntu.com/SystemMenu#Admin_items>
@@ -396,6 +426,14 @@
                               G_CALLBACK(action_func_spawn_async),
                               CMD_SYSTEM_SETTINGS);
 
+    mi = mgr->online_accounts_mi =
+      online_accounts_mgr_get_menu_item (mgr->online_accounts_mgr);
+    dbusmenu_menuitem_child_append (mgr->top_mi, mi);
+    g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED,
+                              G_CALLBACK(on_online_accounts_changed),
+                              mgr);
+    check_online_accounts_status (mgr, mi);
+
     mi = mi_new_separator ();
     dbusmenu_menuitem_child_append (mgr->top_mi, mi);
   }