[empathy] UOA: share a common configuration plugin



commit cfef33e79d3d01b5a407381267bd5f481ceca340
Author: Alberto Mardegan <alberto mardegan canonical com>
Date:   Wed Jan 9 12:42:41 2013 +0100

    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

 .../cc-plugins/account-plugins/Makefile.am         |  171 +--------------
 .../account-plugins/empathy-accounts-plugin-aim.c  |   46 ----
 .../account-plugins/empathy-accounts-plugin-aim.h  |   75 -------
 .../empathy-accounts-plugin-gadugadu.c             |   46 ----
 .../empathy-accounts-plugin-gadugadu.h             |   75 -------
 .../empathy-accounts-plugin-groupwise.c            |   46 ----
 .../empathy-accounts-plugin-groupwise.h            |   75 -------
 .../account-plugins/empathy-accounts-plugin-icq.c  |   46 ----
 .../account-plugins/empathy-accounts-plugin-icq.h  |   75 -------
 .../account-plugins/empathy-accounts-plugin-irc.c  |   46 ----
 .../account-plugins/empathy-accounts-plugin-irc.h  |   75 -------
 .../empathy-accounts-plugin-jabber.c               |   46 ----
 .../empathy-accounts-plugin-jabber.h               |   75 -------
 .../empathy-accounts-plugin-local-xmpp.c           |   46 ----
 .../empathy-accounts-plugin-local-xmpp.h           |   75 -------
 .../account-plugins/empathy-accounts-plugin-mxit.c |   46 ----
 .../account-plugins/empathy-accounts-plugin-mxit.h |   75 -------
 .../empathy-accounts-plugin-myspace.c              |   46 ----
 .../empathy-accounts-plugin-myspace.h              |   75 -------
 .../empathy-accounts-plugin-sametime.c             |   46 ----
 .../empathy-accounts-plugin-sametime.h             |   75 -------
 .../account-plugins/empathy-accounts-plugin-sip.c  |   46 ----
 .../account-plugins/empathy-accounts-plugin-sip.h  |   75 -------
 .../empathy-accounts-plugin-yahoo.c                |   46 ----
 .../empathy-accounts-plugin-yahoo.h                |   75 -------
 .../empathy-accounts-plugin-yahoojp.c              |   46 ----
 .../empathy-accounts-plugin-yahoojp.h              |   75 -------
 .../empathy-accounts-plugin-zephyr.c               |   46 ----
 .../empathy-accounts-plugin-zephyr.h               |   75 -------
 .../account-plugins/empathy-accounts-plugin.c      |    6 +
 .../account-plugins/empathy-accounts-plugin.h      |    2 +
 .../cc-plugins/generate-plugins.py                 |  224 +-------------------
 .../cc-plugins/providers/aim.provider              |    1 +
 .../cc-plugins/providers/gadugadu.provider         |    1 +
 .../cc-plugins/providers/groupwise.provider        |    1 +
 .../cc-plugins/providers/icq.provider              |    1 +
 .../cc-plugins/providers/irc.provider              |    1 +
 .../cc-plugins/providers/jabber.provider           |    1 +
 .../cc-plugins/providers/local-xmpp.provider       |    1 +
 .../cc-plugins/providers/mxit.provider             |    1 +
 .../cc-plugins/providers/myspace.provider          |    1 +
 .../cc-plugins/providers/sametime.provider         |    1 +
 .../cc-plugins/providers/sip.provider              |    1 +
 .../cc-plugins/providers/yahoo.provider            |    1 +
 .../cc-plugins/providers/yahoojp.provider          |    1 +
 .../cc-plugins/providers/zephyr.provider           |    1 +
 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 7a5ac57..f76c2fa 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.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index 46e429e..939912a 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 bb259c8..8f31025 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 a5acab4..2845d36 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 f309431..7a7a0ff 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 8da98e7..3f65c53 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 368988d..284a565 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 a225aa4..31c81f1 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 ab40288..29d4342 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 ff553d2..83e9dd7 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 45f1b3c..23c5a64 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 4fd3b8c..5cc990d 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 d6edad4..9c4b755 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 b8e3b20..dd7235c 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 15a62b5..eeb8740 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 f962e03..0af592c 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 b83ec8e..4fd8e69 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 6e21f11..2f716cb 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>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]