Add mcp-account-manager-ring to automatically create a Telepathy account

This is a mission-control account manager plugin, which will provide a
persistent telepathy-ring account by the name of ring/tel/account0.
That account will be enabled and auto-connect by default. If removed,
it will be recreated on the next initialization of mission-control.

7 files changed, 316 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index 58d0f20..b4e1966 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = tests ring-extensions modem src docs tools scripts
+SUBDIRS = tests ring-extensions modem src docs tools scripts mc-plugin
 
 TAGS:
 	find src modem ring-extensions -name '*.[hc]' | \
diff --git a/configure.ac b/configure.ac
index 2baaeb4..c2f9ad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,6 @@ AC_PROG_CC
 AC_PROG_CC_STDC
 
 dnl Not yet
-AC_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
 dnl decide on error flags
@@ -33,6 +32,31 @@ if test x$enable_debug = xyes; then
   AC_DEFINE([ENABLE_DEBUG], [1], [Enable debug code])
 fi
 
+AC_ARG_ENABLE(mc-account-plugin,
+              AS_HELP_STRING([--enable-mc-account-plugin=@<:@no/yes/auto@:>@],
+                             [build MC account plugin]), , enable_mc_account_plugin=auto)
+
+if test "x$enable_mc_account_plugin" != "xno"; then
+    PKG_CHECK_MODULES(MCP,
+        [
+            mission-control-plugins
+        ], have_mcp="yes", have_mcp="no")
+
+    AC_MSG_CHECKING([Mission Control plugins dir])
+    MISSION_CONTROL_PLUGINS_DIR=${libdir}/mission-control-plugins.`pkg-config --variable=MCP_ABI_VERSION mission-control-plugins`
+
+    AC_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
+    AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
+else
+    have_mcp=no
+fi
+
+if test "x$enable_mc_account_plugin" = "xyes" -a "x$have_mcp" != "xyes"; then
+    AC_MSG_ERROR([Could not find mission-control plugin dependencies:
+
+$MCP_PKG_ERRORS])
+fi
+
 AC_HEADER_STDC
 AC_C_INLINE
 
@@ -97,5 +121,6 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([modem/Makefile modem/tests/Makefile \
 	         src/Makefile tests/Makefile docs/Makefile \
 		 scripts/Makefile \
-                 tools/Makefile ring-extensions/Makefile])
+                 tools/Makefile ring-extensions/Makefile \
+                 mc-plugin/Makefile])
 AC_OUTPUT
diff --git a/mc-plugin/Makefile.am b/mc-plugin/Makefile.am
new file mode 100644
index 0000000..7c08665
--- /dev/null
+++ b/mc-plugin/Makefile.am
@@ -0,0 +1,13 @@
+AM_CPPFLAGS = $(MCP_CFLAGS) $(ERROR_CFLAGS)
+
+pluginsdir = $(MISSION_CONTROL_PLUGINS_DIR)
+plugins_LTLIBRARIES = mcp-account-manager-ring.la
+
+mcp_account_manager_ring_la_SOURCES = \
+	mission-control-plugin.c \
+	mcp-account-manager-ring.h \
+	mcp-account-manager-ring.c
+
+mcp_account_manager_ring_la_LIBADD = $(MCP_LIBS)
+mcp_account_manager_ring_la_LDFLAGS = -shared -module -avoid-version
+
diff --git a/mc-plugin/mcp-account-manager-ring.c b/mc-plugin/mcp-account-manager-ring.c
new file mode 100644
index 0000000..1f04d8b
--- /dev/null
+++ b/mc-plugin/mcp-account-manager-ring.c
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2012 Jolla Ltd.
+ * Contact: John Brooks <john.brooks@jollamobile.com>
+ *
+ * Based on Empathy ubuntu-online-accounts:
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * 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.1 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/>.
+ */
+
+#include "config.h"
+#include "mcp-account-manager-ring.h"
+#include <string.h>
+
+#define PLUGIN_NAME "ring-account"
+#define PLUGIN_PRIORITY (MCP_ACCOUNT_STORAGE_PLUGIN_PRIO_DEFAULT - 10)
+#define PLUGIN_DESCRIPTION "Provide account for telepathy-ring"
+#define PLUGIN_PROVIDER "im.telepathy.Account.Storage.Ring"
+
+static void account_storage_iface_init(McpAccountStorageIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (McpAccountManagerRing, mcp_account_manager_ring,
+    G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (MCP_TYPE_ACCOUNT_STORAGE,
+    account_storage_iface_init));
+
+struct _McpAccountManagerRingPrivate
+{
+    gchar *account_name;
+    GHashTable *params;
+};
+
+static void mcp_account_manager_ring_dispose(GObject *object)
+{
+    McpAccountManagerRing *self = (McpAccountManagerRing*) object;
+    
+    g_hash_table_unref(self->priv->params);
+
+    G_OBJECT_CLASS (mcp_account_manager_ring_parent_class)->dispose(object);
+}
+
+static void mcp_account_manager_ring_init(McpAccountManagerRing *self)
+{
+    g_debug("MC Ring account plugin initialized");
+
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCP_TYPE_ACCOUNT_MANAGER_RING,
+            McpAccountManagerRingPrivate);
+    self->priv->account_name = "ring/tel/account0";
+    self->priv->params = g_hash_table_new(g_str_hash, g_str_equal);
+    g_hash_table_insert(self->priv->params, g_strdup("manager"), g_strdup("ring"));
+    g_hash_table_insert(self->priv->params, g_strdup("protocol"), g_strdup("tel"));
+    g_hash_table_insert(self->priv->params, g_strdup("DisplayName"), g_strdup("Cellular"));
+    g_hash_table_insert(self->priv->params, g_strdup("Enabled"), g_strdup("true"));
+    g_hash_table_insert(self->priv->params, g_strdup("ConnectAutomatically"), g_strdup("true"));
+}
+
+static void mcp_account_manager_ring_class_init(McpAccountManagerRingClass *klass)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+    gobject_class->dispose = mcp_account_manager_ring_dispose;
+
+    g_type_class_add_private(gobject_class, sizeof(McpAccountManagerRingPrivate));
+}
+
+static GList *account_manager_ring_list(const McpAccountStorage *storage, const McpAccountManager *am)
+{
+    McpAccountManagerRing *self = (McpAccountManagerRing*) storage;
+    GList *accounts = NULL;
+    g_debug("%s", G_STRFUNC);
+    accounts = g_list_prepend(accounts, g_strdup(self->priv->account_name));
+    return accounts;
+}
+
+static gboolean account_manager_ring_get(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *account_name, const gchar *key)
+{
+    McpAccountManagerRing *self = (McpAccountManagerRing*) storage;
+
+    if (strcmp(account_name, self->priv->account_name))
+        return FALSE;
+
+    if (key == NULL) {
+        GHashTableIter iter;
+        gpointer itkey, value;
+        g_hash_table_iter_init(&iter, self->priv->params);
+        while (g_hash_table_iter_next(&iter, &itkey, &value)) {
+            g_debug("%s: %s, %s %s", G_STRFUNC, account_name, (char*)itkey, (char*)value);
+            mcp_account_manager_set_value(am, account_name, itkey, value);
+        }
+    } else {
+        gchar *value = g_hash_table_lookup(self->priv->params, key);
+        g_debug("%s: %s, %s %s", G_STRFUNC, account_name, (char*)key, (char*)value);
+        mcp_account_manager_set_value(am, account_name, key, value);
+    }
+
+    return TRUE;
+}
+
+static gboolean account_manager_ring_set(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *account_name, const gchar *key, const gchar *val)
+{
+    return FALSE;
+}
+
+static gchar *account_manager_ring_create(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *cm_name, const gchar *protocol_name, GHashTable *params, GError **error)
+{
+    g_set_error(error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Ring account manager cannot create accounts");
+    return NULL;
+}
+
+static gboolean account_manager_ring_delete(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *account_name, const gchar *key)
+{
+    g_debug("%s: %s, %s", G_STRFUNC, account_name, key);
+    return FALSE;
+}
+
+static gboolean account_manager_ring_commit(const McpAccountStorage *storage, const McpAccountManager *am)
+{
+    g_debug("%s", G_STRFUNC);
+    return FALSE;
+}
+
+static void account_manager_ring_get_identifier(const McpAccountStorage *storage, const gchar *account_name,
+        GValue *identifier)
+{
+    McpAccountManagerRing *self = (McpAccountManagerRing*) storage;
+
+    if (strcmp(account_name, self->priv->account_name))
+        return;
+
+    g_debug("%s: %s", G_STRFUNC, account_name);
+    g_value_init(identifier, G_TYPE_UINT);
+    g_value_set_uint(identifier, 0);
+}
+
+static guint account_manager_ring_get_restrictions(const McpAccountStorage *storage, const gchar *account_name)
+{
+    McpAccountManagerRing *self = (McpAccountManagerRing*) storage;
+
+    if (strcmp(account_name, self->priv->account_name))
+        return G_MAXUINT;
+
+    return TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS |
+        TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED |
+        TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE |
+        TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE;
+}
+
+static void account_storage_iface_init(McpAccountStorageIface *iface)
+{
+    mcp_account_storage_iface_set_name(iface, PLUGIN_NAME);
+    mcp_account_storage_iface_set_desc(iface, PLUGIN_DESCRIPTION);
+    mcp_account_storage_iface_set_priority(iface, PLUGIN_PRIORITY);
+    mcp_account_storage_iface_set_provider(iface, PLUGIN_PROVIDER);
+
+#define IMPLEMENT(x) mcp_account_storage_iface_implement_##x(iface, account_manager_ring_##x)
+    IMPLEMENT (get);
+    IMPLEMENT (list);
+    IMPLEMENT (set);
+    IMPLEMENT (create);
+    IMPLEMENT (delete);
+    IMPLEMENT (commit);
+    IMPLEMENT (get_identifier);
+    IMPLEMENT (get_restrictions);
+#undef IMPLEMENT
+}
+
+McpAccountManagerRing *mcp_account_manager_ring_new(void)
+{
+    return g_object_new(MCP_TYPE_ACCOUNT_MANAGER_RING, NULL);
+}
+
diff --git a/mc-plugin/mcp-account-manager-ring.h b/mc-plugin/mcp-account-manager-ring.h
new file mode 100644
index 0000000..9fa3425
--- /dev/null
+++ b/mc-plugin/mcp-account-manager-ring.h
@@ -0,0 +1,49 @@
+#ifndef __MCP_ACCOUNT_MANAGER_RING_H__
+#define __MCP_ACCOUNT_MANAGER_RING_H__
+
+#include <mission-control-plugins/mission-control-plugins.h>
+
+G_BEGIN_DECLS
+
+#define MCP_TYPE_ACCOUNT_MANAGER_RING \
+    (mcp_account_manager_ring_get_type ())
+#define MCP_ACCOUNT_MANAGER_RING(o) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((o), MCP_TYPE_ACCOUNT_MANAGER_RING,   \
+     McpAccountManagerUoa))
+
+#define MCP_ACCOUNT_MANAGER_RING_CLASS(k)     \
+    (G_TYPE_CHECK_CLASS_CAST((k), MCP_TYPE_ACCOUNT_MANAGER_RING, \
+     McpAccountManagerRingClass))
+
+#define MCP_IS_ACCOUNT_MANAGER_RING(o) \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((o), MCP_TYPE_ACCOUNT_MANAGER_RING))
+
+#define MCP_IS_ACCOUNT_MANAGER_RING_CLASS(k)  \
+    (G_TYPE_CHECK_CLASS_TYPE ((k), MCP_TYPE_ACCOUNT_MANAGER_RING))
+
+#define MCP_ACCOUNT_MANAGER_RING_GET_CLASS(o) \
+    (G_TYPE_INSTANCE_GET_CLASS ((o), MCP_TYPE_ACCOUNT_MANAGER_RING, \
+     McpAccountManagerRingClass))
+
+typedef struct _McpAccountManagerRingPrivate McpAccountManagerRingPrivate;
+
+typedef struct {
+    GObject parent;
+
+    McpAccountManagerRingPrivate *priv;
+} _McpAccountManagerRing;
+
+typedef struct {
+      GObjectClass parent_class;
+} _McpAccountManagerRingClass;
+
+typedef _McpAccountManagerRing McpAccountManagerRing;
+typedef _McpAccountManagerRingClass McpAccountManagerRingClass;
+
+GType mcp_account_manager_ring_get_type (void) G_GNUC_CONST;
+
+McpAccountManagerRing *mcp_account_manager_ring_new (void);
+
+G_END_DECLS
+
+#endif
diff --git a/mc-plugin/mission-control-plugin.c b/mc-plugin/mission-control-plugin.c
new file mode 100644
index 0000000..17f1369
--- /dev/null
+++ b/mc-plugin/mission-control-plugin.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 Jolla Ltd.
+ * Contact: John Brooks <john.brooks@jollamobile.com>
+ *
+ * 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.1 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/>.
+ */
+
+#include <mission-control-plugins/mission-control-plugins.h>
+#include "mcp-account-manager-ring.h"
+
+GObject *
+mcp_plugin_ref_nth_object (guint n)
+{
+  static void *plugin_0 = NULL;
+
+  switch (n)
+    {
+      case 0:
+        if (plugin_0 == NULL)
+          plugin_0 = g_object_new (MCP_TYPE_ACCOUNT_MANAGER_RING, NULL);
+        else
+          g_object_ref (plugin_0);
+
+        return plugin_0;
+
+      default:
+        return NULL;
+    }
+}
+
diff --git a/modem/Makefile.am b/modem/Makefile.am
index 3dbab7a..9e13df0 100644
--- a/modem/Makefile.am
+++ b/modem/Makefile.am
@@ -16,7 +16,7 @@ AM_CFLAGS = $(ERROR_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ @TP_CFLAGS@ \
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/modem
 
-AM_LDFLAGS =
+AM_LDFLAGS = -static
 
 LIBADD = @TP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ @UUID_LIBS@