Merge lp:~khurshid-alam/unity-control-center/uoa-panel into lp:unity-control-center

[Khurshid Alam]

Import gnome online-accounts panel into unity-control-center
Reference: https://bugzilla.gnome.org/show_bug.cgi?id=774222
Reference: https://github.com/linuxmint/cinnamon-control-center/pull/181

Import gnome online-accounts panel into unity-control-center
Reference: https://bugzilla.gnome.org/show_bug.cgi?id=774222
Reference: https://github.com/linuxmint/cinnamon-control-center/pull/181

PPA: ppa:unity7maintainers/unity7-desktop

Community forum thread: https://community.ubuntu.com/t/testing-online-accounts-in-unity-control-center-bionic/3910

[Jeremy Bícha (jbicha)]

https://bileto.ubuntu.com/#/ticket/3158

This will be part of the gnome-desktop3 transition which is currently held up by a few things (glib needs to migrate, libglvnd needs to be promoted to main, and I'm having trouble with Unity FTBFS)
https://people.canonical.com/~ubuntu-archive/transitions/html/gnome-desktop3.html

[Jeremy Bícha (jbicha)]

Thank you! This is a very useful feature! :)

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2017-12-07 05:41:33 +0000
+++ configure.ac	2018-02-13 09:06:22 +0000
@@ -119,7 +119,7 @@
 SCHEMAS_REQUIRED_VERSION=3.15.4
 LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
-GOA_REQUIRED_VERSION=3.5.90
+GOA_REQUIRED_VERSION=3.18.0
 ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.30
 
 COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
@@ -262,6 +262,34 @@
 esac
 AM_CONDITIONAL(BUILD_WACOM, [test x"$have_wacom" = x"yes"])
 
+# Online accounts
+AC_ARG_ENABLE(onlineaccounts, AC_HELP_STRING([--disable-onlineaccounts], [disable online-accounts panel]),
+              [case "${enableval}" in
+                      yes) enable_onlineaccounts=yes ;;
+                      no) enable_onlineaccounts=no ;;
+                      *) AC_MSG_ERROR(bad value ${enableval} for --disable-onlineaccounts) ;;
+              esac],
+              [enable_onlineaccounts=yes]) dnl Enabled by default
+
+if test "x$enable_onlineaccounts" = xyes; then
+    PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0
+                  goa-backend-1.0 >= $GOA_REQUIRED_VERSION,
+                      [have_onlineaccounts=yes], have_onlineaccounts=no)
+    if test "x$have_onlineaccounts" = xno ; then
+        AC_MSG_ERROR(*** Gnome Online Accounts not found ***)
+    fi
+
+    AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the online-accounts panel])
+
+    if test x${have_onlineaccounts} = xyes; then
+      AC_DEFINE(HAVE_ONLINE_ACCOUNTS, 1, [Define to 1 if Gnome Online Accounts is available])
+    fi
+fi
+
+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, [test x$have_onlineaccounts = xyes])
+AC_SUBST(ONLINE_ACCOUNTS_CFLAGS)
+AC_SUBST(ONLINE_ACCOUNTS_LIBS)
+
 # This is a hard-dependency for the region and user-accounts panels
 PKG_CHECK_MODULES(ISOCODES, iso-codes)
 
@@ -495,6 +523,15 @@
 panels/wacom/Makefile
 panels/wacom/calibrator/Makefile
 panels/wacom/unity-wacom-panel.desktop.in
+panels/online-accounts/Makefile
+panels/online-accounts/unity-online-accounts-panel.desktop.in
+panels/online-accounts/icons/Makefile
+panels/online-accounts/icons/16x16/Makefile
+panels/online-accounts/icons/22x22/Makefile
+panels/online-accounts/icons/24x24/Makefile
+panels/online-accounts/icons/32x32/Makefile
+panels/online-accounts/icons/48x48/Makefile
+panels/online-accounts/icons/256x256/Makefile
 po/Makefile.in
 shell/appdata/Makefile
 shell/Makefile
@@ -538,4 +575,9 @@
 else
 	AC_MSG_NOTICE([   Region panel Fcitx support disabled])
 fi
+if test "x$have_onlineaccounts" = "xyes"; then
+	AC_MSG_NOTICE([** Online-Accounts support (Online-Accounts panel)])
+else
+	AC_MSG_NOTICE([   Online-Accounts support disabled])
+fi
 AC_MSG_NOTICE([End options])
 
=== modified file 'debian/control'
--- debian/control	2017-09-30 22:30:57 +0000
+++ debian/control	2018-02-13 09:06:22 +0000
@@ -29,7 +29,8 @@
                libgnome-desktop-3-dev (>= 3.5.91),
                libgnome-menu-3-dev,
                libgnomekbd-dev,
-               libgoa-1.0-dev (>= 3.5.90),
+               libgoa-1.0-dev (>= 3.18.0),
+               libgoa-backend-1.0-dev (>= 3.18.0),
                libgtk-3-dev (>= 3.10.0),
                libgtop2-dev,
                libibus-1.0-dev (>= 1.5.0),
@@ -73,6 +74,7 @@
          gnome-desktop3-data,
          adwaita-icon-theme,
          gnome-menus (>= 2.12.0),
+         gnome-online-accounts,
          unity-settings-daemon,
          gnome-settings-daemon-schemas (>= 3.16),
          gsettings-desktop-schemas (>= 3.15.4),
 
=== modified file 'debian/libunity-control-center1.symbols'
--- debian/libunity-control-center1.symbols	2014-06-26 02:58:37 +0000
+++ debian/libunity-control-center1.symbols	2018-02-13 09:06:22 +0000
@@ -18,6 +18,9 @@
  cc_editable_entry_set_text@Base 14.04.0
  cc_editable_entry_set_weight@Base 14.04.0
  cc_editable_entry_set_width_chars@Base 14.04.3+14.04.20140225
+ cc_list_box_adjust_scrolling@Base 15.04.0+17.10.20171225
+ cc_list_box_setup_scrolling@Base 15.04.0+17.10.20171225
+ cc_list_box_update_header_func@Base 15.04.0+17.10.20171225
  cc_panel_get_display_name@Base 14.04.0
  cc_panel_get_help_uri@Base 14.04.0
  cc_panel_get_permission@Base 14.04.0
 
=== modified file 'panels/Makefile.am'
--- panels/Makefile.am	2017-12-07 05:41:33 +0000
+++ panels/Makefile.am	2018-02-13 09:06:22 +0000
@@ -28,4 +28,8 @@
 SUBDIRS += network
 endif
 
+if BUILD_ONLINE_ACCOUNTS
+SUBDIRS += online-accounts
+endif
+
 -include $(top_srcdir)/git.mk
 
=== added directory 'panels/online-accounts'
=== added file 'panels/online-accounts/Makefile.am'
--- panels/online-accounts/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,52 @@
+cappletname = online-accounts
+
+SUBDIRS = icons
+
+uidir = $(pkgdatadir)/ui/online-accounts
+dist_ui_DATA = \
+	online-accounts.ui
+
+INCLUDES =						\
+	$(PANEL_CFLAGS)					\
+	$(ONLINE_ACCOUNTS_PANEL_CFLAGS)			\
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""  \
+	-DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
+	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	$(NULL)
+
+ccpanelsdir = $(PANELS_DIR)
+ccpanels_LTLIBRARIES = libonline-accounts.la
+
+BUILT_SOURCES =				\
+	cc-online-accounts-resources.c	\
+	cc-online-accounts-resources.h
+
+libonline_accounts_la_SOURCES =		\
+	$(BUILT_SOURCES)		\
+	online-accounts-module.c	\
+	cc-online-accounts-panel.c	\
+	cc-online-accounts-panel.h
+
+libonline_accounts_la_LIBADD =				\
+	$(PANEL_LIBS)					\
+	$(ONLINE_ACCOUNTS_PANEL_LIBS)
+
+libonline_accounts_la_LDFLAGS = $(PANEL_LDFLAGS)
+
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/online-accounts.gresource.xml)
+cc-online-accounts-resources.c: online-accounts.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_online_accounts $<
+cc-online-accounts-resources.h: online-accounts.gresource.xml $(resource_files)
+	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_online_accounts $<
+
+@INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = unity-online-accounts-panel.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
+EXTRA_DIST = $(resource_files) online-accounts.gresource.xml
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/cc-online-accounts-panel.c'
--- panels/online-accounts/cc-online-accounts-panel.c	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/cc-online-accounts-panel.c	2018-02-13 09:06:22 +0000
@@ -0,0 +1,985 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011, 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Zeuthen <[e-mail]>
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+#include <string.h>
+#include <glib/gi18n.h>
+
+#define GOA_API_IS_SUBJECT_TO_CHANGE
+#include <goa/goa.h>
+#define GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE
+#include <goabackend/goabackend.h>
+
+#include "cc-online-accounts-panel.h"
+#include "cc-online-accounts-resources.h"
+
+#include "shell/list-box-helper.h"
+
+struct _CcGoaPanel
+{
+  CcPanel parent_instance;
+
+  GoaClient *client;
+  GoaObject *active_object;
+  GoaObject *removed_object;
+
+  GtkWidget *accounts_frame;
+  GtkWidget *accounts_listbox;
+  GtkWidget *edit_account_dialog;
+  GtkWidget *edit_account_headerbar;
+  GtkWidget *more_providers_row;
+  GtkWidget *new_account_vbox;
+  GtkWidget *notification_label;
+  GtkWidget *notification_revealer;
+  GtkWidget *offline_label;
+  GtkWidget *providers_listbox;
+  GtkWidget *remove_account_button;
+  GtkWidget *stack;
+  GtkWidget *accounts_vbox;
+
+  guint      remove_account_timeout_id;
+};
+
+static gboolean on_edit_account_dialog_delete_event (CcGoaPanel *self);
+
+static void on_listbox_row_activated (CcGoaPanel    *self,
+                                      GtkListBoxRow *activated_row);
+
+static void fill_accounts_listbox (CcGoaPanel *self);
+
+static void on_account_added (GoaClient  *client,
+                              GoaObject  *object,
+                              gpointer    user_data);
+
+static void on_account_changed (GoaClient  *client,
+                                GoaObject  *object,
+                                gpointer    user_data);
+
+static void on_account_removed (GoaClient  *client,
+                                GoaObject  *object,
+                                gpointer    user_data);
+
+static void select_account_by_id (CcGoaPanel    *panel,
+                                  const gchar   *account_id);
+
+static void get_all_providers_cb (GObject      *source,
+                                  GAsyncResult *res,
+                                  gpointer      user_data);
+
+static void show_page_account (CcGoaPanel *panel,
+                               GoaObject  *object);
+
+static void on_remove_button_clicked (CcGoaPanel *self);
+
+static void on_notification_closed (GtkButton  *button,
+                                    CcGoaPanel *self);
+
+static void on_undo_button_clicked (GtkButton  *button,
+                                    CcGoaPanel *self);
+
+CC_PANEL_REGISTER (CcGoaPanel, cc_goa_panel);
+
+enum {
+  PROP_0,
+  PROP_PARAMETERS
+};
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+reset_headerbar (CcGoaPanel *self)
+{
+  gtk_header_bar_set_title (GTK_HEADER_BAR (self->edit_account_headerbar), NULL);
+  gtk_header_bar_set_subtitle (GTK_HEADER_BAR (self->edit_account_headerbar), NULL);
+  gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->edit_account_headerbar), TRUE);
+
+  /* Remove any leftover widgets */
+  gtk_container_foreach (GTK_CONTAINER (self->edit_account_headerbar),
+                         (GtkCallback) gtk_widget_destroy,
+                         NULL);
+
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+add_provider_row (CcGoaPanel  *self,
+                  GoaProvider *provider)
+{
+  GIcon *icon;
+  GoaProviderFeatures features;
+  GtkWidget *image;
+  GtkWidget *label;
+  GtkWidget *row;
+  GtkWidget *row_grid;
+  gchar *markup;
+  gchar *name;
+
+  row = gtk_list_box_row_new ();
+
+  row_grid = gtk_grid_new ();
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (row_grid), GTK_ORIENTATION_HORIZONTAL);
+  gtk_grid_set_column_spacing (GTK_GRID (row_grid), 6);
+  gtk_container_add (GTK_CONTAINER (row), row_grid);
+
+  if (provider == NULL)
+    {
+      g_object_set_data (G_OBJECT (row), "goa-provider", NULL);
+      icon = g_themed_icon_new_with_default_fallbacks ("goa-account");
+      name = g_strdup (C_("Online Account", "Other"));
+    }
+  else
+    {
+      g_object_set_data_full (G_OBJECT (row), "goa-provider", g_object_ref (provider), g_object_unref);
+      icon = goa_provider_get_provider_icon (provider, NULL);
+      name = goa_provider_get_provider_name (provider, NULL);
+    }
+
+  image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+  gtk_container_add (GTK_CONTAINER (row_grid), image);
+  g_object_set (image, "margin", 6, NULL);
+
+  markup = g_strdup_printf ("<b>%s</b>", name);
+  label = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (label), markup);
+  gtk_container_add (GTK_CONTAINER (row_grid), label);
+
+  /* Check if the row should be shown initially */
+  features = goa_provider_get_provider_features (provider);
+
+  if ((features & GOA_PROVIDER_FEATURE_BRANDED) != 0)
+    gtk_widget_show_all (row);
+
+  gtk_container_add (GTK_CONTAINER (self->providers_listbox), row);
+
+  g_free (markup);
+  g_free (name);
+  g_object_unref (icon);
+}
+
+static gint
+sort_providers_func (GtkListBoxRow *a,
+                     GtkListBoxRow *b,
+                     gpointer       user_data)
+{
+  GoaProvider *a_provider, *b_provider;
+  CcGoaPanel *self;
+  gboolean a_branded, b_branded;
+
+  self = user_data;
+
+  if (a == GTK_LIST_BOX_ROW (self->more_providers_row))
+    return 1;
+  else if (b == GTK_LIST_BOX_ROW (self->more_providers_row))
+    return -1;
+
+  a_provider = g_object_get_data (G_OBJECT (a), "goa-provider");
+  b_provider = g_object_get_data (G_OBJECT (b), "goa-provider");
+
+  a_branded = (goa_provider_get_provider_features (a_provider) & GOA_PROVIDER_FEATURE_BRANDED) != 0;
+  b_branded = (goa_provider_get_provider_features (b_provider) & GOA_PROVIDER_FEATURE_BRANDED) != 0;
+
+  if (a_branded != b_branded)
+    {
+      if (a_branded)
+        return -1;
+      else
+        return 1;
+    }
+
+  return gtk_list_box_row_get_index (b) - gtk_list_box_row_get_index (a);
+}
+
+static void
+show_non_branded_providers (CcGoaPanel *self)
+{
+  GList *children, *l;
+
+  children = gtk_container_get_children (GTK_CONTAINER (self->providers_listbox));
+
+  for (l = children; l != NULL; l = l->next)
+    {
+      GoaProvider *provider = g_object_get_data (l->data, "goa-provider");
+
+      if (!provider)
+        continue;
+
+      if ((goa_provider_get_provider_features (provider) & GOA_PROVIDER_FEATURE_BRANDED) == 0)
+        gtk_widget_show_all (l->data);
+    }
+
+  gtk_widget_hide (self->more_providers_row);
+
+  g_list_free (children);
+}
+
+static void
+add_account (CcGoaPanel  *self,
+             GoaProvider *provider,
+             GVariant    *preseed)
+{
+  GoaObject *object;
+  GError *error;
+
+  error = NULL;
+
+  gtk_container_foreach (GTK_CONTAINER (self->new_account_vbox),
+                         (GtkCallback) gtk_widget_destroy,
+                         NULL);
+
+  reset_headerbar (self);
+
+  /* Move to the new account page */
+  gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "new-account");
+
+  /* Reset the dialog size */
+  gtk_window_resize (GTK_WINDOW (self->edit_account_dialog), 1, 1);
+
+  /* This spins gtk_dialog_run() */
+  object = goa_provider_add_account (provider,
+                                     self->client,
+                                     GTK_DIALOG (self->edit_account_dialog),
+                                     GTK_BOX (self->new_account_vbox),
+                                     &error);
+
+  if (preseed)
+    goa_provider_set_preseed_data (provider, preseed);
+
+  if (object == NULL)
+    gtk_widget_hide (self->edit_account_dialog);
+  else
+    show_page_account (self, object);
+}
+
+static void
+on_provider_row_activated (CcGoaPanel    *self,
+                           GtkListBoxRow *activated_row)
+{
+  GoaProvider *provider;
+
+  /* Show More row */
+  if (activated_row == GTK_LIST_BOX_ROW (self->more_providers_row))
+    {
+      show_non_branded_providers (self);
+      return;
+    }
+
+  provider = g_object_get_data (G_OBJECT (activated_row), "goa-provider");
+
+  add_account (self, provider, NULL);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static gint
+sort_func (GtkListBoxRow *a,
+           GtkListBoxRow *b,
+           gpointer       user_data)
+{
+  GoaObject *a_obj, *b_obj;
+  GoaAccount *a_account, *b_account;
+
+  a_obj = g_object_get_data (G_OBJECT (a), "goa-object");
+  a_account = goa_object_peek_account (a_obj);
+
+  b_obj = g_object_get_data (G_OBJECT (b), "goa-object");
+  b_account = goa_object_peek_account (b_obj);
+
+  return g_strcmp0 (goa_account_get_id (a_account), goa_account_get_id (b_account));
+}
+
+static void
+command_add (CcGoaPanel *panel,
+             GVariant   *parameters)
+{
+  GVariant *v, *preseed = NULL;
+  GoaProvider *provider = NULL;
+  const gchar *provider_name = NULL;
+
+  g_assert (panel != NULL);
+  g_assert (parameters != NULL);
+
+  switch (g_variant_n_children (parameters))
+    {
+      case 3:
+        g_variant_get_child (parameters, 2, "v", &preseed);
+      case 2:
+        g_variant_get_child (parameters, 1, "v", &v);
+        if (g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
+          provider_name = g_variant_get_string (v, NULL);
+        else
+          g_warning ("Wrong type for the second argument (provider name) GVariant, expected 's' but got '%s'",
+                     (gchar *)g_variant_get_type (v));
+        g_variant_unref (v);
+        break;
+      default:
+        g_warning ("Unexpected parameters found, ignore request");
+        goto out;
+    }
+
+  if (provider_name != NULL)
+    {
+      provider = goa_provider_get_for_provider_type (provider_name);
+      if (provider == NULL)
+        {
+          g_warning ("Unable to get a provider for type '%s'", provider_name);
+          goto out;
+        }
+
+      add_account (panel, provider, preseed);
+    }
+
+out:
+  g_clear_object (&provider);
+  g_clear_pointer (&preseed, g_variant_unref);
+}
+
+static void
+cc_goa_panel_set_property (GObject *object,
+                        guint property_id,
+                        const GValue *value,
+                        GParamSpec *pspec)
+{
+  switch (property_id)
+    {
+      case PROP_PARAMETERS:
+        {
+          GVariant *parameters, *v;
+          const gchar *first_arg = NULL;
+
+          parameters = g_value_get_variant (value);
+          if (parameters == NULL)
+            return;
+
+          if (g_variant_n_children (parameters) > 0)
+            {
+                g_variant_get_child (parameters, 0, "v", &v);
+                if (g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
+                  first_arg = g_variant_get_string (v, NULL);
+                else
+                  g_warning ("Wrong type for the second argument GVariant, expected 's' but got '%s'",
+                             (gchar *)g_variant_get_type (v));
+                g_variant_unref (v);
+            }
+
+          if (g_strcmp0 (first_arg, "add") == 0)
+            command_add (CC_GOA_PANEL (object), parameters);
+          else if (first_arg != NULL)
+            select_account_by_id (CC_GOA_PANEL (object), first_arg);
+
+          return;
+        }
+    }
+
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+cc_goa_panel_dispose (GObject *object)
+{
+  CcGoaPanel *panel = CC_GOA_PANEL (object);
+
+  /* Must be destroyed in dispose, not finalize. */
+  g_clear_pointer (&panel->edit_account_dialog, gtk_widget_destroy);
+
+  G_OBJECT_CLASS (cc_goa_panel_parent_class)->dispose (object);
+}
+
+static void
+cc_goa_panel_finalize (GObject *object)
+{
+  CcGoaPanel *panel = CC_GOA_PANEL (object);
+
+  g_clear_object (&panel->client);
+
+  G_OBJECT_CLASS (cc_goa_panel_parent_class)->finalize (object);
+}
+
+static void
+cc_goa_panel_init (CcGoaPanel *panel)
+{
+  GError *error;
+  GNetworkMonitor *monitor;
+
+  g_resources_register (cc_online_accounts_get_resource ());
+
+  gtk_widget_init_template (GTK_WIDGET (panel));
+
+  gtk_list_box_set_header_func (GTK_LIST_BOX (panel->accounts_listbox),
+                                cc_list_box_update_header_func,
+                                NULL,
+                                NULL);
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (panel->accounts_listbox),
+                              sort_func,
+                              panel,
+                              NULL);
+
+  gtk_list_box_set_header_func (GTK_LIST_BOX (panel->providers_listbox),
+                                cc_list_box_update_header_func,
+                                NULL,
+                                NULL);
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (panel->providers_listbox),
+                              sort_providers_func,
+                              panel,
+                              NULL);
+
+  monitor = g_network_monitor_get_default();
+
+  g_object_bind_property (monitor, "network-available",
+                          panel->offline_label, "visible",
+                          G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+  g_object_bind_property (monitor, "network-available",
+                          panel->providers_listbox, "sensitive",
+                          G_BINDING_SYNC_CREATE);
+
+  /* TODO: probably want to avoid _sync() ... */
+  error = NULL;
+  panel->client = goa_client_new_sync (NULL /* GCancellable */, &error);
+  if (panel->client == NULL)
+    {
+      g_warning ("Error getting a GoaClient: %s (%s, %d)",
+                 error->message, g_quark_to_string (error->domain), error->code);
+      gtk_widget_set_sensitive (GTK_WIDGET (panel), FALSE);
+      g_error_free (error);
+      return;
+    }
+
+  g_signal_connect (panel->client,
+                    "account-added",
+                    G_CALLBACK (on_account_added),
+                    panel);
+
+  g_signal_connect (panel->client,
+                    "account-changed",
+                    G_CALLBACK (on_account_changed),
+                    panel);
+
+  g_signal_connect (panel->client,
+                    "account-removed",
+                    G_CALLBACK (on_account_removed),
+                    panel);
+
+  fill_accounts_listbox (panel);
+  goa_provider_get_all (get_all_providers_cb, panel);
+
+  gtk_widget_show (GTK_WIDGET (panel));
+}
+
+static const char *
+cc_goa_panel_get_help_uri (CcPanel *panel)
+{
+  return "help:gnome-help/accounts";
+}
+
+static void
+cc_goa_panel_constructed (GObject *object)
+{
+  CcGoaPanel *self = CC_GOA_PANEL (object);
+  GtkWindow *parent;
+
+  /* Setup account editor dialog */
+  parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self))));
+
+  gtk_window_set_transient_for (GTK_WINDOW (self->edit_account_dialog), parent);
+
+  G_OBJECT_CLASS (cc_goa_panel_parent_class)->constructed (object);
+}
+
+static void
+cc_goa_panel_class_init (CcGoaPanelClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
+
+  panel_class->get_help_uri = cc_goa_panel_get_help_uri;
+
+  object_class->set_property = cc_goa_panel_set_property;
+  object_class->finalize = cc_goa_panel_finalize;
+  object_class->constructed = cc_goa_panel_constructed;
+  object_class->dispose = cc_goa_panel_dispose;
+
+  //g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
+
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/online-accounts/online-accounts.ui");
+
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, accounts_frame);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, accounts_listbox);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, accounts_vbox);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, edit_account_dialog);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, edit_account_headerbar);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, more_providers_row);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, new_account_vbox);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, notification_label);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, notification_revealer);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, offline_label);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, providers_listbox);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, remove_account_button);
+  gtk_widget_class_bind_template_child (widget_class, CcGoaPanel, stack);
+
+  gtk_widget_class_bind_template_callback (widget_class, on_edit_account_dialog_delete_event);
+  gtk_widget_class_bind_template_callback (widget_class, on_listbox_row_activated);
+  gtk_widget_class_bind_template_callback (widget_class, on_notification_closed);
+  gtk_widget_class_bind_template_callback (widget_class, on_provider_row_activated);
+  gtk_widget_class_bind_template_callback (widget_class, on_remove_button_clicked);
+  gtk_widget_class_bind_template_callback (widget_class, on_undo_button_clicked);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+show_page_nothing_selected (CcGoaPanel *panel)
+{
+}
+
+static void
+show_page_account (CcGoaPanel  *panel,
+                   GoaObject *object)
+{
+  GList *children;
+  GList *l;
+  GoaProvider *provider;
+  GoaAccount *account;
+  gboolean is_locked;
+  const gchar *provider_name;
+  const gchar *provider_type;
+  gchar *title;
+
+  provider = NULL;
+
+  panel->active_object = object;
+  reset_headerbar (panel);
+
+  /* Move to the account editor page */
+  gtk_stack_set_visible_child_name (GTK_STACK (panel->stack), "editor");
+
+  /* Out with the old */
+  children = gtk_container_get_children (GTK_CONTAINER (panel->accounts_vbox));
+  for (l = children; l != NULL; l = l->next)
+    gtk_container_remove (GTK_CONTAINER (panel->accounts_vbox), GTK_WIDGET (l->data));
+  g_list_free (children);
+
+  account = goa_object_peek_account (object);
+
+  is_locked = goa_account_get_is_locked (account);
+  gtk_widget_set_visible (panel->remove_account_button, !is_locked);
+
+  provider_type = goa_account_get_provider_type (account);
+  provider = goa_provider_get_for_provider_type (provider_type);
+
+  if (provider != NULL)
+    {
+      goa_provider_show_account (provider,
+                                 panel->client,
+                                 object,
+                                 GTK_BOX (panel->accounts_vbox),
+                                 NULL,
+                                 NULL);
+    }
+
+  provider_name = goa_account_get_provider_name (account);
+  /* translators: This is the title of the "Show Account" dialog. The
+   * %s is the name of the provider. e.g., 'Google'. */
+  title = g_strdup_printf (_("%s Account"), provider_name);
+  gtk_header_bar_set_title (GTK_HEADER_BAR (panel->edit_account_headerbar), title);
+  g_free (title);
+
+  /* Reset the dialog size */
+  gtk_window_resize (GTK_WINDOW (panel->edit_account_dialog), 1, 1);
+
+  gtk_widget_show_all (panel->accounts_vbox);
+  gtk_widget_show (panel->edit_account_dialog);
+
+  g_clear_object (&provider);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+select_account_by_id (CcGoaPanel    *panel,
+                      const gchar *account_id)
+{
+  GList *children, *l;
+
+  children = gtk_container_get_children (GTK_CONTAINER (panel->accounts_listbox));
+
+  for (l = children; l != NULL; l = l->next)
+    {
+      GoaAccount *account;
+      GoaObject *row_object;
+
+      row_object = g_object_get_data (l->data, "goa-object");
+      account = goa_object_peek_account (row_object);
+
+      if (g_strcmp0 (goa_account_get_id (account), account_id) == 0)
+        {
+          show_page_account (panel, row_object);
+          break;
+        }
+    }
+
+  g_list_free (children);
+}
+
+static gboolean
+on_edit_account_dialog_delete_event (CcGoaPanel *self)
+{
+  self->active_object = NULL;
+  gtk_widget_hide (self->edit_account_dialog);
+  return TRUE;
+}
+
+static void
+on_listbox_row_activated (CcGoaPanel    *self,
+                          GtkListBoxRow *activated_row)
+{
+  GoaObject *object;
+
+  object = g_object_get_data (G_OBJECT (activated_row), "goa-object");
+  show_page_account (self, object);
+}
+
+static void
+fill_accounts_listbox (CcGoaPanel *self)
+{
+  GList *accounts, *l;
+
+  accounts = goa_client_get_accounts (self->client);
+
+  if (accounts == NULL)
+    {
+      show_page_nothing_selected (self);
+    }
+  else
+    {
+      for (l = accounts; l != NULL; l = l->next)
+        on_account_added (self->client, l->data, self);
+    }
+
+  g_list_free_full (accounts, g_object_unref);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+typedef void (*RowForAccountCallback) (CcGoaPanel *self, GtkWidget *row, GList *other_rows);
+
+static void
+hide_row_for_account (CcGoaPanel *self, GtkWidget *row, GList *other_rows)
+{
+  gtk_widget_hide (row);
+  gtk_widget_set_visible (self->accounts_frame, other_rows != NULL);
+}
+
+static void
+remove_row_for_account (CcGoaPanel *self, GtkWidget *row, GList *other_rows)
+{
+  gtk_widget_destroy (row);
+  gtk_widget_set_visible (self->accounts_frame, other_rows != NULL);
+}
+
+static void
+show_row_for_account (CcGoaPanel *self, GtkWidget *row, GList *other_rows)
+{
+  gtk_widget_show (row);
+  gtk_widget_show (self->accounts_frame);
+}
+
+static void
+modify_row_for_account (CcGoaPanel *self,
+                        GoaObject *object,
+                        RowForAccountCallback callback)
+{
+  GList *children, *l;
+
+  children = gtk_container_get_children (GTK_CONTAINER (self->accounts_listbox));
+
+  for (l = children; l != NULL; l = l->next)
+    {
+      GoaObject *row_object;
+
+      row_object = g_object_get_data (G_OBJECT (l->data), "goa-object");
+      if (row_object == object)
+        {
+          GtkWidget *row = GTK_WIDGET (l->data);
+
+          children = g_list_remove_link (children, l);
+          callback (self, row, children);
+          g_list_free (l);
+          break;
+        }
+    }
+
+  g_list_free (children);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+on_account_added (GoaClient *client,
+                  GoaObject *object,
+                  gpointer   user_data)
+{
+  CcGoaPanel *self = user_data;
+  GtkWidget *row, *icon, *label, *box;
+  GoaAccount *account;
+  GError *error;
+  GIcon *gicon;
+  gchar* title = NULL;
+
+  account = goa_object_peek_account (object);
+
+  /* The main grid */
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_widget_show (box);
+
+  /* The provider icon */
+  icon = gtk_image_new ();
+
+  error = NULL;
+  gicon = g_icon_new_for_string (goa_account_get_provider_icon (account), &error);
+  if (error != NULL)
+    {
+      g_warning ("Error creating GIcon for account: %s (%s, %d)",
+                 error->message,
+                 g_quark_to_string (error->domain),
+                 error->code);
+
+      g_clear_error (&error);
+    }
+  else
+    {
+      gtk_image_set_from_gicon (GTK_IMAGE (icon), gicon, GTK_ICON_SIZE_DIALOG);
+    }
+
+  g_object_set (icon, "margin", 6, NULL);
+
+  gtk_container_add (GTK_CONTAINER (box), icon);
+
+  /* The name of the provider */
+  title = g_strdup_printf ("<b>%s</b>\n<small>%s</small>",
+                           goa_account_get_provider_name (account),
+                           goa_account_get_presentation_identity (account));
+
+  label = g_object_new (GTK_TYPE_LABEL,
+                        "ellipsize", PANGO_ELLIPSIZE_END,
+                        "label", title,
+                        "xalign", 0.0,
+                        "use-markup", TRUE,
+                        "hexpand", TRUE,
+                        NULL);
+  gtk_container_add (GTK_CONTAINER (box), label);
+
+  /* "Needs attention" icon */
+  icon = gtk_image_new_from_icon_name ("dialog-warning-symbolic", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_no_show_all (icon, TRUE);
+  g_object_set (icon, "margin_end", 30, NULL);
+  g_object_bind_property (goa_object_peek_account (object),
+                          "attention-needed",
+                          icon,
+                          "visible",
+                          G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+  gtk_container_add (GTK_CONTAINER (box), icon);
+
+  /* The row */
+  row = gtk_list_box_row_new ();
+  g_object_set_data (G_OBJECT (row), "goa-object", object);
+  gtk_container_add (GTK_CONTAINER (row), box);
+
+  /* Add to the listbox */
+  gtk_container_add (GTK_CONTAINER (self->accounts_listbox), row);
+  gtk_widget_show_all (row);
+  gtk_widget_show (self->accounts_frame);
+
+  g_clear_pointer (&title, g_free);
+  g_clear_object (&gicon);
+}
+
+static void
+on_account_changed (GoaClient  *client,
+                    GoaObject  *object,
+                    gpointer    user_data)
+{
+  CcGoaPanel *panel = CC_GOA_PANEL (user_data);
+
+  if (panel->active_object != object)
+    return;
+
+  show_page_account (panel, panel->active_object);
+}
+
+static void
+on_account_removed (GoaClient *client,
+                    GoaObject *object,
+                    gpointer   user_data)
+{
+  CcGoaPanel *self = user_data;
+  modify_row_for_account (self, object, remove_row_for_account);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+get_all_providers_cb (GObject      *source,
+                      GAsyncResult *res,
+                      gpointer      user_data)
+{
+  CcGoaPanel *self = user_data;
+  GList *providers;
+  GList *l;
+
+  providers = NULL;
+  if (!goa_provider_get_all_finish (&providers, res, NULL))
+    return;
+
+  for (l = providers; l != NULL; l = l->next)
+    {
+      GoaProvider *provider;
+      provider = GOA_PROVIDER (l->data);
+
+      add_provider_row (self, provider);
+    }
+
+  g_list_free_full (providers, g_object_unref);
+}
+
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+cancel_notification_timeout (CcGoaPanel *self)
+{
+  if (self->remove_account_timeout_id == 0)
+    return;
+
+  g_source_remove (self->remove_account_timeout_id);
+
+  self->remove_account_timeout_id = 0;
+}
+
+static void
+remove_account_cb (GoaAccount    *account,
+                   GAsyncResult  *res,
+                   gpointer       user_data)
+{
+  CcGoaPanel *panel = CC_GOA_PANEL (user_data);
+  GError *error;
+
+  error = NULL;
+  if (!goa_account_call_remove_finish (account, res, &error))
+    {
+      GtkWidget *dialog;
+      dialog = gtk_message_dialog_new (GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel)))),
+                                       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       _("Error removing account"));
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                "%s",
+                                                error->message);
+      gtk_widget_show_all (dialog);
+      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
+      g_error_free (error);
+    }
+  g_object_unref (panel);
+}
+
+static void
+on_notification_closed (GtkButton  *button,
+                        CcGoaPanel *self)
+{
+  goa_account_call_remove (goa_object_peek_account (self->removed_object),
+                           NULL, /* GCancellable */
+                           (GAsyncReadyCallback) remove_account_cb,
+                           g_object_ref (self));
+
+  gtk_revealer_set_reveal_child (GTK_REVEALER (self->notification_revealer), FALSE);
+
+  cancel_notification_timeout (self);
+  self->removed_object = NULL;
+}
+
+static void
+on_undo_button_clicked (GtkButton  *button,
+                        CcGoaPanel *self)
+{
+  /* Simply show the account row and hide the notification */
+  modify_row_for_account (self, self->removed_object, show_row_for_account);
+  gtk_revealer_set_reveal_child (GTK_REVEALER (self->notification_revealer), FALSE);
+
+  cancel_notification_timeout (self);
+  self->removed_object = NULL;
+}
+
+static gboolean
+on_remove_account_timeout (gpointer user_data)
+{
+  on_notification_closed (NULL, user_data);
+  return G_SOURCE_REMOVE;
+}
+
+static void
+on_remove_button_clicked (CcGoaPanel *panel)
+{
+  GoaAccount *account;
+  gchar *label;
+
+  if (panel->active_object == NULL)
+    return;
+
+  if (panel->removed_object != NULL)
+    on_notification_closed (NULL, panel);
+
+  panel->removed_object = panel->active_object;
+  panel->active_object = NULL;
+
+  account = goa_object_peek_account (panel->removed_object);
+  /* Translators: The %s is the username (eg., [e-mail]
+   * or rishi).
+   */
+  label = g_strdup_printf (_("<b>%s</b> removed"), goa_account_get_presentation_identity (account));
+  gtk_label_set_markup (GTK_LABEL (panel->notification_label), label);
+  gtk_revealer_set_reveal_child (GTK_REVEALER (panel->notification_revealer), TRUE);
+
+  modify_row_for_account (panel, panel->removed_object, hide_row_for_account);
+  gtk_widget_hide (panel->edit_account_dialog);
+
+  panel->remove_account_timeout_id = g_timeout_add_seconds (10, on_remove_account_timeout, panel);
+
+  g_free (label);
+}
+
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+void
+cc_goa_panel_register (GIOModule *module)
+{
+        textdomain (GETTEXT_PACKAGE);
+        bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale");
+        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        cc_goa_panel_register_type (G_TYPE_MODULE (module));
+        g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+                                        CC_TYPE_GOA_PANEL,
+                                        "online-accounts", 0);
+}
 
=== added file 'panels/online-accounts/cc-online-accounts-panel.h'
--- panels/online-accounts/cc-online-accounts-panel.h	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/cc-online-accounts-panel.h	2018-02-13 09:06:22 +0000
@@ -0,0 +1,65 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: David Zeuthen <[e-mail]>
+ */
+
+#ifndef __GOA_PANEL_H__
+#define __GOA_PANEL_H__
+
+#include <shell/cc-panel.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_GOA_PANEL (cc_goa_panel_get_type ())
+
+#define CC_GOA_PANEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  CC_TYPE_GOA_PANEL, CcGoaPanel))
+
+#define CC_GOA_PANEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  CC_TYPE_GOA_PANEL, CcGoaPanelClass))
+
+#define CC_IS_GOA_PANEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  CC_TYPE_GOA_PANEL))
+
+#define CC_IS_GOA_PANEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  CC_TYPE_GOA_PANEL))
+
+#define CC_GOA_PANEL_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  CC_TYPE_GOA_PANEL, CcGoaPanelClass))
+
+typedef struct _CcGoaPanel CcGoaPanel;
+typedef struct _CcGoaPanelClass CcGoaPanelClass;
+typedef struct _CcGoaPanelPrivate CcGoaPanelPrivate;
+
+struct _CcGoaPanelClass
+{
+  CcPanelClass parent_class;
+};
+
+GType cc_goa_panel_get_type (void) G_GNUC_CONST;
+
+void cc_goa_panel_register (GIOModule *module);
+
+G_END_DECLS
+
+#endif /* __GOA_PANEL_H__ */
 
=== added directory 'panels/online-accounts/icons'
=== added directory 'panels/online-accounts/icons/16x16'
=== added file 'panels/online-accounts/icons/16x16/Makefile.am'
--- panels/online-accounts/icons/16x16/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/16x16/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/16x16/apps
+icon_DATA =				\
+	unity-online-accounts.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/icons/16x16/unity-online-accounts.png'
 Binary files panels/online-accounts/icons/16x16/unity-online-accounts.png	1970-01-01 00:00:00 +0000 and panels/online-accounts/icons/16x16/unity-online-accounts.png	2018-02-13 09:06:22 +0000 differ
=== added directory 'panels/online-accounts/icons/22x22'
=== added file 'panels/online-accounts/icons/22x22/Makefile.am'
--- panels/online-accounts/icons/22x22/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/22x22/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = 				\
+	unity-online-accounts.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/icons/22x22/unity-online-accounts.png'
 Binary files panels/online-accounts/icons/22x22/unity-online-accounts.png	1970-01-01 00:00:00 +0000 and panels/online-accounts/icons/22x22/unity-online-accounts.png	2018-02-13 09:06:22 +0000 differ
=== added directory 'panels/online-accounts/icons/24x24'
=== added file 'panels/online-accounts/icons/24x24/Makefile.am'
--- panels/online-accounts/icons/24x24/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/24x24/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/24x24/apps
+icon_DATA = 				\
+	unity-online-accounts.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/icons/24x24/unity-online-accounts.png'
 Binary files panels/online-accounts/icons/24x24/unity-online-accounts.png	1970-01-01 00:00:00 +0000 and panels/online-accounts/icons/24x24/unity-online-accounts.png	2018-02-13 09:06:22 +0000 differ
=== added directory 'panels/online-accounts/icons/256x256'
=== added file 'panels/online-accounts/icons/256x256/Makefile.am'
--- panels/online-accounts/icons/256x256/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/256x256/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/256x256/apps
+icon_DATA = 				\
+	unity-online-accounts.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/icons/256x256/unity-online-accounts.png'
 Binary files panels/online-accounts/icons/256x256/unity-online-accounts.png	1970-01-01 00:00:00 +0000 and panels/online-accounts/icons/256x256/unity-online-accounts.png	2018-02-13 09:06:22 +0000 differ
=== added directory 'panels/online-accounts/icons/32x32'
=== added file 'panels/online-accounts/icons/32x32/Makefile.am'
--- panels/online-accounts/icons/32x32/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/32x32/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = 				\
+	unity-online-accounts.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/icons/32x32/unity-online-accounts.png'
 Binary files panels/online-accounts/icons/32x32/unity-online-accounts.png	1970-01-01 00:00:00 +0000 and panels/online-accounts/icons/32x32/unity-online-accounts.png	2018-02-13 09:06:22 +0000 differ
=== added directory 'panels/online-accounts/icons/48x48'
=== added file 'panels/online-accounts/icons/48x48/Makefile.am'
--- panels/online-accounts/icons/48x48/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/48x48/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = 				\
+	unity-online-accounts.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/icons/48x48/unity-online-accounts.png'
 Binary files panels/online-accounts/icons/48x48/unity-online-accounts.png	1970-01-01 00:00:00 +0000 and panels/online-accounts/icons/48x48/unity-online-accounts.png	2018-02-13 09:06:22 +0000 differ
=== added file 'panels/online-accounts/icons/Makefile.am'
--- panels/online-accounts/icons/Makefile.am	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/icons/Makefile.am	2018-02-13 09:06:22 +0000
@@ -0,0 +1,23 @@
+
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+if MAINTAINER_MODE
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+endif
+
+clean-local :
+	rm -f *~
+
+
+-include $(top_srcdir)/git.mk
 
=== added file 'panels/online-accounts/online-accounts-module.c'
--- panels/online-accounts/online-accounts-module.c	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/online-accounts-module.c	2018-02-13 09:06:22 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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 <config.h>
+#include "cc-online-accounts-panel.h"
+#include <glib/gi18n.h>
+
+void
+g_io_module_load (GIOModule *module)
+{
+        /* register the panel */
+        cc_goa_panel_register (module);
+}
+
+void
+g_io_module_unload (GIOModule *module)
+{
+}
 
=== added file 'panels/online-accounts/online-accounts.gresource.xml'
--- panels/online-accounts/online-accounts.gresource.xml	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/online-accounts.gresource.xml	2018-02-13 09:06:22 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/control-center/online-accounts">
+    <file preprocess="xml-stripblanks">online-accounts.ui</file>
+  </gresource>
+</gresources>
 
=== added file 'panels/online-accounts/online-accounts.ui'
--- panels/online-accounts/online-accounts.ui	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/online-accounts.ui	2018-02-13 09:06:22 +0000
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <template class="CcGoaPanel" parent="CcPanel">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkOverlay">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child type="overlay">
+          <object class="GtkRevealer" id="notification_revealer">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">start</property>
+            <property name="transition_type">slide-down</property>
+            <child>
+              <object class="GtkFrame">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="notification_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="undo_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Undo</property>
+                        <signal name="clicked" handler="on_undo_button_clicked" object="CcGoaPanel" swapped="no" />
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">none</property>
+                        <signal name="clicked" handler="on_notification_closed" object="CcGoaPanel" swapped="no" />
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon-name">window-close-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <style>
+                  <class name="app-notification" />
+                </style>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="min_content_height">500</property>
+            <child>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row-spacing">18</property>
+                <property name="column-spacing">18</property>
+                <property name="orientation">vertical</property>
+                <property name="margin_start">32</property>
+                <property name="margin_end">32</property>
+                <property name="margin_top">32</property>
+                <property name="margin_bottom">22</property>
+                <property name="hexpand">True</property>
+                <property name="width-request">300</property>
+
+                <!--
+                  Stub boxes to pull the widgets to the middle, and yet allow them to
+                  grow and cover a third of the available space
+                -->
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="top-attach">0</property>
+                    <property name="left-attach">0</property>
+                  </packing>
+                </child>
+
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="top-attach">0</property>
+                    <property name="left-attach">2</property>
+                  </packing>
+                </child>
+
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <property name="orientation">vertical</property>
+                    <property name="hexpand">True</property>
+                    <property name="width-request">300</property>
+                    <child>
+                      <object class="GtkLabel" id="offline_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="wrap">True</property>
+                        <property name="label" translatable="yes">No internet connection — connect to set up new online accounts</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="accounts_frame">
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkListBox" id="accounts_listbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="selection_mode">none</property>
+                            <signal name="row-activated" handler="on_listbox_row_activated" object="CcGoaPanel" swapped="yes" />
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin-top">24</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Add an account</property>
+                        <attributes>
+                          <attribute name="weight" value="bold" />
+                        </attributes>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkFrame">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkListBox" id="providers_listbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="selection_mode">none</property>
+                            <signal name="row-activated" handler="on_provider_row_activated" object="CcGoaPanel" swapped="yes" />
+                            <child>
+                              <object class="GtkListBoxRow" id="more_providers_row">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="margin">22</property>
+                                    <property name="icon-name">view-more-symbolic</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="top-attach">0</property>
+                    <property name="left-attach">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+  <object class="GtkDialog" id="edit_account_dialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="use_header_bar">1</property>
+    <property name="resizable">True</property>
+    <property name="modal">True</property>
+    <signal name="delete-event" handler="on_edit_account_dialog_delete_event" object="CcGoaPanel" swapped="yes" />
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="edit_account_headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="show_close_button">False</property>
+      </object>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="border_width">0</property>
+        <child>
+          <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="transition_type">crossfade</property>
+            <property name="homogeneous">False</property>
+            <child>
+              <object class="GtkBox" id="new_account_vbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="name">new-account</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin">24</property>
+                <property name="spacing">24</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox" id="accounts_vbox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="vexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="margin-start">18</property>
+                    <property name="margin-end">18</property>
+                    <property name="spacing">18</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" id="remove_account_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="valign">end</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes">Remove Account</property>
+                    <signal name="clicked" handler="on_remove_button_clicked" object="CcGoaPanel" swapped="yes" />
+                    <style>
+                      <class name="destructive-action" />
+                    </style>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="name">editor</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
 
=== added file 'panels/online-accounts/unity-online-accounts-panel.desktop.in.in'
--- panels/online-accounts/unity-online-accounts-panel.desktop.in.in	1970-01-01 00:00:00 +0000
+++ panels/online-accounts/unity-online-accounts-panel.desktop.in.in	2018-02-13 09:06:22 +0000
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Exec=unity-control-center online-accounts
+Icon=unity-online-accounts
+Terminal=false
+Type=Application
+NoDisplay=false
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings;OnlineAccounts;
+OnlyShowIn=Unity;
+X-Unity-Settings-Panel=online-accounts
+# Translators: those are keywords for the online-accounts control-center panel
+Keywords=Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;
+Name=Online Accounts
+Comment=Connect your online accounts
+X-Ubuntu-Gettext-Domain=unity-control-center
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2017-12-07 05:45:44 +0000
+++ po/POTFILES.in	2018-02-13 09:06:22 +0000
@@ -92,7 +92,10 @@
 panels/screen-sharing/vino-message-box.c
 panels/screen-sharing/cc-screen-sharing-panel.c
 panels/screen-sharing/unity-screen-sharing-panel.desktop.in.in
-[type: gettext/glade]panels/screen-sharing/cc-screen-sharing-panel.ui
+[type: gettext/glade]panels/screen-sharing/screen-sharing-panel.ui
+panels/online-accounts/cc-online-accounts-panel.c
+panels/online-accounts/unity-online-accounts-panel.desktop.in.in
+[type: gettext/glade]panels/online-accounts/online-accounts.ui
 panels/sound/cc-sound-panel.c
 panels/sound/gvc-balance-bar.c
 panels/sound/gvc-channel-bar.c
 
=== modified file 'shell/Makefile.am'
--- shell/Makefile.am	2017-04-06 13:23:05 +0000
+++ shell/Makefile.am	2018-02-13 09:06:22 +0000
@@ -54,6 +54,8 @@
 	cc-shell.h				\
 	cc-editable-entry.c			\
 	cc-editable-entry.h			\
+	list-box-helper.h			\
+	list-box-helper.c			\	
 	$(NULL)
 
 libunity_control_center_la_LDFLAGS =		\
 
=== added file 'shell/list-box-helper.c'
--- shell/list-box-helper.c	1970-01-01 00:00:00 +0000
+++ shell/list-box-helper.c	2018-02-13 09:06:22 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2014 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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 "list-box-helper.h"
+
+#define MAX_ROWS_VISIBLE 5
+
+void
+cc_list_box_update_header_func (GtkListBoxRow *row,
+                                GtkListBoxRow *before,
+                                gpointer user_data)
+{
+  GtkWidget *current;
+
+  if (before == NULL)
+    {
+      gtk_list_box_row_set_header (row, NULL);
+      return;
+    }
+
+  current = gtk_list_box_row_get_header (row);
+  if (current == NULL)
+    {
+      current = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+      gtk_widget_show (current);
+      gtk_list_box_row_set_header (row, current);
+    }
+}
+
+void
+cc_list_box_adjust_scrolling (GtkListBox *listbox)
+{
+  GtkWidget *scrolled_window;
+  GList *children;
+  guint n_rows, num_max_rows;
+
+  scrolled_window = g_object_get_data (G_OBJECT (listbox), "cc-scrolling-scrolled-window");
+  if (!scrolled_window)
+    return;
+
+  children = gtk_container_get_children (GTK_CONTAINER (listbox));
+  n_rows = g_list_length (children);
+
+  num_max_rows = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (listbox), "cc-max-rows-visible"));
+
+  if (n_rows >= num_max_rows)
+    {
+      gint total_row_height = 0;
+      GList *l;
+      guint i;
+
+      for (l = children, i = 0; l != NULL && i < num_max_rows; l = l->next, i++) {
+        gint row_height;
+        gtk_widget_get_preferred_height (GTK_WIDGET (l->data), &row_height, NULL);
+        total_row_height += row_height;
+      }
+
+      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolled_window), total_row_height);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+    }
+  else
+    {
+      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolled_window), -1);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                      GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+    }
+
+  g_list_free (children);
+}
+
+void
+cc_list_box_setup_scrolling (GtkListBox *listbox,
+                             guint       num_max_rows)
+{
+  GtkWidget *parent;
+  GtkWidget *scrolled_window;
+
+  parent = gtk_widget_get_parent (GTK_WIDGET (listbox));
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled_window);
+
+  g_object_ref (listbox);
+  gtk_container_remove (GTK_CONTAINER (parent), GTK_WIDGET (listbox));
+  gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (listbox));
+  g_object_unref (listbox);
+
+  gtk_container_add (GTK_CONTAINER (parent), scrolled_window);
+
+  if (num_max_rows == 0)
+    num_max_rows = MAX_ROWS_VISIBLE;
+
+  g_object_set_data (G_OBJECT (listbox), "cc-scrolling-scrolled-window", scrolled_window);
+  g_object_set_data (G_OBJECT (listbox), "cc-max-rows-visible", GUINT_TO_POINTER (num_max_rows));
+}
 
=== added file 'shell/list-box-helper.h'
--- shell/list-box-helper.h	1970-01-01 00:00:00 +0000
+++ shell/list-box-helper.h	2018-02-13 09:06:22 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Red Hat, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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 <gtk/gtk.h>
+
+void
+cc_list_box_update_header_func (GtkListBoxRow *row,
+                                GtkListBoxRow *before,
+                                gpointer user_data);
+
+void
+cc_list_box_adjust_scrolling (GtkListBox *listbox);
+
+void
+cc_list_box_setup_scrolling (GtkListBox *listbox,
+                             guint       num_rows);