diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | ubuntu-online-accounts/Makefile.am | 2 | ||||
| -rw-r--r-- | ubuntu-online-accounts/mc-plugin/Makefile.am | 19 | ||||
| -rw-r--r-- | ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c | 160 | ||||
| -rw-r--r-- | ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.h | 68 | ||||
| -rw-r--r-- | ubuntu-online-accounts/mc-plugin/mission-control-plugin.c | 47 |
7 files changed, 311 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1a3a118b..dc120d5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,9 @@ MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests NST_SUBDIRS = nautilus-sendto-plugin GOA_SUBDIRS = goa-mc-plugin +UOA_SUBDIRS = ubuntu-online-accounts -DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) +DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS) SUBDIRS = $(MY_SUBDIRS) @@ -14,6 +15,10 @@ if HAVE_GOA SUBDIRS += $(GOA_SUBDIRS) endif +if HAVE_UOA +SUBDIRS += $(UOA_SUBDIRS) +endif + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} DISTCHECK_CONFIGURE_FLAGS = \ diff --git a/configure.ac b/configure.ac index b3ad1408..f4518ef4 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,7 @@ NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 CHAMPLAIN_REQUIRED=0.12.1 CHEESE_GTK_REQUIRED=3.4.0 +LIBACCOUNTS_REQUIRED=1.1 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, @@ -229,6 +230,10 @@ PKG_CHECK_MODULES(EMPATHY_CALL, AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts", [Name of provider for accounts imported from GOA]) +AC_DEFINE(EMPATHY_UOA_PROVIDER, + "im.telepathy.Account.Storage.UOA", + [Name of provider for accounts imported from libaccounts]) + # ----------------------------------------------------------- # Enable debug # ----------------------------------------------------------- @@ -506,6 +511,8 @@ if test "x$enable_ubuntu_online_accounts" != "xno"; then PKG_CHECK_MODULES(UOA, [ account-plugin + mission-control-plugins + libaccounts-glib >= $LIBACCOUNTS_REQUIRED ], have_uoa="yes", have_uoa="no") else have_uoa=no @@ -552,6 +559,8 @@ AC_CONFIG_FILES([ src/Makefile nautilus-sendto-plugin/Makefile goa-mc-plugin/Makefile + ubuntu-online-accounts/Makefile + ubuntu-online-accounts/mc-plugin/Makefile help/Makefile tests/Makefile tests/interactive/Makefile diff --git a/ubuntu-online-accounts/Makefile.am b/ubuntu-online-accounts/Makefile.am new file mode 100644 index 00000000..a3ab1b8f --- /dev/null +++ b/ubuntu-online-accounts/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = mc-plugin + diff --git a/ubuntu-online-accounts/mc-plugin/Makefile.am b/ubuntu-online-accounts/mc-plugin/Makefile.am new file mode 100644 index 00000000..2123e526 --- /dev/null +++ b/ubuntu-online-accounts/mc-plugin/Makefile.am @@ -0,0 +1,19 @@ +AM_CPPFLAGS = \ + $(UOA_CFLAGS) \ + $(ERROR_CFLAGS) + +pluginsdir = $(MISSION_CONTROL_PLUGINS_DIR) +plugins_LTLIBRARIES = \ + mcp-account-manager-uoa.la + +mcp_account_manager_uoa_la_SOURCES = \ + mission-control-plugin.c \ + mcp-account-manager-uoa.c mcp-account-manager-uoa.h \ + $(NULL) + +mcp_account_manager_uoa_la_LIBADD = \ + $(UOA_LIBS) + +mcp_account_manager_uoa_la_LDFLAGS = \ + -module \ + -avoid-version diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c new file mode 100644 index 00000000..e3806771 --- /dev/null +++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c @@ -0,0 +1,160 @@ +/* + * Copyright © 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "mcp-account-manager-uoa.h" + +#include <telepathy-glib/telepathy-glib.h> + +#include <string.h> +#include <ctype.h> + +#define PLUGIN_NAME "uoa" +#define PLUGIN_PRIORITY (MCP_ACCOUNT_STORAGE_PLUGIN_PRIO_KEYRING + 10) +#define PLUGIN_DESCRIPTION "Provide Telepathy Accounts from UOA via libaccounts-glib" +#define PLUGIN_PROVIDER EMPATHY_UOA_PROVIDER + +#define DEBUG g_debug + +static void account_storage_iface_init (McpAccountStorageIface *iface); + +G_DEFINE_TYPE_WITH_CODE (McpAccountManagerUoa, mcp_account_manager_uoa, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (MCP_TYPE_ACCOUNT_STORAGE, + account_storage_iface_init)); + +struct _McpAccountManagerUoaPrivate +{ +}; + +static void +mcp_account_manager_uoa_dispose (GObject *object) +{ + G_OBJECT_CLASS (mcp_account_manager_uoa_parent_class)->dispose (object); +} + +static void +mcp_account_manager_uoa_init (McpAccountManagerUoa *self) +{ + DEBUG ("UOA MC plugin initialised"); + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + MCP_TYPE_ACCOUNT_MANAGER_UOA, McpAccountManagerUoaPrivate); +} + +static void +mcp_account_manager_uoa_class_init (McpAccountManagerUoaClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->dispose = mcp_account_manager_uoa_dispose; + + g_type_class_add_private (gobject_class, + sizeof (McpAccountManagerUoaPrivate)); +} + +static GList * +account_manager_uoa_list (const McpAccountStorage *storage, + const McpAccountManager *am) +{ + return NULL; +} + +static gboolean +account_manager_uoa_get (const McpAccountStorage *storage, + const McpAccountManager *am, + const gchar *acc, + const gchar *key) +{ + return FALSE; +} + +static gboolean +account_manager_uoa_set (const McpAccountStorage *storage, + const McpAccountManager *am, + const gchar *acc, + const gchar *key, + const gchar *val) +{ + return FALSE; +} + +static gboolean +account_manager_uoa_delete (const McpAccountStorage *storage, + const McpAccountManager *am, + const gchar *acc, + const gchar *key) +{ + return FALSE; +} + +static gboolean +account_manager_uoa_commit (const McpAccountStorage *storage, + const McpAccountManager *am) +{ + return FALSE; +} + +static void +account_manager_uoa_ready (const McpAccountStorage *storage, + const McpAccountManager *am) +{ +} + +static void +account_manager_uoa_get_identifier (const McpAccountStorage *storage, + const gchar *acc, + GValue *identifier) +{ +} + +static gchar * +account_manager_uoa_create_account (const McpAccountStorage *storage, + const gchar *cm_name, + const gchar *protocol_name, + GHashTable *params) +{ + return NULL; +} + +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_uoa_##x) + IMPLEMENT (get); + IMPLEMENT (list); + IMPLEMENT (set); + IMPLEMENT (delete); + IMPLEMENT (commit); + IMPLEMENT (ready); + IMPLEMENT (get_identifier); + IMPLEMENT (create_account); +#undef IMPLEMENT +} + +McpAccountManagerUoa * +mcp_account_manager_uoa_new (void) +{ + return g_object_new (MCP_TYPE_ACCOUNT_MANAGER_UOA, NULL); +} diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.h b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.h new file mode 100644 index 00000000..291aeb88 --- /dev/null +++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.h @@ -0,0 +1,68 @@ +/* + * Copyright © 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <mission-control-plugins/mission-control-plugins.h> + +#ifndef __MCP_ACCOUNT_MANAGER_UOA_H__ +#define __MCP_ACCOUNT_MANAGER_UOA_H__ + +G_BEGIN_DECLS + +#define MCP_TYPE_ACCOUNT_MANAGER_UOA \ + (mcp_account_manager_uoa_get_type ()) + +#define MCP_ACCOUNT_MANAGER_UOA(o) \ + (G_TYPE_CHECK_INSTANCE_CAST ((o), MCP_TYPE_ACCOUNT_MANAGER_UOA, \ + McpAccountManagerUoa)) + +#define MCP_ACCOUNT_MANAGER_UOA_CLASS(k) \ + (G_TYPE_CHECK_CLASS_CAST((k), MCP_TYPE_ACCOUNT_MANAGER_UOA, \ + McpAccountManagerUoaClass)) + +#define MCP_IS_ACCOUNT_MANAGER_UOA(o) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((o), MCP_TYPE_ACCOUNT_MANAGER_UOA)) + +#define MCP_IS_ACCOUNT_MANAGER_UOA_CLASS(k) \ + (G_TYPE_CHECK_CLASS_TYPE ((k), MCP_TYPE_ACCOUNT_MANAGER_UOA)) + +#define MCP_ACCOUNT_MANAGER_UOA_GET_CLASS(o) \ + (G_TYPE_INSTANCE_GET_CLASS ((o), MCP_TYPE_ACCOUNT_MANAGER_UOA, \ + McpAccountManagerUoaClass)) + +typedef struct _McpAccountManagerUoaPrivate McpAccountManagerUoaPrivate; + +typedef struct { + GObject parent; + + McpAccountManagerUoaPrivate *priv; +} _McpAccountManagerUoa; + +typedef struct { + GObjectClass parent_class; +} _McpAccountManagerUoaClass; + +typedef _McpAccountManagerUoa McpAccountManagerUoa; +typedef _McpAccountManagerUoaClass McpAccountManagerUoaClass; + +GType mcp_account_manager_uoa_get_type (void) G_GNUC_CONST; + +McpAccountManagerUoa *mcp_account_manager_uoa_new (void); + +G_END_DECLS + +#endif diff --git a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c new file mode 100644 index 00000000..d7a33fd4 --- /dev/null +++ b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c @@ -0,0 +1,47 @@ +/* + * mission-control-plugin.c + * + * A Mission Control plugin to expose Ubuntu Online Accounts with chat + * capabilities (e.g. Facebook) to Mission Control + * + * 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/>. + * + * Authors: Xavier Claessens <xavier.claessens@collabora.co.uk> + */ + +#include <mission-control-plugins/mission-control-plugins.h> + +#include "mcp-account-manager-uoa.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_UOA, NULL); + else + g_object_ref (plugin_0); + + return plugin_0; + + default: + return NULL; + } +} |