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

Proposed by Alberto Mardegan on 2013-03-19
Status: Merged
Approved by: Alberto Mardegan on 2013-03-19
Approved revision: 100
Merged at revision: 93
Proposed branch: lp:~mardy/account-plugins/default-plugin
Merge into: lp:account-plugins
Diff against target: 1096 lines (+131/-475)
33 files modified
.bzrignore (+3/-8)
Makefile.am (+18/-68)
configure.ac (+24/-15)
data/providers/facebook.provider.in.in (+2/-0)
data/providers/flickr.provider.in.in (+3/-0)
data/providers/foursquare.provider.in.in (+2/-0)
data/providers/google.provider.in.in (+2/-0)
data/providers/identica.provider.in.in (+3/-0)
data/providers/sina.provider.in.in (+3/-0)
data/providers/sohu.provider.in.in (+3/-0)
data/providers/twitter.provider.in.in (+3/-0)
data/providers/windows-live.provider.in.in (+2/-0)
debian/account-plugin-facebook.install (+0/-1)
debian/account-plugin-flickr.install (+0/-1)
debian/account-plugin-foursquare.install (+0/-1)
debian/account-plugin-generic-oauth.install (+1/-0)
debian/account-plugin-identica.install (+0/-1)
debian/account-plugin-sina.install (+0/-1)
debian/account-plugin-sohu.install (+0/-1)
debian/account-plugin-twitter.install (+0/-1)
debian/account-plugin-windows-live.install (+0/-1)
debian/control (+24/-24)
po/POTFILES.in (+1/-1)
src/facebook.vala (+0/-38)
src/flickr.vala (+0/-41)
src/foursquare.vala (+0/-39)
src/generic-oauth.vala (+31/-0)
src/google.vala (+6/-29)
src/identica.vala (+0/-42)
src/sina.vala (+0/-41)
src/sohu.vala (+0/-41)
src/twitter.vala (+0/-41)
src/windows-live.vala (+0/-39)
To merge this branch: bzr merge lp:~mardy/account-plugins/default-plugin
Reviewer Review Type Date Requested Status
David King (community) 2013-03-19 Approve on 2013-03-19
PS Jenkins bot (community) continuous-integration Approve on 2013-03-19
Review via email: mp+154008@code.launchpad.net

Commit message

Add a generic OAuth plugin

Remove most of the binary plugins.

Description of the change

Add a generic OAuth plugin

Remove most of the binary plugins.

To post a comment you must log in.
David King (amigadave) wrote :

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

review: Needs Fixing
98. By Alberto Mardegan on 2013-03-19

Add missing files, update .bzrignore

Alberto Mardegan (mardy) wrote :

Ops, small detail :-)

David King (amigadave) wrote :

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
99. By Alberto Mardegan on 2013-03-19

Fix make distcheck

David King (amigadave) wrote :

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.

100. By Alberto Mardegan on 2013-03-19

Remove unnecessary mention of .in.in files

These files are required and handled by configure.ac.

David King (amigadave) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-12-06 07:30:06 +0000
3+++ .bzrignore 2013-03-19 10:39:21 +0000
4@@ -19,9 +19,11 @@
5 config.sub
6 configure
7 compile
8+/data/providers/*.provider.in
9 /debian/account-plugin-facebook/
10 /debian/account-plugin-flickr/
11 /debian/account-plugin-foursquare/
12+/debian/account-plugin-generic-oauth/
13 /debian/account-plugin-google/
14 /debian/account-plugin-icons/
15 /debian/account-plugin-identica/
16@@ -48,14 +50,7 @@
17 .deps
18 .dirstamp
19 .libs
20-/src/facebook.c
21-/src/flickr.c
22-/src/foursquare.c
23+/src/generic-oauth.c
24 /src/google.c
25-/src/identica.c
26-/src/sina.c
27-/src/sohu.c
28-/src/twitter.c
29-/src/windows-live.c
30 /test-provider
31 /test-service
32
33=== modified file 'Makefile.am'
34--- Makefile.am 2012-12-06 08:05:41 +0000
35+++ Makefile.am 2013-03-19 10:39:21 +0000
36@@ -8,15 +8,8 @@
37 if ENABLE_LIBACCOUNT_PLUGIN
38 # Binary account plugins.
39 plugin_LTLIBRARIES = \
40- libfacebook.la \
41- libflickr.la \
42- libfoursquare.la \
43- libgoogle.la \
44- libidentica.la \
45- libsina.la \
46- libsohu.la \
47- libtwitter.la \
48- libwindows-live.la
49+ libgeneric-oauth.la \
50+ libgoogle.la
51
52 VALAFLAGS = \
53 --vapidir $(top_srcdir)/src \
54@@ -43,59 +36,17 @@
55 -no-undefined \
56 -export-symbols-regex '^ap_module_get_object_type'
57
58-libfacebook_la_CPPFLAGS = $(plugin_cppflags)
59-libfacebook_la_LIBADD = $(plugin_libadd)
60-libfacebook_la_LDFLAGS = $(plugin_ldflags)
61-libfacebook_la_SOURCES = \
62- src/facebook.vala
63-
64-libflickr_la_CPPFLAGS = $(plugin_cppflags)
65-libflickr_la_LIBADD = $(plugin_libadd)
66-libflickr_la_LDFLAGS = $(plugin_ldflags)
67-libflickr_la_SOURCES = \
68- src/flickr.vala
69-
70-libfoursquare_la_CPPFLAGS = $(plugin_cppflags)
71-libfoursquare_la_LIBADD = $(plugin_libadd)
72-libfoursquare_la_LDFLAGS = $(plugin_ldflags)
73-libfoursquare_la_SOURCES = \
74- src/foursquare.vala
75-
76 libgoogle_la_CPPFLAGS = $(plugin_cppflags)
77 libgoogle_la_LIBADD = $(plugin_libadd)
78 libgoogle_la_LDFLAGS = $(plugin_ldflags)
79 libgoogle_la_SOURCES = \
80 src/google.vala
81
82-libidentica_la_CPPFLAGS = $(plugin_cppflags)
83-libidentica_la_LIBADD = $(plugin_libadd)
84-libidentica_la_LDFLAGS = $(plugin_ldflags)
85-libidentica_la_SOURCES = \
86- src/identica.vala
87-
88-libsina_la_CPPFLAGS = $(plugin_cppflags)
89-libsina_la_LIBADD = $(plugin_libadd)
90-libsina_la_LDFLAGS = $(plugin_ldflags)
91-libsina_la_SOURCES = \
92- src/sina.vala
93-
94-libsohu_la_CPPFLAGS = $(plugin_cppflags)
95-libsohu_la_LIBADD = $(plugin_libadd)
96-libsohu_la_LDFLAGS = $(plugin_ldflags)
97-libsohu_la_SOURCES = \
98- src/sohu.vala
99-
100-libtwitter_la_CPPFLAGS = $(plugin_cppflags)
101-libtwitter_la_LIBADD = $(plugin_libadd)
102-libtwitter_la_LDFLAGS = $(plugin_ldflags)
103-libtwitter_la_SOURCES = \
104- src/twitter.vala
105-
106-libwindows_live_la_CPPFLAGS = $(plugin_cppflags)
107-libwindows_live_la_LIBADD = $(plugin_libadd)
108-libwindows_live_la_LDFLAGS = $(plugin_ldflags)
109-libwindows_live_la_SOURCES = \
110- src/windows-live.vala
111+libgeneric_oauth_la_CPPFLAGS = $(plugin_cppflags)
112+libgeneric_oauth_la_LIBADD = $(plugin_libadd)
113+libgeneric_oauth_la_LDFLAGS = $(plugin_ldflags)
114+libgeneric_oauth_la_SOURCES = \
115+ src/generic-oauth.vala
116 endif # ENABLE_LIBACCOUNT_PLUGIN
117
118 iconsdir = $(datadir)/icons/hicolor/32x32/apps
119@@ -127,19 +78,19 @@
120 $(AM_V_at)$(MKDIR_P) $(builddir)/data/providers
121 $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
122
123-providers_in_files = \
124- data/providers/facebook.provider.in \
125- data/providers/flickr.provider.in \
126- data/providers/foursquare.provider.in \
127- data/providers/google.provider.in \
128- data/providers/identica.provider.in \
129- data/providers/sina.provider.in \
130- data/providers/sohu.provider.in \
131- data/providers/twitter.provider.in \
132- data/providers/windows-live.provider.in
133+providers_in_in_files = \
134+ data/providers/facebook.provider.in.in \
135+ data/providers/flickr.provider.in.in \
136+ data/providers/foursquare.provider.in.in \
137+ data/providers/google.provider.in.in \
138+ data/providers/identica.provider.in.in \
139+ data/providers/sina.provider.in.in \
140+ data/providers/sohu.provider.in.in \
141+ data/providers/twitter.provider.in.in \
142+ data/providers/windows-live.provider.in.in
143
144 providers_DATA = \
145- $(providers_in_files:.provider.in=.provider)
146+ $(providers_in_in_files:.provider.in.in=.provider)
147
148 # Extract translatable strings from .service files
149 %.service: %.service.in $(INTLTOOL_MERGE)
150@@ -182,7 +133,6 @@
151 tools/account-console
152
153 dist_noinst_DATA = \
154- $(providers_in_files) \
155 $(services_in_files) \
156 src/config.vapi
157
158
159=== modified file 'configure.ac'
160--- configure.ac 2013-02-08 07:39:09 +0000
161+++ configure.ac 2013-03-19 10:39:21 +0000
162@@ -83,8 +83,8 @@
163 [Twitter consumer secret])],
164 [twitter_consumer_secret=$withval],
165 [twitter_consumer_secret="9fvOe8rtOXUeO5MynIaU1JtDEKeQaYmvOt1AjLavHw"])
166-AC_DEFINE_UNQUOTED(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"], [Twitter consumer key])
167-AC_DEFINE_UNQUOTED(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"], [Twitter consumer secret])
168+AC_SUBST(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"])
169+AC_SUBST(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"])
170
171 # Set Facebook client id
172 AC_ARG_WITH(facebook-client-id,
173@@ -92,7 +92,7 @@
174 [Facebook client ID])],
175 [facebook_client_id=$withval],
176 [facebook_client_id="302061903208115"])
177-AC_DEFINE_UNQUOTED(FACEBOOK_CLIENT_ID, ["$facebook_client_id"], [Facebook client ID])
178+AC_SUBST(FACEBOOK_CLIENT_ID, ["$facebook_client_id"])
179
180 # Set Flickr consumer key/secret
181 AC_ARG_WITH(flickr-consumer-key,
182@@ -105,8 +105,8 @@
183 [Flickr consumer secret])],
184 [flickr_consumer_secret=$withval],
185 [flickr_consumer_secret="cbb9e94a8c3fe831"])
186-AC_DEFINE_UNQUOTED(FLICKR_CONSUMER_KEY, ["$flickr_consumer_key"], [Flickr consumer key])
187-AC_DEFINE_UNQUOTED(FLICKR_CONSUMER_SECRET, ["$flickr_consumer_secret"], [Flickr consumer secret])
188+AC_SUBST(FLICKR_CONSUMER_KEY, ["$flickr_consumer_key"])
189+AC_SUBST(FLICKR_CONSUMER_SECRET, ["$flickr_consumer_secret"])
190
191 # Set Google client id
192 AC_ARG_WITH(google-client-id,
193@@ -119,8 +119,8 @@
194 [Google client secret])],
195 [google_client_secret=$withval],
196 [google_client_secret="NCB6sQ1OHn3-OamBu8-98M31"])
197-AC_DEFINE_UNQUOTED(GOOGLE_CLIENT_ID, ["$google_client_id"], [Google client ID])
198-AC_DEFINE_UNQUOTED(GOOGLE_CLIENT_SECRET, ["$google_client_secret"], [Google client secret])
199+AC_SUBST(GOOGLE_CLIENT_ID, ["$google_client_id"])
200+AC_SUBST(GOOGLE_CLIENT_SECRET, ["$google_client_secret"])
201
202 # Set Foursquare client id
203 AC_ARG_WITH(foursquare-client-id,
204@@ -128,7 +128,7 @@
205 [Foursquare client ID])],
206 [foursquare_client_id=$withval],
207 [foursquare_client_id="BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW"])
208-AC_DEFINE_UNQUOTED(FOURSQUARE_CLIENT_ID, ["$foursquare_client_id"], [Foursquare client ID])
209+AC_SUBST(FOURSQUARE_CLIENT_ID, ["$foursquare_client_id"])
210
211 # Set identi.ca consumer key/secret
212 AC_ARG_WITH(identica-consumer-key,
213@@ -141,8 +141,8 @@
214 [identi.ca consumer secret])],
215 [identica_consumer_secret=$withval],
216 [identica_consumer_secret="anonymous"])
217-AC_DEFINE_UNQUOTED(IDENTICA_CONSUMER_KEY, ["$identica_consumer_key"], [identi.ca consumer key])
218-AC_DEFINE_UNQUOTED(IDENTICA_CONSUMER_SECRET, ["$identica_consumer_secret"], [identi.ca consumer secret])
219+AC_SUBST(IDENTICA_CONSUMER_KEY, ["$identica_consumer_key"])
220+AC_SUBST(IDENTICA_CONSUMER_SECRET, ["$identica_consumer_secret"])
221
222 # Set Sina consumer key/secret
223 AC_ARG_WITH(sina-consumer-key,
224@@ -155,8 +155,8 @@
225 [Sina consumer secret])],
226 [sina_consumer_secret=$withval],
227 [sina_consumer_secret="49443ea72f7545486143f3f074b0b66e"])
228-AC_DEFINE_UNQUOTED(SINA_CONSUMER_KEY, ["$sina_consumer_key"], [Sina consumer key])
229-AC_DEFINE_UNQUOTED(SINA_CONSUMER_SECRET, ["$sina_consumer_secret"], [Sina consumer secret])
230+AC_SUBST(SINA_CONSUMER_KEY, ["$sina_consumer_key"])
231+AC_SUBST(SINA_CONSUMER_SECRET, ["$sina_consumer_secret"])
232
233 # Set Sohu consumer key/secret
234 AC_ARG_WITH(sohu-consumer-key,
235@@ -169,8 +169,8 @@
236 [Sohu consumer secret])],
237 [sohu_consumer_secret=$withval],
238 [sohu_consumer_secret="!2(z%LRmy7xTN(x3cm$)2m*domKNT(s00=qN4Vxh"])
239-AC_DEFINE_UNQUOTED(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"], [Sohu consumer key])
240-AC_DEFINE_UNQUOTED(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"], [Sohu consumer secret])
241+AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])
242+AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"])
243
244 # Set Windows Live client id
245 AC_ARG_WITH(windows-live-client-id,
246@@ -178,9 +178,18 @@
247 [Windows Live client ID])],
248 [windows_live_client_id=$withval],
249 [windows_live_client_id="00000000480CBF28"])
250-AC_DEFINE_UNQUOTED(WINDOWS_LIVE_CLIENT_ID, ["$windows_live_client_id"], [Windows Live client ID])
251+AC_SUBST(WINDOWS_LIVE_CLIENT_ID, ["$windows_live_client_id"])
252
253 AC_CONFIG_FILES([
254+ data/providers/facebook.provider.in
255+ data/providers/flickr.provider.in
256+ data/providers/foursquare.provider.in
257+ data/providers/google.provider.in
258+ data/providers/identica.provider.in
259+ data/providers/sina.provider.in
260+ data/providers/sohu.provider.in
261+ data/providers/twitter.provider.in
262+ data/providers/windows-live.provider.in
263 Makefile
264 po/Makefile.in
265 ])
266
267=== renamed file 'data/providers/facebook.provider.in' => 'data/providers/facebook.provider.in.in'
268--- data/providers/facebook.provider.in 2013-02-06 13:20:22 +0000
269+++ data/providers/facebook.provider.in.in 2013-03-19 10:39:21 +0000
270@@ -4,6 +4,7 @@
271 <icon>facebook</icon>
272 <translations>account-plugins</translations>
273 <domains>.*facebook\.com</domains>
274+ <plugin>generic-oauth</plugin>
275
276 <template>
277 <group name="auth">
278@@ -16,6 +17,7 @@
279 <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
280 <setting name="Display">popup</setting>
281 <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
282+ <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
283 </group>
284 </group>
285 </group>
286
287=== renamed file 'data/providers/flickr.provider.in' => 'data/providers/flickr.provider.in.in'
288--- data/providers/flickr.provider.in 2013-02-20 06:32:23 +0000
289+++ data/providers/flickr.provider.in.in 2013-03-19 10:39:21 +0000
290@@ -4,6 +4,7 @@
291 <icon>flickr</icon>
292 <translations>account-plugins</translations>
293 <domains>.*flickr\.com</domains>
294+ <plugin>generic-oauth</plugin>
295
296 <template>
297 <group name="auth">
298@@ -15,6 +16,8 @@
299 <setting name="TokenEndpoint">https://secure.flickr.com/services/oauth/access_token</setting>
300 <setting name="AuthorizationEndpoint">https://secure.flickr.com/services/oauth/authorize</setting>
301 <setting name="Callback">https://wiki.ubuntu.com/</setting>
302+ <setting name="ConsumerKey">@FLICKR_CONSUMER_KEY@</setting>
303+ <setting name="ConsumerSecret">@FLICKR_CONSUMER_SECRET@</setting>
304 <setting name="AllowedSchemes" type="as">['https','http']</setting>
305 </group>
306 </group>
307
308=== renamed file 'data/providers/foursquare.provider.in' => 'data/providers/foursquare.provider.in.in'
309--- data/providers/foursquare.provider.in 2013-02-07 14:09:18 +0000
310+++ data/providers/foursquare.provider.in.in 2013-03-19 10:39:21 +0000
311@@ -4,6 +4,7 @@
312 <icon>foursquare</icon>
313 <translations>account-plugins</translations>
314 <domains>.*foursquare\.com</domains>
315+ <plugin>generic-oauth</plugin>
316
317 <template>
318 <group name="auth">
319@@ -16,6 +17,7 @@
320 <setting name="RedirectUri">http://gwibber.com/0/auth.html</setting>
321 <setting name="Display">touch</setting>
322 <setting name="ResponseType">token</setting>
323+ <setting name="ClientId">@FOURSQUARE_CLIENT_ID@</setting>
324 </group>
325 </group>
326 </group>
327
328=== renamed file 'data/providers/google.provider.in' => 'data/providers/google.provider.in.in'
329--- data/providers/google.provider.in 2013-02-07 14:09:18 +0000
330+++ data/providers/google.provider.in.in 2013-03-19 10:39:21 +0000
331@@ -20,6 +20,8 @@
332 order to return a refresh token -->
333 <setting name="ResponseType">code&amp;access_type=offline</setting>
334 <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>
335+ <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
336+ <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
337 <setting name="AllowedSchemes" type="as">['https','http']</setting>
338 </group>
339 </group>
340
341=== renamed file 'data/providers/identica.provider.in' => 'data/providers/identica.provider.in.in'
342--- data/providers/identica.provider.in 2013-02-20 06:32:23 +0000
343+++ data/providers/identica.provider.in.in 2013-03-19 10:39:21 +0000
344@@ -4,6 +4,7 @@
345 <icon>identica</icon>
346 <translations>account-plugins</translations>
347 <domains>.*identi\.ca</domains>
348+ <plugin>generic-oauth</plugin>
349
350 <template>
351 <group name="auth">
352@@ -14,6 +15,8 @@
353 <setting name="RequestEndpoint">https://identi.ca/api/oauth/request_token</setting>
354 <setting name="TokenEndpoint">https://identi.ca/api/oauth/access_token</setting>
355 <setting name="AuthorizationEndpoint">https://identi.ca/api/oauth/authorize</setting>
356+ <setting name="ConsumerKey">@IDENTICA_CONSUMER_KEY@</setting>
357+ <setting name="ConsumerSecret">@IDENTICA_CONSUMER_SECRET@</setting>
358 <setting name="Callback">https://wiki.ubuntu.com/</setting>
359 <setting name="Source">Ubuntu</setting>
360 <setting name="Mode">desktop</setting>
361
362=== renamed file 'data/providers/sina.provider.in' => 'data/providers/sina.provider.in.in'
363--- data/providers/sina.provider.in 2013-02-20 06:32:23 +0000
364+++ data/providers/sina.provider.in.in 2013-03-19 10:39:21 +0000
365@@ -4,6 +4,7 @@
366 <icon>sina</icon>
367 <translations>account-plugins</translations>
368 <domains>.*t\.sina\.com\.cn</domains>
369+ <plugin>generic-oauth</plugin>
370
371 <template>
372 <group name="auth">
373@@ -15,6 +16,8 @@
374 <setting name="TokenEndpoint">http://api.t.sina.com.cn/oauth/access_token</setting>
375 <setting name="AuthorizationEndpoint">http://api.t.sina.com.cn/oauth/authorize</setting>
376 <setting name="Callback">http://wiki.ubuntu.com/</setting>
377+ <setting name="ConsumerKey">@SINA_CONSUMER_KEY@</setting>
378+ <setting name="ConsumerSecret">@SINA_CONSUMER_SECRET@</setting>
379 <setting name="AllowedSchemes" type="as">['https','http']</setting>
380 </group>
381 </group>
382
383=== renamed file 'data/providers/sohu.provider.in' => 'data/providers/sohu.provider.in.in'
384--- data/providers/sohu.provider.in 2013-02-20 06:32:23 +0000
385+++ data/providers/sohu.provider.in.in 2013-03-19 10:39:21 +0000
386@@ -4,6 +4,7 @@
387 <icon>sohu</icon>
388 <translations>account-plugins</translations>
389 <domains>.*t\.sohu\.com</domains>
390+ <plugin>generic-oauth</plugin>
391
392 <template>
393 <group name="auth">
394@@ -15,6 +16,8 @@
395 <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting>
396 <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting>
397 <setting name="Callback">https://wiki.ubuntu.com/</setting>
398+ <setting name="ConsumerKey">@SOHU_CONSUMER_KEY@</setting>
399+ <setting name="ConsumerSecret">@SOHU_CONSUMER_SECRET@</setting>
400 <setting name="AllowedSchemes" type="as">['https','http']</setting>
401 </group>
402 </group>
403
404=== renamed file 'data/providers/twitter.provider.in' => 'data/providers/twitter.provider.in.in'
405--- data/providers/twitter.provider.in 2013-02-20 06:32:23 +0000
406+++ data/providers/twitter.provider.in.in 2013-03-19 10:39:21 +0000
407@@ -3,6 +3,7 @@
408 <name>Twitter</name>
409 <icon>twitter</icon>
410 <translations>account-plugins</translations>
411+ <plugin>generic-oauth</plugin>
412 <domains>.*twitter\.com</domains>
413
414 <template>
415@@ -15,6 +16,8 @@
416 <setting name="TokenEndpoint">https://api.twitter.com/oauth/access_token</setting>
417 <setting name="AuthorizationEndpoint">https://api.twitter.com/oauth/authorize</setting>
418 <setting name="Callback">https://wiki.ubuntu.com/</setting>
419+ <setting name="ConsumerKey">@TWITTER_CONSUMER_KEY@</setting>
420+ <setting name="ConsumerSecret">@TWITTER_CONSUMER_SECRET@</setting>
421 </group>
422 </group>
423 </group>
424
425=== renamed file 'data/providers/windows-live.provider.in' => 'data/providers/windows-live.provider.in.in'
426--- data/providers/windows-live.provider.in 2013-02-07 14:09:18 +0000
427+++ data/providers/windows-live.provider.in.in 2013-03-19 10:39:21 +0000
428@@ -4,6 +4,7 @@
429 <icon>live</icon>
430 <translations>account-plugins</translations>
431 <domains>.*live\.com</domains>
432+ <plugin>generic-oauth</plugin>
433
434 <template>
435 <group name="auth">
436@@ -17,6 +18,7 @@
437 <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting>
438 <setting name="ResponseType">code</setting>
439 <setting name="Scope" type="as">['wl.messenger','wl.offline_access','wl.emails']</setting>
440+ <setting name="ClientId">@WINDOWS_LIVE_CLIENT_ID@</setting>
441 </group>
442 </group>
443 </group>
444
445=== modified file 'debian/account-plugin-facebook.install'
446--- debian/account-plugin-facebook.install 2012-11-09 16:15:25 +0000
447+++ debian/account-plugin-facebook.install 2013-03-19 10:39:21 +0000
448@@ -1,5 +1,4 @@
449 etc/signon-ui/webkit-options.d/www.facebook.com.conf
450-usr/lib/libaccount-plugin-1.0/providers/libfacebook.so
451 usr/share/accounts/services/facebook-sharing.service
452 usr/share/accounts/services/facebook-microblog.service
453 usr/share/accounts/services/facebook-im.service
454
455=== modified file 'debian/account-plugin-flickr.install'
456--- debian/account-plugin-flickr.install 2012-11-23 10:02:52 +0000
457+++ debian/account-plugin-flickr.install 2013-03-19 10:39:21 +0000
458@@ -1,6 +1,5 @@
459 etc/signon-ui/webkit-options.d/login.yahoo.com.conf
460 etc/signon-ui/webkit-options.d/secure.flickr.com.conf
461-usr/lib/libaccount-plugin-1.0/providers/libflickr.so
462 usr/share/accounts/services/flickr-*.service
463 usr/share/accounts/providers/flickr.provider
464 usr/share/icons/hicolor/32x32/apps/flickr.png
465
466=== modified file 'debian/account-plugin-foursquare.install'
467--- debian/account-plugin-foursquare.install 2012-11-09 16:15:25 +0000
468+++ debian/account-plugin-foursquare.install 2013-03-19 10:39:21 +0000
469@@ -1,5 +1,4 @@
470 etc/signon-ui/webkit-options.d/foursquare.com.conf
471-usr/lib/libaccount-plugin-1.0/providers/libfoursquare.so
472 usr/share/accounts/services/foursquare-microblog.service
473 usr/share/accounts/providers/foursquare.provider
474 usr/share/icons/hicolor/32x32/apps/foursquare.png
475
476=== added file 'debian/account-plugin-generic-oauth.install'
477--- debian/account-plugin-generic-oauth.install 1970-01-01 00:00:00 +0000
478+++ debian/account-plugin-generic-oauth.install 2013-03-19 10:39:21 +0000
479@@ -0,0 +1,1 @@
480+usr/lib/libaccount-plugin-1.0/providers/libgeneric-oauth.so
481
482=== modified file 'debian/account-plugin-identica.install'
483--- debian/account-plugin-identica.install 2012-11-09 16:15:25 +0000
484+++ debian/account-plugin-identica.install 2013-03-19 10:39:21 +0000
485@@ -1,5 +1,4 @@
486 etc/signon-ui/webkit-options.d/identi.ca.conf
487-usr/lib/libaccount-plugin-1.0/providers/libidentica.so
488 usr/share/accounts/services/identica-microblog.service
489 usr/share/accounts/providers/identica.provider
490 usr/share/icons/hicolor/32x32/apps/identica.png
491
492=== modified file 'debian/account-plugin-sina.install'
493--- debian/account-plugin-sina.install 2012-11-09 16:15:25 +0000
494+++ debian/account-plugin-sina.install 2013-03-19 10:39:21 +0000
495@@ -1,4 +1,3 @@
496 etc/signon-ui/webkit-options.d/api.t.sina.com.cn.conf
497-usr/lib/libaccount-plugin-1.0/providers/libsina.so
498 usr/share/accounts/services/sina-microblog.service
499 usr/share/accounts/providers/sina.provider
500
501=== modified file 'debian/account-plugin-sohu.install'
502--- debian/account-plugin-sohu.install 2012-11-09 16:15:25 +0000
503+++ debian/account-plugin-sohu.install 2013-03-19 10:39:21 +0000
504@@ -1,4 +1,3 @@
505 etc/signon-ui/webkit-options.d/api.t.sohu.com.conf
506-usr/lib/libaccount-plugin-1.0/providers/libsohu.so
507 usr/share/accounts/services/sohu-microblog.service
508 usr/share/accounts/providers/sohu.provider
509
510=== modified file 'debian/account-plugin-twitter.install'
511--- debian/account-plugin-twitter.install 2012-11-09 16:15:25 +0000
512+++ debian/account-plugin-twitter.install 2013-03-19 10:39:21 +0000
513@@ -1,5 +1,4 @@
514 etc/signon-ui/webkit-options.d/api.twitter.com.conf
515-usr/lib/libaccount-plugin-1.0/providers/libtwitter.so
516 usr/share/accounts/services/twitter-microblog.service
517 usr/share/accounts/providers/twitter.provider
518 usr/share/icons/hicolor/32x32/apps/twitter.png
519
520=== modified file 'debian/account-plugin-windows-live.install'
521--- debian/account-plugin-windows-live.install 2012-11-09 16:15:25 +0000
522+++ debian/account-plugin-windows-live.install 2013-03-19 10:39:21 +0000
523@@ -1,5 +1,4 @@
524 etc/signon-ui/webkit-options.d/login.live.com.conf
525-usr/lib/libaccount-plugin-1.0/providers/libwindows-live.so
526 usr/share/accounts/services/wlm.service
527 usr/share/accounts/providers/windows-live.provider
528 usr/share/icons/hicolor/32x32/apps/live.png
529
530=== modified file 'debian/control'
531--- debian/control 2013-03-14 13:05:21 +0000
532+++ debian/control 2013-03-19 10:39:21 +0000
533@@ -20,6 +20,14 @@
534 # just go ahead. ~online-accounts will notice and sync up the code again.
535 Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk
536
537+Package: account-plugin-generic-oauth
538+Architecture: any
539+Depends: ${shlibs:Depends}, ${misc:Depends},
540+ signon-keyring-extension,
541+ signon-plugin-oauth2
542+Description: GNOME Control Center account plugin for single signon - generic OAuth
543+ GNOME Control Center account plugins for single signon
544+
545 Package: account-plugin-google
546 Architecture: any
547 Depends: ${shlibs:Depends}, ${misc:Depends},
548@@ -30,65 +38,57 @@
549
550 Package: account-plugin-facebook
551 Architecture: any
552-Depends: ${shlibs:Depends}, ${misc:Depends},
553- signon-keyring-extension,
554- signon-plugin-oauth2
555+Depends: ${misc:Depends},
556+ account-plugin-generic-oauth
557 Description: GNOME Control Center account plugin for single signon - facebook
558 GNOME Control Center account plugins for single signon
559
560 Package: account-plugin-twitter
561 Architecture: any
562-Depends: ${shlibs:Depends}, ${misc:Depends},
563- signon-keyring-extension,
564- signon-plugin-oauth2
565+Depends: ${misc:Depends},
566+ account-plugin-generic-oauth
567 Description: GNOME Control Center account plugin for single signon - twitter
568 GNOME Control Center account plugins for single signon
569
570 Package: account-plugin-flickr
571 Architecture: any
572-Depends: ${shlibs:Depends}, ${misc:Depends},
573- signon-keyring-extension,
574- signon-plugin-oauth2
575+Depends: ${misc:Depends},
576+ account-plugin-generic-oauth
577 Description: GNOME Control Center account plugin for single signon - flickr
578 GNOME Control Center account plugins for single signon
579
580 Package: account-plugin-identica
581 Architecture: any
582-Depends: ${shlibs:Depends}, ${misc:Depends},
583- signon-keyring-extension,
584- signon-plugin-oauth2
585+Depends: ${misc:Depends},
586+ account-plugin-generic-oauth
587 Description: GNOME Control Center account plugin for single signon - identica
588 GNOME Control Center account plugins for single signon
589
590 Package: account-plugin-foursquare
591 Architecture: any
592-Depends: ${shlibs:Depends}, ${misc:Depends},
593- signon-keyring-extension,
594- signon-plugin-oauth2
595+Depends: ${misc:Depends},
596+ account-plugin-generic-oauth
597 Description: GNOME Control Center account plugin for single signon - foursquare
598 GNOME Control Center account plugins for single signon
599
600 Package: account-plugin-windows-live
601 Architecture: any
602-Depends: ${shlibs:Depends}, ${misc:Depends},
603- signon-keyring-extension,
604- signon-plugin-oauth2
605+Depends: ${misc:Depends},
606+ account-plugin-generic-oauth
607 Description: GNOME Control Center account plugin for single signon - windows live
608 GNOME Control Center account plugins for single signon
609
610 Package: account-plugin-sohu
611 Architecture: any
612-Depends: ${shlibs:Depends}, ${misc:Depends},
613- signon-keyring-extension,
614- signon-plugin-oauth2
615+Depends: ${misc:Depends},
616+ account-plugin-generic-oauth
617 Description: GNOME Control Center account plugin for single signon - sohu
618 GNOME Control Center account plugins for single signon
619
620 Package: account-plugin-sina
621 Architecture: any
622-Depends: ${shlibs:Depends}, ${misc:Depends},
623- signon-keyring-extension,
624- signon-plugin-oauth2
625+Depends: ${misc:Depends},
626+ account-plugin-generic-oauth
627 Description: GNOME Control Center account plugin for single signon - sina
628 GNOME Control Center account plugins for single signon
629
630
631=== modified file 'po/POTFILES.in'
632--- po/POTFILES.in 2012-10-05 07:39:20 +0000
633+++ po/POTFILES.in 2013-03-19 10:39:21 +0000
634@@ -1,1 +1,1 @@
635-[type: gettext/xml]data/providers/google.provider.in
636+[type: gettext/xml]data/providers/google.provider.in.in
637
638=== removed file 'src/facebook.vala'
639--- src/facebook.vala 2013-02-06 13:20:22 +0000
640+++ src/facebook.vala 1970-01-01 00:00:00 +0000
641@@ -1,38 +0,0 @@
642-/*
643- * Copyright (C) 2012 Canonical, Inc
644- *
645- * This program is free software; you can redistribute it and/or modify
646- * it under the terms of the GNU General Public License version 2 as
647- * published by the Free Software Foundation.
648- *
649- * This program is distributed in the hope that it will be useful,
650- * but WITHOUT ANY WARRANTY; without even the implied warranty of
651- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
652- * GNU General Public License for more details.
653- *
654- * You should have received a copy of the GNU General Public License
655- * along with this program; if not, write to the Free Software
656- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
657- * USA.
658- *
659- * Authors:
660- * Alberto Mardegan <alberto.mardegan@canonical.com>
661- */
662-
663-public class FacebookPlugin : Ap.OAuthPlugin {
664- public FacebookPlugin (Ag.Account account) {
665- Object (account: account);
666- }
667-
668- construct
669- {
670- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
671- oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID);
672- set_oauth_parameters (oauth_params);
673- }
674-}
675-
676-public GLib.Type ap_module_get_object_type ()
677-{
678- return typeof (FacebookPlugin);
679-}
680
681=== removed file 'src/flickr.vala'
682--- src/flickr.vala 2013-02-07 14:09:18 +0000
683+++ src/flickr.vala 1970-01-01 00:00:00 +0000
684@@ -1,41 +0,0 @@
685-/*
686- * Copyright (C) 2012 Canonical, Inc
687- *
688- * This program is free software; you can redistribute it and/or modify
689- * it under the terms of the GNU General Public License version 2 as
690- * published by the Free Software Foundation.
691- *
692- * This program is distributed in the hope that it will be useful,
693- * but WITHOUT ANY WARRANTY; without even the implied warranty of
694- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
695- * GNU General Public License for more details.
696- *
697- * You should have received a copy of the GNU General Public License
698- * along with this program; if not, write to the Free Software
699- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
700- * USA.
701- *
702- * Authors:
703- * Alberto Mardegan <alberto.mardegan@canonical.com>
704- */
705-
706-public class FlickrPlugin : Ap.OAuthPlugin {
707- public FlickrPlugin (Ag.Account account) {
708- Object (account: account);
709- }
710-
711- construct
712- {
713- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
714- oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY);
715- oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET);
716- set_oauth_parameters (oauth_params);
717-
718- set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
719- }
720-}
721-
722-public GLib.Type ap_module_get_object_type ()
723-{
724- return typeof (FlickrPlugin);
725-}
726
727=== removed file 'src/foursquare.vala'
728--- src/foursquare.vala 2013-02-07 14:09:18 +0000
729+++ src/foursquare.vala 1970-01-01 00:00:00 +0000
730@@ -1,39 +0,0 @@
731-/*
732- * Copyright (C) 2012 Canonical, Inc
733- *
734- * This program is free software; you can redistribute it and/or modify
735- * it under the terms of the GNU General Public License version 2 as
736- * published by the Free Software Foundation.
737- *
738- * This program is distributed in the hope that it will be useful,
739- * but WITHOUT ANY WARRANTY; without even the implied warranty of
740- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
741- * GNU General Public License for more details.
742- *
743- * You should have received a copy of the GNU General Public License
744- * along with this program; if not, write to the Free Software
745- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
746- * USA.
747- *
748- * Authors:
749- * David King <david.king@canonical.com
750- */
751-
752-public class FoursquarePlugin : Ap.OAuthPlugin {
753- public FoursquarePlugin (Ag.Account account) {
754- Object (account: account);
755- }
756-
757- construct
758- {
759- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
760- oauth_params.insert ("ClientId",
761- "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW");
762- set_oauth_parameters (oauth_params);
763- }
764-}
765-
766-public GLib.Type ap_module_get_object_type ()
767-{
768- return typeof (FoursquarePlugin);
769-}
770
771=== added file 'src/generic-oauth.vala'
772--- src/generic-oauth.vala 1970-01-01 00:00:00 +0000
773+++ src/generic-oauth.vala 2013-03-19 10:39:21 +0000
774@@ -0,0 +1,31 @@
775+/*
776+ * Copyright (C) 2012 Canonical, Inc
777+ *
778+ * This program is free software; you can redistribute it and/or modify
779+ * it under the terms of the GNU General Public License version 2 as
780+ * published by the Free Software Foundation.
781+ *
782+ * This program is distributed in the hope that it will be useful,
783+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
784+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
785+ * GNU General Public License for more details.
786+ *
787+ * You should have received a copy of the GNU General Public License
788+ * along with this program; if not, write to the Free Software
789+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
790+ * USA.
791+ *
792+ * Authors:
793+ * Alberto Mardegan <alberto.mardegan@canonical.com>
794+ */
795+
796+public class GenericOAuthPlugin : Ap.OAuthPlugin {
797+ public GenericOAuthPlugin (Ag.Account account) {
798+ Object (account: account);
799+ }
800+}
801+
802+public GLib.Type ap_module_get_object_type ()
803+{
804+ return typeof (GenericOAuthPlugin);
805+}
806
807=== modified file 'src/google.vala'
808--- src/google.vala 2013-02-07 14:09:18 +0000
809+++ src/google.vala 2013-03-19 10:39:21 +0000
810@@ -20,34 +20,13 @@
811 */
812
813 public class GooglePlugin : Ap.OAuthPlugin {
814- private enum ParametersUser
815- {
816- ACCOUNT_PLUGIN,
817- CLIENT_APPLICATIONS
818- }
819-
820 public GooglePlugin (Ag.Account account) {
821 Object (account: account);
822 }
823
824 construct
825 {
826- var oauth_params = get_parameters (ParametersUser.ACCOUNT_PLUGIN);
827- set_oauth_parameters (oauth_params);
828-
829- oauth_params = get_parameters (ParametersUser.CLIENT_APPLICATIONS);
830- set_account_oauth_parameters (oauth_params);
831-
832- set_mechanism (Ap.OAuthMechanism.WEB_SERVER);
833-
834- set_ignore_cookies (true);
835- }
836-
837- private HashTable<string, GLib.Value?> get_parameters (ParametersUser user)
838- {
839 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
840- oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID);
841- oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET);
842
843 /* Note the evil trick here: Google uses a couple of non-standard OAuth
844 * parameters: "access_type" and "approval_prompt"; the signon OAuth
845@@ -56,16 +35,14 @@
846 *
847 * We need to specify "access_type=offline" if we want Google to return
848 * us a refresh token.
849+ * The "approval_prompt=force" string forces Google to ask for
850+ * authentication.
851 */
852- if (user == ParametersUser.ACCOUNT_PLUGIN)
853- {
854- /* The "approval_prompt=force" string forces Google to ask for
855- * authentication. */
856- oauth_params.insert ("ResponseType",
857- "code&access_type=offline&approval_prompt=force");
858- }
859+ oauth_params.insert ("ResponseType",
860+ "code&access_type=offline&approval_prompt=force");
861+ set_oauth_parameters (oauth_params);
862
863- return oauth_params;
864+ set_ignore_cookies (true);
865 }
866 }
867
868
869=== removed file 'src/identica.vala'
870--- src/identica.vala 2013-02-07 14:09:18 +0000
871+++ src/identica.vala 1970-01-01 00:00:00 +0000
872@@ -1,42 +0,0 @@
873-/*
874- * Copyright (C) 2012 Canonical, Inc
875- *
876- * This program is free software; you can redistribute it and/or modify
877- * it under the terms of the GNU General Public License version 2 as
878- * published by the Free Software Foundation.
879- *
880- * This program is distributed in the hope that it will be useful,
881- * but WITHOUT ANY WARRANTY; without even the implied warranty of
882- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
883- * GNU General Public License for more details.
884- *
885- * You should have received a copy of the GNU General Public License
886- * along with this program; if not, write to the Free Software
887- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
888- * USA.
889- *
890- * Authors:
891- * David King <david.king@canonical.com>
892- */
893-
894-public class IdenticaPlugin : Ap.OAuthPlugin {
895- public IdenticaPlugin (Ag.Account account) {
896- Object (account: account);
897- }
898-
899- construct
900- {
901- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
902- oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY);
903- oauth_params.insert ("ConsumerSecret",
904- Config.IDENTICA_CONSUMER_SECRET);
905- set_oauth_parameters (oauth_params);
906-
907- set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
908- }
909-}
910-
911-public GLib.Type ap_module_get_object_type ()
912-{
913- return typeof (IdenticaPlugin);
914-}
915
916=== removed file 'src/sina.vala'
917--- src/sina.vala 2013-02-07 14:09:18 +0000
918+++ src/sina.vala 1970-01-01 00:00:00 +0000
919@@ -1,41 +0,0 @@
920-/*
921- * Copyright (C) 2012 Canonical, Inc
922- *
923- * This program is free software; you can redistribute it and/or modify
924- * it under the terms of the GNU General Public License version 2 as
925- * published by the Free Software Foundation.
926- *
927- * This program is distributed in the hope that it will be useful,
928- * but WITHOUT ANY WARRANTY; without even the implied warranty of
929- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
930- * GNU General Public License for more details.
931- *
932- * You should have received a copy of the GNU General Public License
933- * along with this program; if not, write to the Free Software
934- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
935- * USA.
936- *
937- * Authors:
938- * David King <david.king@canonical.com>
939- */
940-
941-public class SinaPlugin : Ap.OAuthPlugin {
942- public SinaPlugin (Ag.Account account) {
943- Object (account: account);
944- }
945-
946- construct
947- {
948- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
949- oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY);
950- oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET);
951- set_oauth_parameters (oauth_params);
952-
953- set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
954- }
955-}
956-
957-public GLib.Type ap_module_get_object_type ()
958-{
959- return typeof (SinaPlugin);
960-}
961
962=== removed file 'src/sohu.vala'
963--- src/sohu.vala 2013-02-07 14:09:18 +0000
964+++ src/sohu.vala 1970-01-01 00:00:00 +0000
965@@ -1,41 +0,0 @@
966-/*
967- * Copyright (C) 2012 Canonical, Inc
968- *
969- * This program is free software; you can redistribute it and/or modify
970- * it under the terms of the GNU General Public License version 2 as
971- * published by the Free Software Foundation.
972- *
973- * This program is distributed in the hope that it will be useful,
974- * but WITHOUT ANY WARRANTY; without even the implied warranty of
975- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
976- * GNU General Public License for more details.
977- *
978- * You should have received a copy of the GNU General Public License
979- * along with this program; if not, write to the Free Software
980- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
981- * USA.
982- *
983- * Authors:
984- * David King <david.king@canonical.com>
985- */
986-
987-public class SohuPlugin : Ap.OAuthPlugin {
988- public SohuPlugin (Ag.Account account) {
989- Object (account: account);
990- }
991-
992- construct
993- {
994- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
995- oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY);
996- oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET);
997- set_oauth_parameters (oauth_params);
998-
999- set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
1000- }
1001-}
1002-
1003-public GLib.Type ap_module_get_object_type ()
1004-{
1005- return typeof (SohuPlugin);
1006-}
1007
1008=== removed file 'src/twitter.vala'
1009--- src/twitter.vala 2013-02-07 14:09:18 +0000
1010+++ src/twitter.vala 1970-01-01 00:00:00 +0000
1011@@ -1,41 +0,0 @@
1012-/*
1013- * Copyright (C) 2012 Canonical, Inc
1014- *
1015- * This program is free software; you can redistribute it and/or modify
1016- * it under the terms of the GNU General Public License version 2 as
1017- * published by the Free Software Foundation.
1018- *
1019- * This program is distributed in the hope that it will be useful,
1020- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1021- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1022- * GNU General Public License for more details.
1023- *
1024- * You should have received a copy of the GNU General Public License
1025- * along with this program; if not, write to the Free Software
1026- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
1027- * USA.
1028- *
1029- * Authors:
1030- * Alberto Mardegan <alberto.mardegan@canonical.com>
1031- */
1032-
1033-public class TwitterPlugin : Ap.OAuthPlugin {
1034- public TwitterPlugin (Ag.Account account) {
1035- Object (account: account);
1036- }
1037-
1038- construct
1039- {
1040- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
1041- oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY);
1042- oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET);
1043- set_oauth_parameters (oauth_params);
1044-
1045- set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
1046- }
1047-}
1048-
1049-public GLib.Type ap_module_get_object_type ()
1050-{
1051- return typeof (TwitterPlugin);
1052-}
1053
1054=== removed file 'src/windows-live.vala'
1055--- src/windows-live.vala 2013-02-07 14:09:18 +0000
1056+++ src/windows-live.vala 1970-01-01 00:00:00 +0000
1057@@ -1,39 +0,0 @@
1058-/*
1059- * Copyright (C) 2012 Collabora Ltd.
1060- *
1061- * This program is free software; you can redistribute it and/or modify
1062- * it under the terms of the GNU General Public License version 2 as
1063- * published by the Free Software Foundation.
1064- *
1065- * This program is distributed in the hope that it will be useful,
1066- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1067- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1068- * GNU General Public License for more details.
1069- *
1070- * You should have received a copy of the GNU General Public License
1071- * along with this program; if not, write to the Free Software
1072- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
1073- * USA.
1074- *
1075- * Authors:
1076- * Xavier Claessens <xavier.claessens@collabora.co.uk>
1077- */
1078-
1079-public class WindowsLivePlugin : Ap.OAuthPlugin {
1080- public WindowsLivePlugin (Ag.Account account) {
1081- Object (account: account);
1082- }
1083-
1084- construct
1085- {
1086- var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
1087- oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID);
1088- set_oauth_parameters (oauth_params);
1089- set_mechanism(Ap.OAuthMechanism.WEB_SERVER);
1090- }
1091-}
1092-
1093-public GLib.Type ap_module_get_object_type ()
1094-{
1095- return typeof (WindowsLivePlugin);
1096-}

Subscribers

People subscribed via source and target branches

to all changes: