Merge lp:~mardy/account-plugins/default-plugin into lp:account-plugins

[Alberto Mardegan]

Add a generic OAuth plugin

Remove most of the binary plugins.

Add a generic OAuth plugin

Remove most of the binary plugins.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:97
http://s-jenkins:8080/job/account-plugins-ci/27/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/27/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/27/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/27/rebuild

review: Needs Fixing (continuous-integration)

[David King (amigadave)]

You are missing src/generic-oauth.vala :-)

review: Needs Fixing

[lp:~mardy/account-plugins/default-plugin]

98. By Alberto Mardegan on 2013-03-19

Add missing files, update .bzrignore

[Alberto Mardegan (mardy)]

Ops, small detail :-)

[David King (amigadave)]

make distcheck fails:

make[2]: Entering directory `/home/david/checkout/account-plugins/default-plugin/account-plugins-0.9/_build/po'
INTLTOOL_EXTRACT="/usr/bin/intltool-extract" XGETTEXT="/usr/bin/xgettext" srcdir=../../po /usr/bin/intltool-update --gettext-package account-plugins --pot
can't open ../../po/../data/providers/google.provider.in: No such file or directory at /usr/bin/intltool-extract line 212.
/usr/bin/xgettext: error while opening "../data/providers/google.provider.in.h" for reading: No such file or directory
ERROR: xgettext failed to generate PO template file. Please consult
       error message above if there is any.
make[2]: *** [account-plugins.pot] Error 1
make[2]: Leaving directory `/home/david/checkout/account-plugins/default-plugin/account-plugins-0.9/_build/po'
make[1]: *** [check-recursive] Error 1
make[1]: Leaving directory `/home/david/checkout/account-plugins/default-plugin/account-plugins-0.9/_build'
make: *** [distcheck] Error 1

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://s-jenkins:8080/job/account-plugins-ci/28/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/28/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/28/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/28/rebuild

review: Approve (continuous-integration)

[lp:~mardy/account-plugins/default-plugin]

99. By Alberto Mardegan on 2013-03-19

Fix make distcheck

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://s-jenkins:8080/job/account-plugins-ci/29/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/29/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/29/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/29/rebuild

review: Approve (continuous-integration)

[David King (amigadave)]

Looking better.

153 dist_noinst_DATA = \
154 - $(providers_in_files) \
155 + $(providers_in_in_files) \

You do not need to distribute the .in.in files, as the configure substitution already pulls them into the distributed files.

[lp:~mardy/account-plugins/default-plugin]

100. By Alberto Mardegan on 2013-03-19

Remove unnecessary mention of .in.in files

These files are required and handled by configure.ac.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://s-jenkins:8080/job/account-plugins-ci/30/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/30/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/30/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/30/rebuild

review: Approve (continuous-integration)

[David King (amigadave)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-12-06 07:30:06 +0000
+++ .bzrignore	2013-03-19 10:39:21 +0000
@@ -19,9 +19,11 @@
 config.sub
 configure
 compile
+/data/providers/*.provider.in
 /debian/account-plugin-facebook/
 /debian/account-plugin-flickr/
 /debian/account-plugin-foursquare/
+/debian/account-plugin-generic-oauth/
 /debian/account-plugin-google/
 /debian/account-plugin-icons/
 /debian/account-plugin-identica/
@@ -48,14 +50,7 @@
 .deps
 .dirstamp
 .libs
-/src/facebook.c
-/src/flickr.c
-/src/foursquare.c
+/src/generic-oauth.c
 /src/google.c
-/src/identica.c
-/src/sina.c
-/src/sohu.c
-/src/twitter.c
-/src/windows-live.c
 /test-provider
 /test-service

=== modified file 'Makefile.am'
--- Makefile.am	2012-12-06 08:05:41 +0000
+++ Makefile.am	2013-03-19 10:39:21 +0000
@@ -8,15 +8,8 @@
 if ENABLE_LIBACCOUNT_PLUGIN
 # Binary account plugins.
 plugin_LTLIBRARIES = \
-	libfacebook.la \
-	libflickr.la \
-	libfoursquare.la \
-	libgoogle.la \
-	libidentica.la \
-	libsina.la \
-	libsohu.la \
-	libtwitter.la \
-	libwindows-live.la
+	libgeneric-oauth.la \
+	libgoogle.la
 
 VALAFLAGS = \
 	--vapidir $(top_srcdir)/src \
@@ -43,59 +36,17 @@
 	-no-undefined \
 	-export-symbols-regex '^ap_module_get_object_type'
 
-libfacebook_la_CPPFLAGS = $(plugin_cppflags)
-libfacebook_la_LIBADD = $(plugin_libadd)
-libfacebook_la_LDFLAGS = $(plugin_ldflags)
-libfacebook_la_SOURCES = \
-	src/facebook.vala
-
-libflickr_la_CPPFLAGS = $(plugin_cppflags)
-libflickr_la_LIBADD = $(plugin_libadd)
-libflickr_la_LDFLAGS = $(plugin_ldflags)
-libflickr_la_SOURCES = \
-	src/flickr.vala
-
-libfoursquare_la_CPPFLAGS = $(plugin_cppflags)
-libfoursquare_la_LIBADD = $(plugin_libadd)
-libfoursquare_la_LDFLAGS = $(plugin_ldflags)
-libfoursquare_la_SOURCES = \
-	src/foursquare.vala
-
 libgoogle_la_CPPFLAGS = $(plugin_cppflags)
 libgoogle_la_LIBADD = $(plugin_libadd)
 libgoogle_la_LDFLAGS = $(plugin_ldflags)
 libgoogle_la_SOURCES = \
 	src/google.vala
 
-libidentica_la_CPPFLAGS = $(plugin_cppflags)
-libidentica_la_LIBADD = $(plugin_libadd)
-libidentica_la_LDFLAGS = $(plugin_ldflags)
-libidentica_la_SOURCES = \
-	src/identica.vala
-
-libsina_la_CPPFLAGS = $(plugin_cppflags)
-libsina_la_LIBADD = $(plugin_libadd)
-libsina_la_LDFLAGS = $(plugin_ldflags)
-libsina_la_SOURCES = \
-	src/sina.vala
-
-libsohu_la_CPPFLAGS = $(plugin_cppflags)
-libsohu_la_LIBADD = $(plugin_libadd)
-libsohu_la_LDFLAGS = $(plugin_ldflags)
-libsohu_la_SOURCES = \
-	src/sohu.vala
-
-libtwitter_la_CPPFLAGS = $(plugin_cppflags)
-libtwitter_la_LIBADD = $(plugin_libadd)
-libtwitter_la_LDFLAGS = $(plugin_ldflags)
-libtwitter_la_SOURCES = \
-	src/twitter.vala
-
-libwindows_live_la_CPPFLAGS = $(plugin_cppflags)
-libwindows_live_la_LIBADD = $(plugin_libadd)
-libwindows_live_la_LDFLAGS = $(plugin_ldflags)
-libwindows_live_la_SOURCES = \
-	src/windows-live.vala
+libgeneric_oauth_la_CPPFLAGS = $(plugin_cppflags)
+libgeneric_oauth_la_LIBADD = $(plugin_libadd)
+libgeneric_oauth_la_LDFLAGS = $(plugin_ldflags)
+libgeneric_oauth_la_SOURCES = \
+	src/generic-oauth.vala
 endif # ENABLE_LIBACCOUNT_PLUGIN
 
 iconsdir = $(datadir)/icons/hicolor/32x32/apps
@@ -127,19 +78,19 @@
 	$(AM_V_at)$(MKDIR_P) $(builddir)/data/providers
 	$(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
 
-providers_in_files = \
-	data/providers/facebook.provider.in \
-	data/providers/flickr.provider.in \
-	data/providers/foursquare.provider.in \
-	data/providers/google.provider.in \
-	data/providers/identica.provider.in \
-	data/providers/sina.provider.in \
-	data/providers/sohu.provider.in \
-	data/providers/twitter.provider.in \
-	data/providers/windows-live.provider.in
+providers_in_in_files = \
+	data/providers/facebook.provider.in.in \
+	data/providers/flickr.provider.in.in \
+	data/providers/foursquare.provider.in.in \
+	data/providers/google.provider.in.in \
+	data/providers/identica.provider.in.in \
+	data/providers/sina.provider.in.in \
+	data/providers/sohu.provider.in.in \
+	data/providers/twitter.provider.in.in \
+	data/providers/windows-live.provider.in.in
 
 providers_DATA = \
-	$(providers_in_files:.provider.in=.provider)
+	$(providers_in_in_files:.provider.in.in=.provider)
 
 # Extract translatable strings from .service files
 %.service: %.service.in $(INTLTOOL_MERGE)
@@ -182,7 +133,6 @@
 	tools/account-console
 
 dist_noinst_DATA = \
-	$(providers_in_files) \
 	$(services_in_files) \
 	src/config.vapi
 

=== modified file 'configure.ac'
--- configure.ac	2013-02-08 07:39:09 +0000
+++ configure.ac	2013-03-19 10:39:21 +0000
@@ -83,8 +83,8 @@
                             [Twitter consumer secret])],
                             [twitter_consumer_secret=$withval],
                             [twitter_consumer_secret="9fvOe8rtOXUeO5MynIaU1JtDEKeQaYmvOt1AjLavHw"])
-AC_DEFINE_UNQUOTED(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"], [Twitter consumer key])
-AC_DEFINE_UNQUOTED(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"], [Twitter consumer secret])
+AC_SUBST(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"])
+AC_SUBST(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"])
 
 # Set Facebook client id
 AC_ARG_WITH(facebook-client-id,
@@ -92,7 +92,7 @@
                             [Facebook client ID])],
                             [facebook_client_id=$withval],
                             [facebook_client_id="302061903208115"])
-AC_DEFINE_UNQUOTED(FACEBOOK_CLIENT_ID, ["$facebook_client_id"], [Facebook client ID])
+AC_SUBST(FACEBOOK_CLIENT_ID, ["$facebook_client_id"])
 
 # Set Flickr consumer key/secret
 AC_ARG_WITH(flickr-consumer-key,
@@ -105,8 +105,8 @@
                             [Flickr consumer secret])],
                             [flickr_consumer_secret=$withval],
                             [flickr_consumer_secret="cbb9e94a8c3fe831"])
-AC_DEFINE_UNQUOTED(FLICKR_CONSUMER_KEY, ["$flickr_consumer_key"], [Flickr consumer key])
-AC_DEFINE_UNQUOTED(FLICKR_CONSUMER_SECRET, ["$flickr_consumer_secret"], [Flickr consumer secret])
+AC_SUBST(FLICKR_CONSUMER_KEY, ["$flickr_consumer_key"])
+AC_SUBST(FLICKR_CONSUMER_SECRET, ["$flickr_consumer_secret"])
 
 # Set Google client id
 AC_ARG_WITH(google-client-id,
@@ -119,8 +119,8 @@
                             [Google client secret])],
                             [google_client_secret=$withval],
                             [google_client_secret="NCB6sQ1OHn3-OamBu8-98M31"])
-AC_DEFINE_UNQUOTED(GOOGLE_CLIENT_ID, ["$google_client_id"], [Google client ID])
-AC_DEFINE_UNQUOTED(GOOGLE_CLIENT_SECRET, ["$google_client_secret"], [Google client secret])
+AC_SUBST(GOOGLE_CLIENT_ID, ["$google_client_id"])
+AC_SUBST(GOOGLE_CLIENT_SECRET, ["$google_client_secret"])
 
 # Set Foursquare client id
 AC_ARG_WITH(foursquare-client-id,
@@ -128,7 +128,7 @@
                             [Foursquare client ID])],
                             [foursquare_client_id=$withval],
                             [foursquare_client_id="BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW"])
-AC_DEFINE_UNQUOTED(FOURSQUARE_CLIENT_ID, ["$foursquare_client_id"], [Foursquare client ID])
+AC_SUBST(FOURSQUARE_CLIENT_ID, ["$foursquare_client_id"])
 
 # Set identi.ca consumer key/secret
 AC_ARG_WITH(identica-consumer-key,
@@ -141,8 +141,8 @@
                             [identi.ca consumer secret])],
                             [identica_consumer_secret=$withval],
                             [identica_consumer_secret="anonymous"])
-AC_DEFINE_UNQUOTED(IDENTICA_CONSUMER_KEY, ["$identica_consumer_key"], [identi.ca consumer key])
-AC_DEFINE_UNQUOTED(IDENTICA_CONSUMER_SECRET, ["$identica_consumer_secret"], [identi.ca consumer secret])
+AC_SUBST(IDENTICA_CONSUMER_KEY, ["$identica_consumer_key"])
+AC_SUBST(IDENTICA_CONSUMER_SECRET, ["$identica_consumer_secret"])
 
 # Set Sina consumer key/secret
 AC_ARG_WITH(sina-consumer-key,
@@ -155,8 +155,8 @@
                             [Sina consumer secret])],
                             [sina_consumer_secret=$withval],
                             [sina_consumer_secret="49443ea72f7545486143f3f074b0b66e"])
-AC_DEFINE_UNQUOTED(SINA_CONSUMER_KEY, ["$sina_consumer_key"], [Sina consumer key])
-AC_DEFINE_UNQUOTED(SINA_CONSUMER_SECRET, ["$sina_consumer_secret"], [Sina consumer secret])
+AC_SUBST(SINA_CONSUMER_KEY, ["$sina_consumer_key"])
+AC_SUBST(SINA_CONSUMER_SECRET, ["$sina_consumer_secret"])
 
 # Set Sohu consumer key/secret
 AC_ARG_WITH(sohu-consumer-key,
@@ -169,8 +169,8 @@
                             [Sohu consumer secret])],
                             [sohu_consumer_secret=$withval],
                             [sohu_consumer_secret="!2(z%LRmy7xTN(x3cm$)2m*domKNT(s00=qN4Vxh"])
-AC_DEFINE_UNQUOTED(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"], [Sohu consumer key])
-AC_DEFINE_UNQUOTED(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"], [Sohu consumer secret])
+AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])
+AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"])
 
 # Set Windows Live client id
 AC_ARG_WITH(windows-live-client-id,
@@ -178,9 +178,18 @@
                             [Windows Live client ID])],
                             [windows_live_client_id=$withval],
                             [windows_live_client_id="00000000480CBF28"])
-AC_DEFINE_UNQUOTED(WINDOWS_LIVE_CLIENT_ID, ["$windows_live_client_id"], [Windows Live client ID])
+AC_SUBST(WINDOWS_LIVE_CLIENT_ID, ["$windows_live_client_id"])
 
 AC_CONFIG_FILES([
+	data/providers/facebook.provider.in
+	data/providers/flickr.provider.in
+	data/providers/foursquare.provider.in
+	data/providers/google.provider.in
+	data/providers/identica.provider.in
+	data/providers/sina.provider.in
+	data/providers/sohu.provider.in
+	data/providers/twitter.provider.in
+	data/providers/windows-live.provider.in
 	Makefile
 	po/Makefile.in
 ])

=== renamed file 'data/providers/facebook.provider.in' => 'data/providers/facebook.provider.in.in'
--- data/providers/facebook.provider.in	2013-02-06 13:20:22 +0000
+++ data/providers/facebook.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>facebook</icon>
   <translations>account-plugins</translations>
   <domains>.*facebook\.com</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -16,6 +17,7 @@
           <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
           <setting name="Display">popup</setting>
           <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
+          <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
         </group>
       </group>
     </group>

=== renamed file 'data/providers/flickr.provider.in' => 'data/providers/flickr.provider.in.in'
--- data/providers/flickr.provider.in	2013-02-20 06:32:23 +0000
+++ data/providers/flickr.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>flickr</icon>
   <translations>account-plugins</translations>
   <domains>.*flickr\.com</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -15,6 +16,8 @@
           <setting name="TokenEndpoint">https://secure.flickr.com/services/oauth/access_token</setting>
           <setting name="AuthorizationEndpoint">https://secure.flickr.com/services/oauth/authorize</setting>
           <setting name="Callback">https://wiki.ubuntu.com/</setting>
+          <setting name="ConsumerKey">@FLICKR_CONSUMER_KEY@</setting>
+          <setting name="ConsumerSecret">@FLICKR_CONSUMER_SECRET@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>
         </group>
       </group>

=== renamed file 'data/providers/foursquare.provider.in' => 'data/providers/foursquare.provider.in.in'
--- data/providers/foursquare.provider.in	2013-02-07 14:09:18 +0000
+++ data/providers/foursquare.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>foursquare</icon>
   <translations>account-plugins</translations>
   <domains>.*foursquare\.com</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -16,6 +17,7 @@
           <setting name="RedirectUri">http://gwibber.com/0/auth.html</setting>
           <setting name="Display">touch</setting>
           <setting name="ResponseType">token</setting>
+          <setting name="ClientId">@FOURSQUARE_CLIENT_ID@</setting>
         </group>
       </group>
     </group>

=== renamed file 'data/providers/google.provider.in' => 'data/providers/google.provider.in.in'
--- data/providers/google.provider.in	2013-02-07 14:09:18 +0000
+++ data/providers/google.provider.in.in	2013-03-19 10:39:21 +0000
@@ -20,6 +20,8 @@
                order to return a refresh token -->
           <setting name="ResponseType">code&amp;access_type=offline</setting>
           <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/']</setting>
+          <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
+          <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>
         </group>
       </group>

=== renamed file 'data/providers/identica.provider.in' => 'data/providers/identica.provider.in.in'
--- data/providers/identica.provider.in	2013-02-20 06:32:23 +0000
+++ data/providers/identica.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>identica</icon>
   <translations>account-plugins</translations>
   <domains>.*identi\.ca</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -14,6 +15,8 @@
           <setting name="RequestEndpoint">https://identi.ca/api/oauth/request_token</setting>
           <setting name="TokenEndpoint">https://identi.ca/api/oauth/access_token</setting>
           <setting name="AuthorizationEndpoint">https://identi.ca/api/oauth/authorize</setting>
+          <setting name="ConsumerKey">@IDENTICA_CONSUMER_KEY@</setting>
+          <setting name="ConsumerSecret">@IDENTICA_CONSUMER_SECRET@</setting>
           <setting name="Callback">https://wiki.ubuntu.com/</setting>
           <setting name="Source">Ubuntu</setting>
           <setting name="Mode">desktop</setting>

=== renamed file 'data/providers/sina.provider.in' => 'data/providers/sina.provider.in.in'
--- data/providers/sina.provider.in	2013-02-20 06:32:23 +0000
+++ data/providers/sina.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>sina</icon>
   <translations>account-plugins</translations>
   <domains>.*t\.sina\.com\.cn</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -15,6 +16,8 @@
           <setting name="TokenEndpoint">http://api.t.sina.com.cn/oauth/access_token</setting>
           <setting name="AuthorizationEndpoint">http://api.t.sina.com.cn/oauth/authorize</setting>
           <setting name="Callback">http://wiki.ubuntu.com/</setting>
+          <setting name="ConsumerKey">@SINA_CONSUMER_KEY@</setting>
+          <setting name="ConsumerSecret">@SINA_CONSUMER_SECRET@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>
         </group>
       </group>

=== renamed file 'data/providers/sohu.provider.in' => 'data/providers/sohu.provider.in.in'
--- data/providers/sohu.provider.in	2013-02-20 06:32:23 +0000
+++ data/providers/sohu.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>sohu</icon>
   <translations>account-plugins</translations>
   <domains>.*t\.sohu\.com</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -15,6 +16,8 @@
           <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting>
           <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting>
           <setting name="Callback">https://wiki.ubuntu.com/</setting>
+          <setting name="ConsumerKey">@SOHU_CONSUMER_KEY@</setting>
+          <setting name="ConsumerSecret">@SOHU_CONSUMER_SECRET@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>
         </group>
       </group>

=== renamed file 'data/providers/twitter.provider.in' => 'data/providers/twitter.provider.in.in'
--- data/providers/twitter.provider.in	2013-02-20 06:32:23 +0000
+++ data/providers/twitter.provider.in.in	2013-03-19 10:39:21 +0000
@@ -3,6 +3,7 @@
   <name>Twitter</name>
   <icon>twitter</icon>
   <translations>account-plugins</translations>
+  <plugin>generic-oauth</plugin>
   <domains>.*twitter\.com</domains>
 
   <template>
@@ -15,6 +16,8 @@
           <setting name="TokenEndpoint">https://api.twitter.com/oauth/access_token</setting>
           <setting name="AuthorizationEndpoint">https://api.twitter.com/oauth/authorize</setting>
           <setting name="Callback">https://wiki.ubuntu.com/</setting>
+          <setting name="ConsumerKey">@TWITTER_CONSUMER_KEY@</setting>
+          <setting name="ConsumerSecret">@TWITTER_CONSUMER_SECRET@</setting>
         </group>
       </group>
     </group>

=== renamed file 'data/providers/windows-live.provider.in' => 'data/providers/windows-live.provider.in.in'
--- data/providers/windows-live.provider.in	2013-02-07 14:09:18 +0000
+++ data/providers/windows-live.provider.in.in	2013-03-19 10:39:21 +0000
@@ -4,6 +4,7 @@
   <icon>live</icon>
   <translations>account-plugins</translations>
   <domains>.*live\.com</domains>
+  <plugin>generic-oauth</plugin>
 
   <template>
     <group name="auth">
@@ -17,6 +18,7 @@
           <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting>
           <setting name="ResponseType">code</setting>
           <setting name="Scope" type="as">['wl.messenger','wl.offline_access','wl.emails']</setting>
+          <setting name="ClientId">@WINDOWS_LIVE_CLIENT_ID@</setting>
         </group>
       </group>
     </group>

=== modified file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-facebook.install	2013-03-19 10:39:21 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/www.facebook.com.conf
-usr/lib/libaccount-plugin-1.0/providers/libfacebook.so
 usr/share/accounts/services/facebook-sharing.service
 usr/share/accounts/services/facebook-microblog.service
 usr/share/accounts/services/facebook-im.service

=== modified file 'debian/account-plugin-flickr.install'
--- debian/account-plugin-flickr.install	2012-11-23 10:02:52 +0000
+++ debian/account-plugin-flickr.install	2013-03-19 10:39:21 +0000
@@ -1,6 +1,5 @@
 etc/signon-ui/webkit-options.d/login.yahoo.com.conf
 etc/signon-ui/webkit-options.d/secure.flickr.com.conf
-usr/lib/libaccount-plugin-1.0/providers/libflickr.so
 usr/share/accounts/services/flickr-*.service
 usr/share/accounts/providers/flickr.provider
 usr/share/icons/hicolor/32x32/apps/flickr.png

=== modified file 'debian/account-plugin-foursquare.install'
--- debian/account-plugin-foursquare.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-foursquare.install	2013-03-19 10:39:21 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/foursquare.com.conf
-usr/lib/libaccount-plugin-1.0/providers/libfoursquare.so
 usr/share/accounts/services/foursquare-microblog.service
 usr/share/accounts/providers/foursquare.provider
 usr/share/icons/hicolor/32x32/apps/foursquare.png

=== added file 'debian/account-plugin-generic-oauth.install'
--- debian/account-plugin-generic-oauth.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-generic-oauth.install	2013-03-19 10:39:21 +0000
@@ -0,0 +1,1 @@
+usr/lib/libaccount-plugin-1.0/providers/libgeneric-oauth.so

=== modified file 'debian/account-plugin-identica.install'
--- debian/account-plugin-identica.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-identica.install	2013-03-19 10:39:21 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/identi.ca.conf
-usr/lib/libaccount-plugin-1.0/providers/libidentica.so
 usr/share/accounts/services/identica-microblog.service
 usr/share/accounts/providers/identica.provider
 usr/share/icons/hicolor/32x32/apps/identica.png

=== modified file 'debian/account-plugin-sina.install'
--- debian/account-plugin-sina.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-sina.install	2013-03-19 10:39:21 +0000
@@ -1,4 +1,3 @@
 etc/signon-ui/webkit-options.d/api.t.sina.com.cn.conf
-usr/lib/libaccount-plugin-1.0/providers/libsina.so
 usr/share/accounts/services/sina-microblog.service
 usr/share/accounts/providers/sina.provider

=== modified file 'debian/account-plugin-sohu.install'
--- debian/account-plugin-sohu.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-sohu.install	2013-03-19 10:39:21 +0000
@@ -1,4 +1,3 @@
 etc/signon-ui/webkit-options.d/api.t.sohu.com.conf
-usr/lib/libaccount-plugin-1.0/providers/libsohu.so
 usr/share/accounts/services/sohu-microblog.service
 usr/share/accounts/providers/sohu.provider

=== modified file 'debian/account-plugin-twitter.install'
--- debian/account-plugin-twitter.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-twitter.install	2013-03-19 10:39:21 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/api.twitter.com.conf
-usr/lib/libaccount-plugin-1.0/providers/libtwitter.so
 usr/share/accounts/services/twitter-microblog.service
 usr/share/accounts/providers/twitter.provider
 usr/share/icons/hicolor/32x32/apps/twitter.png

=== modified file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install	2012-11-09 16:15:25 +0000
+++ debian/account-plugin-windows-live.install	2013-03-19 10:39:21 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/login.live.com.conf
-usr/lib/libaccount-plugin-1.0/providers/libwindows-live.so
 usr/share/accounts/services/wlm.service
 usr/share/accounts/providers/windows-live.provider
 usr/share/icons/hicolor/32x32/apps/live.png

=== modified file 'debian/control'
--- debian/control	2013-03-14 13:05:21 +0000
+++ debian/control	2013-03-19 10:39:21 +0000
@@ -20,6 +20,14 @@
 # just go ahead.  ~online-accounts will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk
 
+Package: account-plugin-generic-oauth
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - generic OAuth
+ GNOME Control Center account plugins for single signon
+
 Package: account-plugin-google
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -30,65 +38,57 @@
 
 Package: account-plugin-facebook
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - facebook
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-twitter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - twitter
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-flickr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - flickr
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-identica
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - identica
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-foursquare
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - foursquare
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-windows-live
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - windows live
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-sohu
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - sohu
  GNOME Control Center account plugins for single signon
 
 Package: account-plugin-sina
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-        signon-keyring-extension,
-        signon-plugin-oauth2
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth
 Description: GNOME Control Center account plugin for single signon - sina
  GNOME Control Center account plugins for single signon
 

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-10-05 07:39:20 +0000
+++ po/POTFILES.in	2013-03-19 10:39:21 +0000
@@ -1,1 +1,1 @@
-[type: gettext/xml]data/providers/google.provider.in
+[type: gettext/xml]data/providers/google.provider.in.in

=== removed file 'src/facebook.vala'
--- src/facebook.vala	2013-02-06 13:20:22 +0000
+++ src/facebook.vala	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      Alberto Mardegan <[e-mail]>
- */
-
-public class FacebookPlugin : Ap.OAuthPlugin {
-    public FacebookPlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID);
-        set_oauth_parameters (oauth_params);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (FacebookPlugin);
-}

=== removed file 'src/flickr.vala'
--- src/flickr.vala	2013-02-07 14:09:18 +0000
+++ src/flickr.vala	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      Alberto Mardegan <[e-mail]>
- */
-
-public class FlickrPlugin : Ap.OAuthPlugin {
-    public FlickrPlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY);
-        oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET);
-        set_oauth_parameters (oauth_params);
-
-        set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (FlickrPlugin);
-}

=== removed file 'src/foursquare.vala'
--- src/foursquare.vala	2013-02-07 14:09:18 +0000
+++ src/foursquare.vala	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      David King <[e-mail]
- */
-
-public class FoursquarePlugin : Ap.OAuthPlugin {
-    public FoursquarePlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ClientId",
-                             "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW");
-        set_oauth_parameters (oauth_params);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (FoursquarePlugin);
-}

=== added file 'src/generic-oauth.vala'
--- src/generic-oauth.vala	1970-01-01 00:00:00 +0000
+++ src/generic-oauth.vala	2013-03-19 10:39:21 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Canonical, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * Authors:
+ *      Alberto Mardegan <[e-mail]>
+ */
+
+public class GenericOAuthPlugin : Ap.OAuthPlugin {
+    public GenericOAuthPlugin (Ag.Account account) {
+        Object (account: account);
+    }
+}
+
+public GLib.Type ap_module_get_object_type ()
+{
+    return typeof (GenericOAuthPlugin);
+}

=== modified file 'src/google.vala'
--- src/google.vala	2013-02-07 14:09:18 +0000
+++ src/google.vala	2013-03-19 10:39:21 +0000
@@ -20,34 +20,13 @@
  */
 
 public class GooglePlugin : Ap.OAuthPlugin {
-    private enum ParametersUser
-    {
-        ACCOUNT_PLUGIN,
-        CLIENT_APPLICATIONS
-    }
-
     public GooglePlugin (Ag.Account account) {
         Object (account: account);
     }
 
     construct
     {
-        var oauth_params = get_parameters (ParametersUser.ACCOUNT_PLUGIN);
-        set_oauth_parameters (oauth_params);
-
-        oauth_params = get_parameters (ParametersUser.CLIENT_APPLICATIONS);
-        set_account_oauth_parameters (oauth_params);
-
-        set_mechanism (Ap.OAuthMechanism.WEB_SERVER);
-
-        set_ignore_cookies (true);
-    }
-
-    private HashTable<string, GLib.Value?> get_parameters (ParametersUser user)
-    {
         var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID);
-        oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET);
 
         /* Note the evil trick here: Google uses a couple of non-standard OAuth
          * parameters: "access_type" and "approval_prompt"; the signon OAuth
@@ -56,16 +35,14 @@
          *
          * We need to specify "access_type=offline" if we want Google to return
          * us a refresh token.
+         * The "approval_prompt=force" string forces Google to ask for
+         * authentication.
          */
-        if (user == ParametersUser.ACCOUNT_PLUGIN)
-        {
-            /* The "approval_prompt=force" string forces Google to ask for
-             * authentication. */
-            oauth_params.insert ("ResponseType",
-                                 "code&access_type=offline&approval_prompt=force");
-        }
+        oauth_params.insert ("ResponseType",
+                             "code&access_type=offline&approval_prompt=force");
+        set_oauth_parameters (oauth_params);
 
-        return oauth_params;
+        set_ignore_cookies (true);
     }
 }
 

=== removed file 'src/identica.vala'
--- src/identica.vala	2013-02-07 14:09:18 +0000
+++ src/identica.vala	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      David King <[e-mail]>
- */
-
-public class IdenticaPlugin : Ap.OAuthPlugin {
-    public IdenticaPlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY);
-        oauth_params.insert ("ConsumerSecret",
-                             Config.IDENTICA_CONSUMER_SECRET);
-        set_oauth_parameters (oauth_params);
-
-        set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (IdenticaPlugin);
-}

=== removed file 'src/sina.vala'
--- src/sina.vala	2013-02-07 14:09:18 +0000
+++ src/sina.vala	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      David King <[e-mail]>
- */
-
-public class SinaPlugin : Ap.OAuthPlugin {
-    public SinaPlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY);
-        oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET);
-        set_oauth_parameters (oauth_params);
-
-        set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (SinaPlugin);
-}

=== removed file 'src/sohu.vala'
--- src/sohu.vala	2013-02-07 14:09:18 +0000
+++ src/sohu.vala	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      David King <[e-mail]>
- */
-
-public class SohuPlugin : Ap.OAuthPlugin {
-    public SohuPlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY);
-        oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET);
-        set_oauth_parameters (oauth_params);
-
-        set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (SohuPlugin);
-}

=== removed file 'src/twitter.vala'
--- src/twitter.vala	2013-02-07 14:09:18 +0000
+++ src/twitter.vala	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      Alberto Mardegan <[e-mail]>
- */
-
-public class TwitterPlugin : Ap.OAuthPlugin {
-    public TwitterPlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY);
-        oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET);
-        set_oauth_parameters (oauth_params);
-
-        set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (TwitterPlugin);
-}

=== removed file 'src/windows-live.vala'
--- src/windows-live.vala	2013-02-07 14:09:18 +0000
+++ src/windows-live.vala	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- *
- * Authors:
- *      Xavier Claessens <[e-mail]>
- */
-
-public class WindowsLivePlugin : Ap.OAuthPlugin {
-    public WindowsLivePlugin (Ag.Account account) {
-        Object (account: account);
-    }
-
-    construct
-    {
-        var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
-        oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID);
-        set_oauth_parameters (oauth_params);
-        set_mechanism(Ap.OAuthMechanism.WEB_SERVER);
-    }
-}
-
-public GLib.Type ap_module_get_object_type ()
-{
-    return typeof (WindowsLivePlugin);
-}