UOA: share a common configuration plugin

The latest libaccounts-glib and libaccount-plugin libraries add support
for using the same binary plugin for different providers.
This means that bug 683415 is no longer valid, and that all the
provider-specific plugins can now be removed.

Fixes bug #691418

46 files changed, 29 insertions, 2082 deletions

diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
index 7a5ac57ae..f76c2fa53 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -1,5 +1,3 @@
-# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
-# Do NOT edit manually
 plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
 
 INCLUDES =					\
@@ -12,175 +10,18 @@ INCLUDES =					\
 	$(DISABLE_DEPRECATED)			\
 	$(EMPATHY_CFLAGS)
 
-pkglib_LTLIBRARIES = libempathy-uoa-account-plugin.la
+plugin_LTLIBRARIES = libempathy-accounts-plugin.la
 
-# this API is not stable and will never be, so use -release to make the
-# SONAME of the plugin library change with every Empathy release.
-libempathy_uoa_account_plugin_la_LDFLAGS = \
-   -no-undefined \
-   -release $(VERSION)
+libempathy_accounts_plugin_la_LDFLAGS = \
+	-module -avoid-version
 
-libempathy_uoa_account_plugin_la_SOURCES = \
+libempathy_accounts_plugin_la_SOURCES = \
 	empathy-accounts-plugin.c \
 	empathy-accounts-plugin.h \
 	empathy-accounts-plugin-widget.c \
 	empathy-accounts-plugin-widget.h
 
-libempathy_uoa_account_plugin_la_LIBADD = \
-	$(UOA_LIBS)
-
-plugin_LTLIBRARIES = \
-	libaim.la\
-	libgadugadu.la\
-	libgroupwise.la\
-	libicq.la\
-	libirc.la\
-	libjabber.la\
-	libmxit.la\
-	libmyspace.la\
-	libsip.la\
-	liblocal-xmpp.la\
-	libsametime.la\
-	libyahoojp.la\
-	libyahoo.la\
-	libzephyr.la \
-	$(NULL)
-
-libaim_la_SOURCES = \
-	empathy-accounts-plugin-aim.c \
-	empathy-accounts-plugin-aim.h
-libaim_la_LDFLAGS = -module -avoid-version
-libaim_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libgadugadu_la_SOURCES = \
-	empathy-accounts-plugin-gadugadu.c \
-	empathy-accounts-plugin-gadugadu.h
-libgadugadu_la_LDFLAGS = -module -avoid-version
-libgadugadu_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libgroupwise_la_SOURCES = \
-	empathy-accounts-plugin-groupwise.c \
-	empathy-accounts-plugin-groupwise.h
-libgroupwise_la_LDFLAGS = -module -avoid-version
-libgroupwise_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libicq_la_SOURCES = \
-	empathy-accounts-plugin-icq.c \
-	empathy-accounts-plugin-icq.h
-libicq_la_LDFLAGS = -module -avoid-version
-libicq_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libirc_la_SOURCES = \
-	empathy-accounts-plugin-irc.c \
-	empathy-accounts-plugin-irc.h
-libirc_la_LDFLAGS = -module -avoid-version
-libirc_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libjabber_la_SOURCES = \
-	empathy-accounts-plugin-jabber.c \
-	empathy-accounts-plugin-jabber.h
-libjabber_la_LDFLAGS = -module -avoid-version
-libjabber_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libmxit_la_SOURCES = \
-	empathy-accounts-plugin-mxit.c \
-	empathy-accounts-plugin-mxit.h
-libmxit_la_LDFLAGS = -module -avoid-version
-libmxit_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libmyspace_la_SOURCES = \
-	empathy-accounts-plugin-myspace.c \
-	empathy-accounts-plugin-myspace.h
-libmyspace_la_LDFLAGS = -module -avoid-version
-libmyspace_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libsip_la_SOURCES = \
-	empathy-accounts-plugin-sip.c \
-	empathy-accounts-plugin-sip.h
-libsip_la_LDFLAGS = -module -avoid-version
-libsip_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-liblocal_xmpp_la_SOURCES = \
-	empathy-accounts-plugin-local-xmpp.c \
-	empathy-accounts-plugin-local-xmpp.h
-liblocal_xmpp_la_LDFLAGS = -module -avoid-version
-liblocal_xmpp_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libsametime_la_SOURCES = \
-	empathy-accounts-plugin-sametime.c \
-	empathy-accounts-plugin-sametime.h
-libsametime_la_LDFLAGS = -module -avoid-version
-libsametime_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libyahoojp_la_SOURCES = \
-	empathy-accounts-plugin-yahoojp.c \
-	empathy-accounts-plugin-yahoojp.h
-libyahoojp_la_LDFLAGS = -module -avoid-version
-libyahoojp_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libyahoo_la_SOURCES = \
-	empathy-accounts-plugin-yahoo.c \
-	empathy-accounts-plugin-yahoo.h
-libyahoo_la_LDFLAGS = -module -avoid-version
-libyahoo_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
-	$(top_builddir)/libempathy/libempathy.la \
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-
-
-libzephyr_la_SOURCES = \
-	empathy-accounts-plugin-zephyr.c \
-	empathy-accounts-plugin-zephyr.h
-libzephyr_la_LDFLAGS = -module -avoid-version
-libzephyr_la_LIBADD = \
-	libempathy-uoa-account-plugin.la \
+libempathy_accounts_plugin_la_LIBADD = \
+	$(UOA_LIBS) \
 	$(top_builddir)/libempathy/libempathy.la \
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c
deleted file mode 100644
index 426547448..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-aim.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-aim.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginAim, empathy_accounts_plugin_aim,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_aim_class_init (
-    EmpathyAccountsPluginAimClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_aim_init (EmpathyAccountsPluginAim *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h
deleted file mode 100644
index a9e072deb..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-aim.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-aim.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_AIM_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_AIM_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginAim EmpathyAccountsPluginAim;
-typedef struct _EmpathyAccountsPluginAimClass EmpathyAccountsPluginAimClass;
-
-struct _EmpathyAccountsPluginAimClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginAim
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_aim_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM \
-  (empathy_accounts_plugin_aim_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_AIM(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM, \
-    EmpathyAccountsPluginAim))
-#define EMPATHY_ACCOUNTS_PLUGIN_AIM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM, \
-    EmpathyAccountsPluginAimClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_AIM(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_AIM_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM))
-#define EMPATHY_ACCOUNTS_PLUGIN_AIM_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_AIM, \
-    EmpathyAccountsPluginAimClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_AIM_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c
deleted file mode 100644
index 2cd60222f..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-gadugadu.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-gadugadu.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginGadugadu, empathy_accounts_plugin_gadugadu,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_gadugadu_class_init (
-    EmpathyAccountsPluginGadugaduClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_gadugadu_init (EmpathyAccountsPluginGadugadu *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h
deleted file mode 100644
index 1a0956e65..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-gadugadu.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-gadugadu.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginGadugadu EmpathyAccountsPluginGadugadu;
-typedef struct _EmpathyAccountsPluginGadugaduClass EmpathyAccountsPluginGadugaduClass;
-
-struct _EmpathyAccountsPluginGadugaduClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginGadugadu
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_gadugadu_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU \
-  (empathy_accounts_plugin_gadugadu_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_GADUGADU(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU, \
-    EmpathyAccountsPluginGadugadu))
-#define EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU, \
-    EmpathyAccountsPluginGadugaduClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GADUGADU(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GADUGADU_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU))
-#define EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GADUGADU, \
-    EmpathyAccountsPluginGadugaduClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_GADUGADU_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c
deleted file mode 100644
index ddcef5a2c..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-groupwise.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-groupwise.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginGroupwise, empathy_accounts_plugin_groupwise,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_groupwise_class_init (
-    EmpathyAccountsPluginGroupwiseClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_groupwise_init (EmpathyAccountsPluginGroupwise *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h
deleted file mode 100644
index 00a75377a..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-groupwise.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-groupwise.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginGroupwise EmpathyAccountsPluginGroupwise;
-typedef struct _EmpathyAccountsPluginGroupwiseClass EmpathyAccountsPluginGroupwiseClass;
-
-struct _EmpathyAccountsPluginGroupwiseClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginGroupwise
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_groupwise_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE \
-  (empathy_accounts_plugin_groupwise_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE, \
-    EmpathyAccountsPluginGroupwise))
-#define EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE, \
-    EmpathyAccountsPluginGroupwiseClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GROUPWISE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_GROUPWISE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE))
-#define EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_GROUPWISE, \
-    EmpathyAccountsPluginGroupwiseClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_GROUPWISE_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c
deleted file mode 100644
index 0f6aa3874..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-icq.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-icq.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginIcq, empathy_accounts_plugin_icq,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_icq_class_init (
-    EmpathyAccountsPluginIcqClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_icq_init (EmpathyAccountsPluginIcq *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h
deleted file mode 100644
index b3a5e82a6..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-icq.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-icq.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_ICQ_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_ICQ_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginIcq EmpathyAccountsPluginIcq;
-typedef struct _EmpathyAccountsPluginIcqClass EmpathyAccountsPluginIcqClass;
-
-struct _EmpathyAccountsPluginIcqClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginIcq
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_icq_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ \
-  (empathy_accounts_plugin_icq_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_ICQ(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ, \
-    EmpathyAccountsPluginIcq))
-#define EMPATHY_ACCOUNTS_PLUGIN_ICQ_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ, \
-    EmpathyAccountsPluginIcqClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ICQ(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ICQ_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ))
-#define EMPATHY_ACCOUNTS_PLUGIN_ICQ_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ICQ, \
-    EmpathyAccountsPluginIcqClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_ICQ_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c
deleted file mode 100644
index 53c243236..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-irc.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-irc.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginIrc, empathy_accounts_plugin_irc,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_irc_class_init (
-    EmpathyAccountsPluginIrcClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_irc_init (EmpathyAccountsPluginIrc *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h
deleted file mode 100644
index b3a9a629b..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-irc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-irc.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_IRC_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_IRC_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginIrc EmpathyAccountsPluginIrc;
-typedef struct _EmpathyAccountsPluginIrcClass EmpathyAccountsPluginIrcClass;
-
-struct _EmpathyAccountsPluginIrcClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginIrc
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_irc_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC \
-  (empathy_accounts_plugin_irc_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_IRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC, \
-    EmpathyAccountsPluginIrc))
-#define EMPATHY_ACCOUNTS_PLUGIN_IRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC, \
-    EmpathyAccountsPluginIrcClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_IRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_IRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC))
-#define EMPATHY_ACCOUNTS_PLUGIN_IRC_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_IRC, \
-    EmpathyAccountsPluginIrcClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_IRC_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c
deleted file mode 100644
index fffe98364..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-jabber.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-jabber.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginJabber, empathy_accounts_plugin_jabber,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_jabber_class_init (
-    EmpathyAccountsPluginJabberClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_jabber_init (EmpathyAccountsPluginJabber *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h
deleted file mode 100644
index c6e67f873..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-jabber.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-jabber.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_JABBER_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_JABBER_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginJabber EmpathyAccountsPluginJabber;
-typedef struct _EmpathyAccountsPluginJabberClass EmpathyAccountsPluginJabberClass;
-
-struct _EmpathyAccountsPluginJabberClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginJabber
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_jabber_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER \
-  (empathy_accounts_plugin_jabber_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_JABBER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER, \
-    EmpathyAccountsPluginJabber))
-#define EMPATHY_ACCOUNTS_PLUGIN_JABBER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER, \
-    EmpathyAccountsPluginJabberClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_JABBER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_JABBER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER))
-#define EMPATHY_ACCOUNTS_PLUGIN_JABBER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_JABBER, \
-    EmpathyAccountsPluginJabberClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_JABBER_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c
deleted file mode 100644
index f46741a5c..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-local-xmpp.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-local-xmpp.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginLocalXmpp, empathy_accounts_plugin_local_xmpp,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_local_xmpp_class_init (
-    EmpathyAccountsPluginLocalXmppClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_local_xmpp_init (EmpathyAccountsPluginLocalXmpp *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h
deleted file mode 100644
index 8c5d56f18..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-local-xmpp.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-local-xmpp.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginLocalXmpp EmpathyAccountsPluginLocalXmpp;
-typedef struct _EmpathyAccountsPluginLocalXmppClass EmpathyAccountsPluginLocalXmppClass;
-
-struct _EmpathyAccountsPluginLocalXmppClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginLocalXmpp
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_local_xmpp_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP \
-  (empathy_accounts_plugin_local_xmpp_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP, \
-    EmpathyAccountsPluginLocalXmpp))
-#define EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP, \
-    EmpathyAccountsPluginLocalXmppClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_LOCAL_XMPP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_LOCAL_XMPP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP))
-#define EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_LOCAL_XMPP, \
-    EmpathyAccountsPluginLocalXmppClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_LOCAL_XMPP_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c
deleted file mode 100644
index 95fdc2fa7..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-mxit.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-mxit.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginMxit, empathy_accounts_plugin_mxit,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_mxit_class_init (
-    EmpathyAccountsPluginMxitClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_mxit_init (EmpathyAccountsPluginMxit *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h
deleted file mode 100644
index 5a80c2c73..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-mxit.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-mxit.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_MXIT_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_MXIT_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginMxit EmpathyAccountsPluginMxit;
-typedef struct _EmpathyAccountsPluginMxitClass EmpathyAccountsPluginMxitClass;
-
-struct _EmpathyAccountsPluginMxitClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginMxit
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_mxit_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT \
-  (empathy_accounts_plugin_mxit_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_MXIT(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT, \
-    EmpathyAccountsPluginMxit))
-#define EMPATHY_ACCOUNTS_PLUGIN_MXIT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT, \
-    EmpathyAccountsPluginMxitClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MXIT(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MXIT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT))
-#define EMPATHY_ACCOUNTS_PLUGIN_MXIT_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MXIT, \
-    EmpathyAccountsPluginMxitClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_MXIT_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c
deleted file mode 100644
index 5b848e200..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-myspace.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-myspace.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginMyspace, empathy_accounts_plugin_myspace,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_myspace_class_init (
-    EmpathyAccountsPluginMyspaceClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_myspace_init (EmpathyAccountsPluginMyspace *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h
deleted file mode 100644
index a6785a86f..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-myspace.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-myspace.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginMyspace EmpathyAccountsPluginMyspace;
-typedef struct _EmpathyAccountsPluginMyspaceClass EmpathyAccountsPluginMyspaceClass;
-
-struct _EmpathyAccountsPluginMyspaceClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginMyspace
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_myspace_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE \
-  (empathy_accounts_plugin_myspace_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_MYSPACE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE, \
-    EmpathyAccountsPluginMyspace))
-#define EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE, \
-    EmpathyAccountsPluginMyspaceClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MYSPACE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_MYSPACE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE))
-#define EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_MYSPACE, \
-    EmpathyAccountsPluginMyspaceClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_MYSPACE_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c
deleted file mode 100644
index e33593421..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sametime.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-sametime.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginSametime, empathy_accounts_plugin_sametime,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_sametime_class_init (
-    EmpathyAccountsPluginSametimeClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_sametime_init (EmpathyAccountsPluginSametime *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h
deleted file mode 100644
index 639ec15e2..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sametime.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sametime.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginSametime EmpathyAccountsPluginSametime;
-typedef struct _EmpathyAccountsPluginSametimeClass EmpathyAccountsPluginSametimeClass;
-
-struct _EmpathyAccountsPluginSametimeClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginSametime
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_sametime_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME \
-  (empathy_accounts_plugin_sametime_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_SAMETIME(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME, \
-    EmpathyAccountsPluginSametime))
-#define EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME, \
-    EmpathyAccountsPluginSametimeClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SAMETIME(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SAMETIME_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME))
-#define EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SAMETIME, \
-    EmpathyAccountsPluginSametimeClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_SAMETIME_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c
deleted file mode 100644
index 483f1b3ce..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sip.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-sip.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginSip, empathy_accounts_plugin_sip,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_sip_class_init (
-    EmpathyAccountsPluginSipClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_sip_init (EmpathyAccountsPluginSip *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h
deleted file mode 100644
index e581f7809..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-sip.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-sip.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_SIP_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_SIP_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginSip EmpathyAccountsPluginSip;
-typedef struct _EmpathyAccountsPluginSipClass EmpathyAccountsPluginSipClass;
-
-struct _EmpathyAccountsPluginSipClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginSip
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_sip_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP \
-  (empathy_accounts_plugin_sip_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_SIP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP, \
-    EmpathyAccountsPluginSip))
-#define EMPATHY_ACCOUNTS_PLUGIN_SIP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP, \
-    EmpathyAccountsPluginSipClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SIP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_SIP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP))
-#define EMPATHY_ACCOUNTS_PLUGIN_SIP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_SIP, \
-    EmpathyAccountsPluginSipClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_SIP_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c
deleted file mode 100644
index 8461bed0b..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoo.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-yahoo.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginYahoo, empathy_accounts_plugin_yahoo,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_yahoo_class_init (
-    EmpathyAccountsPluginYahooClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_yahoo_init (EmpathyAccountsPluginYahoo *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h
deleted file mode 100644
index 2f02c4a30..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoo.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoo.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOO_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_YAHOO_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginYahoo EmpathyAccountsPluginYahoo;
-typedef struct _EmpathyAccountsPluginYahooClass EmpathyAccountsPluginYahooClass;
-
-struct _EmpathyAccountsPluginYahooClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginYahoo
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_yahoo_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO \
-  (empathy_accounts_plugin_yahoo_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO, \
-    EmpathyAccountsPluginYahoo))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO, \
-    EmpathyAccountsPluginYahooClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOO_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOO, \
-    EmpathyAccountsPluginYahooClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOO_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c
deleted file mode 100644
index 12e771b1f..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoojp.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-yahoojp.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginYahoojp, empathy_accounts_plugin_yahoojp,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_yahoojp_class_init (
-    EmpathyAccountsPluginYahoojpClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_yahoojp_init (EmpathyAccountsPluginYahoojp *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h
deleted file mode 100644
index c57634a75..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-yahoojp.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-yahoojp.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginYahoojp EmpathyAccountsPluginYahoojp;
-typedef struct _EmpathyAccountsPluginYahoojpClass EmpathyAccountsPluginYahoojpClass;
-
-struct _EmpathyAccountsPluginYahoojpClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginYahoojp
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_yahoojp_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP \
-  (empathy_accounts_plugin_yahoojp_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP, \
-    EmpathyAccountsPluginYahoojp))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP, \
-    EmpathyAccountsPluginYahoojpClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOOJP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_YAHOOJP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP))
-#define EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_YAHOOJP, \
-    EmpathyAccountsPluginYahoojpClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_YAHOOJP_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c
deleted file mode 100644
index e3d0b4ed3..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-zephyr.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-zephyr.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPluginZephyr, empathy_accounts_plugin_zephyr,\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_zephyr_class_init (
-    EmpathyAccountsPluginZephyrClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_zephyr_init (EmpathyAccountsPluginZephyr *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR;
-}
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h
deleted file mode 100644
index 90bd4c764..000000000
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-zephyr.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-zephyr.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPluginZephyr EmpathyAccountsPluginZephyr;
-typedef struct _EmpathyAccountsPluginZephyrClass EmpathyAccountsPluginZephyrClass;
-
-struct _EmpathyAccountsPluginZephyrClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPluginZephyr
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_zephyr_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR \
-  (empathy_accounts_plugin_zephyr_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR, \
-    EmpathyAccountsPluginZephyr))
-#define EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR, \
-    EmpathyAccountsPluginZephyrClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ZEPHYR(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_ZEPHYR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR))
-#define EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_ZEPHYR, \
-    EmpathyAccountsPluginZephyrClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_ZEPHYR_H__*/
\ No newline at end of file
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index 46e429e43..939912aad 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
@@ -123,3 +123,9 @@ empathy_accounts_plugin_init (EmpathyAccountsPlugin *self)
     }
 
 }
+
+GType
+ap_module_get_object_type (void)
+{
+  return EMPATHY_TYPE_ACCOUNTS_PLUGIN;
+}
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
index bb259c8a1..8f3102596 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.h
@@ -64,6 +64,8 @@ GType empathy_accounts_plugin_get_type (void);
     EMPATHY_TYPE_ACCOUNTS_PLUGIN, \
     EmpathyAccountsPluginClass))
 
+GType ap_module_get_object_type (void);
+
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_H__*/
diff --git a/ubuntu-online-accounts/cc-plugins/generate-plugins.py b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
index a5acab488..2845d3632 100755
--- a/ubuntu-online-accounts/cc-plugins/generate-plugins.py
+++ b/ubuntu-online-accounts/cc-plugins/generate-plugins.py
@@ -25,228 +25,6 @@ class Plugin:
         self.protocol = protocol
         self.icon = icon
 
-##### account-plugins/ #####
-
-def magic_replace(text, protocol):
-    p = protocol.replace('-', '_')
-
-    l = protocol.split('-')
-    l = map(str.title, l)
-    camel = ''.join(l)
-
-    text = text.replace('$lower', p)
-    text = text.replace('$UPPER', p.upper())
-    text = text.replace('$Camel', camel)
-
-    return text
-
-def generate_plugin_header(p):
-    # header
-    f = open('account-plugins/empathy-accounts-plugin-%s.h' % p.protocol, 'w')
-
-    tmp = '''/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-%s.h
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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
- */
-
-
-#ifndef __EMPATHY_ACCOUNTS_PLUGIN_$UPPER_H__
-#define __EMPATHY_ACCOUNTS_PLUGIN_$UPPER_H__
-
-#include "empathy-accounts-plugin.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountsPlugin$Camel EmpathyAccountsPlugin$Camel;
-typedef struct _EmpathyAccountsPlugin$CamelClass EmpathyAccountsPlugin$CamelClass;
-
-struct _EmpathyAccountsPlugin$CamelClass
-{
-  /*<private>*/
-  EmpathyAccountsPluginClass parent_class;
-};
-
-struct _EmpathyAccountsPlugin$Camel
-{
-  /*<private>*/
-  EmpathyAccountsPlugin parent;
-};
-
-GType empathy_accounts_plugin_$lower_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER \\
-  (empathy_accounts_plugin_$lower_get_type ())
-#define EMPATHY_ACCOUNTS_PLUGIN_$UPPER(obj) \\
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \\
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER, \\
-    EmpathyAccountsPlugin$Camel))
-#define EMPATHY_ACCOUNTS_PLUGIN_$UPPER_CLASS(klass) \\
-  (G_TYPE_CHECK_CLASS_CAST((klass), \\
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER, \\
-    EmpathyAccountsPlugin$CamelClass))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_$UPPER(obj) \\
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \\
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER))
-#define EMPATHY_IS_ACCOUNTS_PLUGIN_$UPPER_CLASS(klass) \\
-  (G_TYPE_CHECK_CLASS_TYPE((klass), \\
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER))
-#define EMPATHY_ACCOUNTS_PLUGIN_$UPPER_GET_CLASS(obj) \\
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \\
-    EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER, \\
-    EmpathyAccountsPlugin$CamelClass))
-
-GType ap_module_get_object_type (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNTS_PLUGIN_$UPPER_H__*/''' % (p.protocol)
-
-    f.write(magic_replace (tmp, p.protocol))
-
-def generate_plugin_code(p):
-    # header
-    f = open('account-plugins/empathy-accounts-plugin-%s.c' % p.protocol, 'w')
-
-    tmp = '''/* # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
- * Do NOT edit manually */
-
-/*
- * empathy-accounts-plugin-%s.c
- *
- * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * 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 "empathy-accounts-plugin-%s.h"
-
-G_DEFINE_TYPE (EmpathyAccountsPlugin$Camel, empathy_accounts_plugin_$lower,\\
-        EMPATHY_TYPE_ACCOUNTS_PLUGIN)
-
-static void
-empathy_accounts_plugin_$lower_class_init (
-    EmpathyAccountsPlugin$CamelClass *klass)
-{
-}
-
-static void
-empathy_accounts_plugin_$lower_init (EmpathyAccountsPlugin$Camel *self)
-{
-}
-
-GType
-ap_module_get_object_type (void)
-{
-  return EMPATHY_TYPE_ACCOUNTS_PLUGIN_$UPPER;
-}''' % (p.protocol, p.protocol)
-
-    f.write(magic_replace (tmp, p.protocol))
-
-def generate_build_block(p):
-    la = 'lib%s_la' % p.protocol.replace('-', '_')
-
-    output = '''%s_SOURCES = \\
-	empathy-accounts-plugin-%s.c \\
-	empathy-accounts-plugin-%s.h
-%s_LDFLAGS = -module -avoid-version
-%s_LIBADD = \\
-	libempathy-uoa-account-plugin.la \\
-	$(top_builddir)/libempathy/libempathy.la \\
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
-''' % (la, p.protocol, p.protocol, la, la)
-
-    return output
-
-
-def generate_account_plugins(plugins):
-    '''account-plugins/'''
-    libs = []
-    build_blocks = []
-
-    for p in plugins:
-        # empathy-accounts-plugin-$protocol.[ch]'''
-        generate_plugin_header(p)
-        generate_plugin_code(p)
-
-        name = '	lib%s.la' % p.protocol
-        libs.append(name)
-
-        build_blocks.append(generate_build_block(p))
-
-    # Makefile.am
-    f = open('account-plugins/Makefile.am', 'w')
-
-    f.write(
-'''# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py
-# Do NOT edit manually
-plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
-
-INCLUDES =					\\
-	-I$(top_builddir)			\\
-	-I$(top_srcdir)				\\
-	-DLOCALEDIR=\\""$(datadir)/locale"\\"	\\
-	$(UOA_CFLAGS)				\\
-	$(WARN_CFLAGS)				\\
-	$(ERROR_CFLAGS)				\\
-	$(DISABLE_DEPRECATED)			\\
-	$(EMPATHY_CFLAGS)
-
-pkglib_LTLIBRARIES = libempathy-uoa-account-plugin.la
-
-# this API is not stable and will never be, so use -release to make the
-# SONAME of the plugin library change with every Empathy release.
-libempathy_uoa_account_plugin_la_LDFLAGS = \\
-   -no-undefined \\
-   -release $(VERSION)
-
-libempathy_uoa_account_plugin_la_SOURCES = \\
-	empathy-accounts-plugin.c \\
-	empathy-accounts-plugin.h \\
-	empathy-accounts-plugin-widget.c \\
-	empathy-accounts-plugin-widget.h
-
-libempathy_uoa_account_plugin_la_LIBADD = \\
-	$(UOA_LIBS)
-
-plugin_LTLIBRARIES = \\
-%s \\
-	$(NULL)
-
-%s''' % ('\\\n'.join(libs), '\n\n'.join(build_blocks)))
-
 ##### providers/ #####
 
 def generate_provider_file(p):
@@ -259,6 +37,7 @@ def generate_provider_file(p):
 <provider id="%s">
   <name>%s</name>
   <icon>%s</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
 ''' % (p.protocol, p.name, p.icon))
 
@@ -344,7 +123,6 @@ def generate_all():
     for name, cm, protocol, icon in ALL:
         plugins.append(Plugin(name, cm, protocol, icon))
 
-    generate_account_plugins(plugins)
     generate_providers(plugins)
     generate_services(plugins)
 
diff --git a/ubuntu-online-accounts/cc-plugins/providers/aim.provider b/ubuntu-online-accounts/cc-plugins/providers/aim.provider
index f309431a2..7a7a0ff1f 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/aim.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/aim.provider
@@ -4,4 +4,5 @@
 <provider id="aim">
   <name>AIM</name>
   <icon>aim</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider b/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider
index 8da98e701..3f65c53dc 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/gadugadu.provider
@@ -4,4 +4,5 @@
 <provider id="gadugadu">
   <name>GaduGadu</name>
   <icon>gadugadu</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider b/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider
index 368988da9..284a56554 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/groupwise.provider
@@ -4,4 +4,5 @@
 <provider id="groupwise">
   <name>Groupwise</name>
   <icon>groupwise</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/icq.provider b/ubuntu-online-accounts/cc-plugins/providers/icq.provider
index a225aa47f..31c81f1c9 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/icq.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/icq.provider
@@ -4,4 +4,5 @@
 <provider id="icq">
   <name>ICQ</name>
   <icon>icq</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/irc.provider b/ubuntu-online-accounts/cc-plugins/providers/irc.provider
index ab40288a4..29d434215 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/irc.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/irc.provider
@@ -4,4 +4,5 @@
 <provider id="irc">
   <name>IRC</name>
   <icon>irc</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/jabber.provider b/ubuntu-online-accounts/cc-plugins/providers/jabber.provider
index ff553d245..83e9dd7ef 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/jabber.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/jabber.provider
@@ -4,4 +4,5 @@
 <provider id="jabber">
   <name>Jabber</name>
   <icon>jabber</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider b/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider
index 45f1b3c37..23c5a64f0 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/local-xmpp.provider
@@ -4,4 +4,5 @@
 <provider id="local-xmpp">
   <name>Salut</name>
   <icon>people-nearby</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/mxit.provider b/ubuntu-online-accounts/cc-plugins/providers/mxit.provider
index 4fd3b8c7c..5cc990d45 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/mxit.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/mxit.provider
@@ -4,4 +4,5 @@
 <provider id="mxit">
   <name>Mxit</name>
   <icon>mxit</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/myspace.provider b/ubuntu-online-accounts/cc-plugins/providers/myspace.provider
index d6edad44d..9c4b75594 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/myspace.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/myspace.provider
@@ -4,4 +4,5 @@
 <provider id="myspace">
   <name>Myspace</name>
   <icon>myspace</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/sametime.provider b/ubuntu-online-accounts/cc-plugins/providers/sametime.provider
index b8e3b206c..dd7235cd9 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/sametime.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/sametime.provider
@@ -4,4 +4,5 @@
 <provider id="sametime">
   <name>Sametime</name>
   <icon>sametime</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/sip.provider b/ubuntu-online-accounts/cc-plugins/providers/sip.provider
index 15a62b552..eeb874057 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/sip.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/sip.provider
@@ -4,4 +4,5 @@
 <provider id="sip">
   <name>SIP</name>
   <icon>sip</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider b/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider
index f962e030f..0af592c45 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/yahoo.provider
@@ -4,4 +4,5 @@
 <provider id="yahoo">
   <name>Yahoo!</name>
   <icon>yahoo</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider b/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider
index b83ec8e1f..4fd8e690c 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/yahoojp.provider
@@ -4,4 +4,5 @@
 <provider id="yahoojp">
   <name>Yahoo Japan</name>
   <icon>yahoo</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>
diff --git a/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider b/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider
index 6e21f11a6..2f716cbd4 100644
--- a/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider
+++ b/ubuntu-online-accounts/cc-plugins/providers/zephyr.provider
@@ -4,4 +4,5 @@
 <provider id="zephyr">
   <name>Zephyr</name>
   <icon>zephyr</icon>
+  <plugin>empathy-accounts-plugin</plugin>
 </provider>