Merge lp:~amigadave/account-plugins/no-binary-plugins into lp:account-plugins

Proposed by David King
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 86
Merged at revision: 77
Proposed branch: lp:~amigadave/account-plugins/no-binary-plugins
Merge into: lp:account-plugins
Diff against target: 764 lines (+136/-545)
11 files modified
Makefile.am (+105/-18)
configure.ac (+31/-19)
data/Makefile.am (+0/-5)
data/icons/Makefile.am (+0/-25)
data/providers/Makefile.am (+0/-23)
data/webkit-options/Makefile.am (+0/-11)
src/AccountPlugin.vapi (+0/-72)
src/accounts.deps (+0/-1)
src/accounts.vapi (+0/-200)
src/signon.vapi (+0/-166)
tools/Makefile.am (+0/-5)
To merge this branch: bzr merge lp:~amigadave/account-plugins/no-binary-plugins
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+134045@code.launchpad.net

Description of the change

Allow building without binary account plugins

Also, refactor the build to use non-recursive make.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Great work!!

There's only one thing missing: you didn't flatten the tools/Makefile.am, and you are not invoking it, so the account-console tool is not installed.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
77. By David King

Depend on pkg-config 0.24

Tidy configure slightly by depending on a more recent pkg-config.

78. By David King

Add ability to disable binary plugins at configure time

79. By David King

Remove old VAPI files

The VAPI files are distributed and installed by the upstream projects.

80. By David King

Minor improvements to some Makefiles

81. By David King

Distcheck with --enable-libaccount-plugn

82. By David King

Convert tools subdirectory to non-recursive build

83. By David King

Convert icons subdirectory to non-recursive build

84. By David King

Make providers subdirectory build non-recursively

85. By David King

Convert services subdirectory to non-recursive build

86. By David King

Switch webkit-options subdirectory to build non-recursively

Revision history for this message
David King (amigadave) wrote :

Updated now, seems that I had added the tools/Makefile.am changes and then removed them in a later commit. After much Bazaar (bizarre?) surgery, this now looks about right.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Works fine now, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-10-26 09:12:59 +0000
3+++ Makefile.am 2012-11-13 09:42:21 +0000
4@@ -1,9 +1,11 @@
5 SUBDIRS = \
6- data \
7- po \
8- tools
9-
10-# Plugins.
11+ po
12+
13+DISTCHECK_CONFIGURE_FLAGS = \
14+ --enable-libaccount-plugin
15+
16+if ENABLE_LIBACCOUNT_PLUGIN
17+# Binary account plugins.
18 plugin_LTLIBRARIES = \
19 libfacebook.la \
20 libflickr.la \
21@@ -93,6 +95,104 @@
22 libwindows_live_la_LDFLAGS = $(plugin_ldflags)
23 libwindows_live_la_SOURCES = \
24 src/windows-live.vala
25+endif # ENABLE_LIBACCOUNT_PLUGIN
26+
27+iconsdir = $(datadir)/icons/hicolor/32x32/apps
28+dist_icons_DATA = \
29+ data/icons/aim.png \
30+ data/icons/facebook.png \
31+ data/icons/flickr.png \
32+ data/icons/foursquare.png \
33+ data/icons/gadugadu.png \
34+ data/icons/google.png \
35+ data/icons/groupwise.png \
36+ data/icons/identica.png \
37+ data/icons/icq.png \
38+ data/icons/irc.png \
39+ data/icons/jabber.png \
40+ data/icons/live.png \
41+ data/icons/msn.png \
42+ data/icons/mxit.png \
43+ data/icons/myspace.png \
44+ data/icons/people-nearby.png \
45+ data/icons/sametime.png \
46+ data/icons/sip.png \
47+ data/icons/twitter.png \
48+ data/icons/yahoo.png \
49+ data/icons/zephyr.png
50+
51+# Extract transatable strings from .provider files
52+%.provider: %.provider.in $(INTLTOOL_MERGE)
53+ $(AM_V_at)$(MKDIR_P) $(builddir)/data/providers
54+ $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
55+
56+providers_in_files = \
57+ data/providers/facebook.provider.in \
58+ data/providers/flickr.provider.in \
59+ data/providers/foursquare.provider.in \
60+ data/providers/google.provider.in \
61+ data/providers/identica.provider.in \
62+ data/providers/sina.provider.in \
63+ data/providers/sohu.provider.in \
64+ data/providers/twitter.provider.in \
65+ data/providers/windows-live.provider.in
66+
67+providers_DATA = \
68+ $(providers_in_files:.provider.in=.provider)
69+
70+# Extract translatable strings from .service files
71+%.service: %.service.in $(INTLTOOL_MERGE)
72+ $(AM_V_at)$(MKDIR_P) $(builddir)/data/services
73+ $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
74+
75+services_in_files = \
76+ data/services/facebook-im.service.in \
77+ data/services/facebook-microblog.service.in \
78+ data/services/facebook-sharing.service.in \
79+ data/services/flickr-microblog.service.in \
80+ data/services/flickr-sharing.service.in \
81+ data/services/foursquare-microblog.service.in \
82+ data/services/google-docs.service.in \
83+ data/services/google-im.service.in \
84+ data/services/identica-microblog.service.in \
85+ data/services/picasa.service.in \
86+ data/services/sina-microblog.service.in \
87+ data/services/sohu-microblog.service.in \
88+ data/services/twitter-microblog.service.in \
89+ data/services/wlm.service.in
90+
91+services_DATA = \
92+ $(services_in_files:.service.in=.service)
93+
94+webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d
95+dist_webkitoptions_DATA = \
96+ data/webkit-options/accounts.google.com.conf \
97+ data/webkit-options/api.t.sina.com.cn.conf \
98+ data/webkit-options/api.t.sohu.com.conf \
99+ data/webkit-options/api.twitter.com.conf \
100+ data/webkit-options/foursquare.com.conf \
101+ data/webkit-options/identi.ca.conf \
102+ data/webkit-options/login.live.com.conf \
103+ data/webkit-options/login.yahoo.com.conf \
104+ data/webkit-options/www.facebook.com.conf
105+
106+dist_bin_SCRIPTS = \
107+ tools/account-console
108+
109+dist_noinst_DATA = \
110+ $(providers_in_files) \
111+ $(services_in_files) \
112+ src/config.vapi
113+
114+CLEANFILES = \
115+ $(services_DATA) \
116+ $(providers_DATA)
117+
118+DISTCLEANFILES = \
119+ intltool-extract \
120+ intltool-merge \
121+ intltool-update \
122+ po/.intltool-merge-cache
123
124 dist-hook: bzr-changelog-hook
125
126@@ -103,17 +203,4 @@
127 then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
128 else rm -f .ChangeLog.tmp; exit 1; fi
129
130-dist_noinst_DATA = \
131- src/config.vapi \
132- src/accounts.deps \
133- src/accounts.vapi \
134- src/signon.vapi \
135- src/AccountPlugin.vapi
136-
137-DISTCLEANFILES = \
138- intltool-extract \
139- intltool-merge \
140- intltool-update \
141- po/.intltool-merge-cache
142-
143 .PHONY: bzr-changelog-hook
144
145=== modified file 'configure.ac'
146--- configure.ac 2012-10-10 14:18:01 +0000
147+++ configure.ac 2012-11-13 09:42:21 +0000
148@@ -24,19 +24,37 @@
149 IT_PROG_INTLTOOL([0.50.0])
150 AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
151
152-PKG_CHECK_MODULES(ACCOUNT_PLUGINS,
153- account-plugin)
154-AC_SUBST(ACCOUNT_PLUGINS_CFLAGS)
155-AC_SUBST(ACCOUNT_PLUGINS_LIBS)
156-
157-plugindir=`$PKG_CONFIG --variable provider_plugindir account-plugin`
158-AC_SUBST(plugindir)
159-
160-providersdir=`$PKG_CONFIG --variable providerfilesdir libaccounts-glib`
161-AC_SUBST(providersdir)
162-
163-servicesdir=`$PKG_CONFIG --variable servicefilesdir libaccounts-glib`
164-AC_SUBST(servicesdir)
165+PKG_PROG_PKG_CONFIG([0.24])
166+
167+# Binary account plugins.
168+AC_ARG_ENABLE([libaccount-plugin],
169+ [AS_HELP_STRING([--disable-libaccount-plugin],
170+ [build without support for libaccount-plugin (binary account plugins)])])
171+
172+AS_IF([test "x$enable_libaccount_plugin" != "xno"],
173+ [PKG_CHECK_EXISTS([account-plugin], [have_libaccount_plugin=yes],
174+ [have_libaccount_plugin=no])],
175+ [have_libaccount_plugin=no])
176+
177+AS_IF([test "x$have_libaccount_plugin" = "xyes"],
178+ [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin])],
179+ [AS_IF([test "x$enable_libaccount_plugin" = "xyes"],
180+ [AC_MSG_ERROR([libaccount-plugin support enabled but required dependencies were not found])])])
181+
182+AM_CONDITIONAL([ENABLE_LIBACCOUNT_PLUGIN],
183+ [test "x$have_libaccount_plugin" = "xyes"])
184+
185+# XML data files for libaccounts-glib.
186+PKG_CHECK_EXISTS([libaccounts-glib])
187+
188+AC_SUBST([plugindir],
189+ [`$PKG_CONFIG --variable provider_plugindir account-plugin`])
190+
191+AC_SUBST([providersdir],
192+ [`$PKG_CONFIG --variable providerfilesdir libaccounts-glib`])
193+
194+AC_SUBST([servicesdir],
195+ [`$PKG_CONFIG --variable servicefilesdir libaccounts-glib`])
196
197 # Set Twitter consumer key/secret
198 AC_ARG_WITH(twitter-consumer-key,
199@@ -148,12 +166,6 @@
200
201 AC_CONFIG_FILES([
202 Makefile
203- data/Makefile
204- data/icons/Makefile
205- data/providers/Makefile
206- data/services/Makefile
207- data/webkit-options/Makefile
208 po/Makefile.in
209- tools/Makefile
210 ])
211 AC_OUTPUT
212
213=== removed file 'data/Makefile.am'
214--- data/Makefile.am 2012-06-06 08:56:59 +0000
215+++ data/Makefile.am 1970-01-01 00:00:00 +0000
216@@ -1,5 +0,0 @@
217-SUBDIRS = \
218- icons \
219- providers \
220- services \
221- webkit-options
222
223=== removed file 'data/icons/Makefile.am'
224--- data/icons/Makefile.am 2012-09-05 13:29:29 +0000
225+++ data/icons/Makefile.am 1970-01-01 00:00:00 +0000
226@@ -1,25 +0,0 @@
227-iconsdir = $(datadir)/icons/hicolor/32x32/apps
228-dist_icons_DATA = \
229- aim.png \
230- facebook.png \
231- flickr.png \
232- foursquare.png \
233- gadugadu.png \
234- google.png \
235- groupwise.png \
236- identica.png \
237- icq.png \
238- irc.png \
239- jabber.png \
240- live.png \
241- msn.png \
242- mxit.png \
243- myspace.png \
244- people-nearby.png \
245- sametime.png \
246- sip.png \
247- twitter.png \
248- yahoo.png \
249- zephyr.png
250-
251-
252
253=== removed file 'data/providers/Makefile.am'
254--- data/providers/Makefile.am 2012-10-04 14:18:34 +0000
255+++ data/providers/Makefile.am 1970-01-01 00:00:00 +0000
256@@ -1,23 +0,0 @@
257-# Extract transatable strings from .provider files
258-%.provider: %.provider.in $(INTLTOOL_MERGE)
259- $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
260-
261-providers_in_files = \
262- facebook.provider.in \
263- flickr.provider.in \
264- foursquare.provider.in \
265- google.provider.in \
266- identica.provider.in \
267- sina.provider.in \
268- sohu.provider.in \
269- twitter.provider.in \
270- windows-live.provider.in
271-
272-providers_DATA = \
273- $(providers_in_files:.provider.in=.provider)
274-
275-dist_noinst_DATA = \
276- $(providers_in_files)
277-
278-CLEANFILES = \
279- $(services_DATA)
280
281=== removed file 'data/webkit-options/Makefile.am'
282--- data/webkit-options/Makefile.am 2012-07-19 17:18:08 +0000
283+++ data/webkit-options/Makefile.am 1970-01-01 00:00:00 +0000
284@@ -1,11 +0,0 @@
285-webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d
286-dist_webkitoptions_DATA = \
287- accounts.google.com.conf \
288- api.t.sina.com.cn.conf \
289- api.t.sohu.com.conf \
290- api.twitter.com.conf \
291- foursquare.com.conf \
292- identi.ca.conf \
293- login.live.com.conf \
294- login.yahoo.com.conf \
295- www.facebook.com.conf
296
297=== removed file 'src/AccountPlugin.vapi'
298--- src/AccountPlugin.vapi 2012-07-18 11:33:03 +0000
299+++ src/AccountPlugin.vapi 1970-01-01 00:00:00 +0000
300@@ -1,72 +0,0 @@
301-/* AccountPlugin.vapi generated by vapigen-0.16, do not modify. */
302-
303-[CCode (cprefix = "Ap", gir_namespace = "AccountPlugin", gir_version = "1.0", lower_case_cprefix = "ap_")]
304-namespace Ap {
305- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h", type_id = "ap_application_plugin_get_type ()")]
306- public class ApplicationPlugin : GLib.Object {
307- [CCode (has_construct_function = false)]
308- protected ApplicationPlugin ();
309- public virtual unowned Gtk.Widget build_widget ();
310- public void emit_finished ();
311- public unowned Ag.Account get_account ();
312- public unowned Ag.Application get_application ();
313- public unowned GLib.Error get_error ();
314- public void set_error (GLib.Error error);
315- public Ag.Account account { get; construct; }
316- public Ag.Application application { get; construct; }
317- public signal void finished ();
318- }
319- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h", type_id = "ap_oauth_plugin_get_type ()")]
320- public class OAuthPlugin : Ap.Plugin {
321- [CCode (has_construct_function = false)]
322- protected OAuthPlugin ();
323- public void set_mechanism (Ap.OAuthMechanism mechanism);
324- public void set_oauth_parameters (GLib.HashTable<string,GLib.Value?> oauth_params);
325- public void set_account_oauth_parameters (GLib.HashTable<string,GLib.Value?> oauth_params);
326- [NoAccessorMethod]
327- public GLib.HashTable<weak void*,weak void*> oauth_params { owned get; construct; }
328- }
329- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h", type_id = "ap_plugin_get_type ()")]
330- public class Plugin : GLib.Object {
331- [CCode (has_construct_function = false)]
332- protected Plugin ();
333- public virtual void act_headless ();
334- public virtual unowned Gtk.Widget build_widget ();
335- public virtual async bool delete_account () throws GLib.Error;
336- public void emit_finished ();
337- public unowned Ag.Account get_account ();
338- public unowned GLib.HashTable<string,string> get_cookies ();
339- public unowned GLib.Error get_error ();
340- public bool get_ignore_cookies ();
341- public bool get_need_authentication ();
342- public unowned string get_password ();
343- public unowned Ag.Provider get_provider ();
344- public bool get_user_cancelled ();
345- public unowned string get_username ();
346- public void set_cookies (GLib.HashTable<string,string> cookies);
347- public void set_credentials (string username, string password);
348- public void set_error (GLib.Error error);
349- public void set_ignore_cookies (bool ignore_cookies);
350- public void set_need_authentication (bool need_authentication);
351- public void set_user_cancelled (bool cancelled);
352- public Ag.Account account { get; construct; }
353- public bool need_authentication { get; set; }
354- public signal void finished ();
355- }
356- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h", cprefix = "AP_OAUTH_MECHANISM_")]
357- public enum OAuthMechanism {
358- USER_AGENT,
359- WEB_SERVER,
360- HMAC_SHA1,
361- PLAINTEXT,
362- RSA_SHA1
363- }
364- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h", cname = "AP_PLUGIN_CREDENTIALS_ID_FIELD")]
365- public const string PLUGIN_CREDENTIALS_ID_FIELD;
366- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h")]
367- public static Ap.ApplicationPlugin client_load_application_plugin (Ag.Application application, Ag.Account account);
368- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h")]
369- public static Ap.Plugin client_load_plugin (Ag.Account account);
370- [CCode (cheader_filename = "libaccount-plugin/account-plugin.h")]
371- public static GLib.Type module_get_object_type ();
372-}
373
374=== removed file 'src/accounts.deps'
375--- src/accounts.deps 2012-03-14 11:55:04 +0000
376+++ src/accounts.deps 1970-01-01 00:00:00 +0000
377@@ -1,1 +0,0 @@
378-gio-unix-2.0
379
380=== removed file 'src/accounts.vapi'
381--- src/accounts.vapi 2012-05-16 09:40:37 +0000
382+++ src/accounts.vapi 1970-01-01 00:00:00 +0000
383@@ -1,200 +0,0 @@
384-/* accounts.vapi generated by vapigen-0.16, do not modify. */
385-
386-[CCode (cprefix = "Ag", gir_namespace = "Accounts", gir_version = "1.0", lower_case_cprefix = "ag_")]
387-namespace Ag {
388- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_get_type ()")]
389- public class Account : GLib.Object {
390- [CCode (has_construct_function = false)]
391- protected Account ();
392- public void @delete ();
393- public unowned string get_display_name ();
394- public bool get_enabled ();
395- public unowned Ag.Manager get_manager ();
396- public unowned string get_provider_name ();
397- public Ag.Service get_selected_service ();
398- public Ag.AccountSettingIter get_settings_iter (string? key_prefix);
399- public Ag.SettingSource get_value (string key, ref GLib.Value value);
400- public GLib.List<Ag.Service> list_enabled_services ();
401- public GLib.List<Ag.Service> list_services ();
402- public GLib.List<Ag.Service> list_services_by_type (string service_type);
403- public void remove_watch (Ag.AccountWatch watch);
404- public void select_service (Ag.Service? service);
405- public void set_display_name (string display_name);
406- public void set_enabled (bool enabled);
407- public void set_value (string key, GLib.Value? value);
408- public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix);
409- public void sign (string key, string token);
410- public void store (Ag.AccountStoreCb callback);
411- public bool store_blocking () throws GLib.Error;
412- public bool supports_service (string service_type);
413- public bool verify (string key, string token);
414- public bool verify_with_tokens (string key, string tokens);
415- public unowned Ag.AccountWatch watch_dir (string key_prefix, Ag.AccountNotifyCb callback);
416- public unowned Ag.AccountWatch watch_key (string key, Ag.AccountNotifyCb callback);
417- public bool foreign { construct; }
418- [NoAccessorMethod]
419- public uint id { get; construct; }
420- public Ag.Manager manager { construct; }
421- public string provider { construct; }
422- public signal void deleted ();
423- public signal void display_name_changed ();
424- public signal void enabled (string service, bool enabled);
425- }
426- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_service_get_type ()")]
427- public class AccountService : GLib.Object {
428- [CCode (has_construct_function = false)]
429- public AccountService (owned Ag.Account account, owned Ag.Service? service);
430- public unowned Ag.Account get_account ();
431- public Ag.AuthData get_auth_data ();
432- [CCode (array_length = false, array_null_terminated = true)]
433- public string[] get_changed_fields ();
434- public bool get_enabled ();
435- public unowned Ag.Service get_service ();
436- public Ag.AccountSettingIter get_settings_iter (string? key_prefix);
437- public Ag.SettingSource get_value (string key, ref GLib.Value value);
438- public void set_value (string key, GLib.Value? value);
439- public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix);
440- public static bool settings_iter_next (Ag.AccountSettingIter iter, out unowned string key, out GLib.Value value);
441- public Ag.Account account { construct; }
442- public Ag.Service service { construct; }
443- public signal void changed ();
444- public signal void enabled (bool enabled);
445- }
446- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", lower_case_csuffix = "account_settings_iter", type_id = "ag_account_settings_iter_get_type ()")]
447- [Compact]
448- public class AccountSettingIter {
449- public weak Ag.Account account;
450- public void free ();
451- public bool next (out unowned string key, out GLib.Value value);
452- }
453- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
454- [Compact]
455- public class AccountWatch {
456- }
457- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_application_get_type ()")]
458- [Compact]
459- public class Application {
460- public unowned string get_description ();
461- public GLib.DesktopAppInfo get_desktop_app_info ();
462- public unowned string get_i18n_domain ();
463- public unowned string get_name ();
464- public unowned string get_service_usage (Ag.Service service);
465- public Ag.Application @ref ();
466- public void unref ();
467- }
468- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_auth_data_get_type ()")]
469- [Compact]
470- public class AuthData {
471- public uint get_credentials_id ();
472- public unowned string get_mechanism ();
473- public unowned string get_method ();
474- public unowned GLib.HashTable<string,GLib.Value?> get_parameters ();
475- public void insert_parameters (GLib.HashTable<string,GLib.Value?> parameters);
476- public Ag.AuthData @ref ();
477- public void unref ();
478- }
479- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_manager_get_type ()")]
480- public class Manager : GLib.Object {
481- [CCode (has_construct_function = false)]
482- public Manager ();
483- public Ag.Account create_account (string provider_name);
484- [CCode (has_construct_function = false)]
485- public Manager.for_service_type (string service_type);
486- public bool get_abort_on_db_timeout ();
487- public Ag.Account get_account (Ag.AccountId account_id);
488- public GLib.List<Ag.AccountService> get_account_services ();
489- public Ag.Application get_application (string application_name);
490- public uint get_db_timeout ();
491- public GLib.List<Ag.AccountService> get_enabled_account_services ();
492- public Ag.Provider get_provider (string provider_name);
493- public Ag.Service get_service (string service_name);
494- public unowned string get_service_type ();
495- public GLib.List<Ag.AccountId> list ();
496- public GLib.List<Ag.Application> list_applications_by_service (Ag.Service service);
497- public GLib.List<Ag.AccountId> list_by_service_type (string service_type);
498- public GLib.List<Ag.AccountId> list_enabled ();
499- public GLib.List<Ag.AccountId> list_enabled_by_service_type (string service_type);
500- public static void list_free (GLib.List<Ag.AccountId> list);
501- public GLib.List<Ag.Provider> list_providers ();
502- public GLib.List<Ag.ServiceType> list_service_types ();
503- public GLib.List<Ag.Service> list_services ();
504- public GLib.List<Ag.Service> list_services_by_type (string service_type);
505- public Ag.Account load_account (Ag.AccountId account_id) throws GLib.Error;
506- public Ag.ServiceType load_service_type (string service_type);
507- public void set_abort_on_db_timeout (bool abort);
508- public void set_db_timeout (uint timeout_ms);
509- public string service_type { get; construct; }
510- public signal void account_created (uint account_id);
511- public virtual signal void account_deleted (uint id);
512- public signal void account_updated (uint account_id);
513- public signal void enabled_event (uint account_id);
514- }
515- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_provider_get_type ()")]
516- [Compact]
517- public class Provider {
518- public unowned string get_display_name ();
519- public unowned string get_domains_regex ();
520- public void get_file_contents (string contents);
521- public unowned string get_i18n_domain ();
522- public unowned string get_icon_name ();
523- public unowned string get_name ();
524- public static void list_free (GLib.List<Ag.Provider> list);
525- public bool match_domain (string domain);
526- public Ag.Provider @ref ();
527- public void unref ();
528- }
529- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_service_get_type ()")]
530- [Compact]
531- public class Service {
532- public unowned string get_display_name ();
533- public void get_file_contents (string contents, size_t data_offset);
534- public unowned string get_i18n_domain ();
535- public unowned string get_icon_name ();
536- public unowned string get_name ();
537- public unowned string get_provider ();
538- public unowned string get_service_type ();
539- public GLib.List<weak string> get_tags ();
540- public bool has_tag (string tag);
541- public static void list_free (GLib.List<Ag.Service> list);
542- public Ag.Service @ref ();
543- public void unref ();
544- }
545- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_service_type_get_type ()")]
546- [Compact]
547- public class ServiceType {
548- public unowned string get_display_name ();
549- public void get_file_contents (string contents, size_t len);
550- public unowned string get_i18n_domain ();
551- public unowned string get_icon_name ();
552- public unowned string get_name ();
553- public GLib.List<weak string> get_tags ();
554- public bool has_tag (string tag);
555- public static void list_free (GLib.List<Ag.ServiceType> list);
556- public Ag.ServiceType @ref ();
557- public void unref ();
558- }
559- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
560- [SimpleType]
561- public struct AccountId : uint {
562- }
563- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_ERROR_")]
564- public enum Error {
565- DB,
566- DISPOSED,
567- DELETED,
568- DB_LOCKED,
569- ACCOUNT_NOT_FOUND
570- }
571- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_SETTING_SOURCE_")]
572- public enum SettingSource {
573- NONE,
574- ACCOUNT,
575- PROFILE
576- }
577- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
578- public delegate void AccountNotifyCb (Ag.Account account, string key);
579- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
580- public delegate void AccountStoreCb (Ag.Account account, GLib.Error error);
581- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
582- public static GLib.Quark errors_quark ();
583-}
584
585=== removed file 'src/signon.vapi'
586--- src/signon.vapi 2012-03-14 11:55:04 +0000
587+++ src/signon.vapi 1970-01-01 00:00:00 +0000
588@@ -1,166 +0,0 @@
589-/* signon.vapi generated by vapigen, do not modify. */
590-
591-[CCode (cprefix = "Signon", gir_namespace = "Signon", gir_version = "1.0", lower_case_cprefix = "signon_")]
592-namespace Signon {
593- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", type_id = "signon_auth_service_get_type ()")]
594- public class AuthService : GLib.Object {
595- [CCode (has_construct_function = false)]
596- public AuthService ();
597- public void query_mechanisms (string method, Signon.QueryMechanismCb cb);
598- public void query_methods (Signon.QueryMethodsCb cb);
599- }
600- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", type_id = "signon_auth_session_get_type ()")]
601- public class AuthSession : GLib.Object {
602- [CCode (has_construct_function = false)]
603- public AuthSession (int id, string method_name) throws GLib.Error;
604- public void cancel ();
605- public unowned string get_method ();
606- public void process (GLib.HashTable<string,GLib.Value?> session_data, string mechanism, Signon.AuthSessionProcessCb cb);
607- public void query_available_mechanisms (string wanted_mechanisms, Signon.AuthSessionQueryAvailableMechanismsCb cb);
608- public signal void state_changed (int object, string p0);
609- }
610- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", type_id = "signon_identity_get_type ()")]
611- public class Identity : GLib.Object {
612- [CCode (has_construct_function = false)]
613- public Identity ();
614- public void add_reference (string reference, Signon.IdentityReferenceAddedCb cb, void* user_data);
615- public Signon.AuthSession create_session (string method) throws GLib.Error;
616- [CCode (has_construct_function = false)]
617- public Identity.from_db (uint32 id);
618- public unowned GLib.Error get_last_error ();
619- public void query_info (Signon.IdentityInfoCb cb);
620- public void remove (Signon.IdentityRemovedCb cb, void* user_data);
621- public void remove_reference (string reference, Signon.IdentityReferenceRemovedCb cb, void* user_data);
622- public void store_credentials_with_args (string username, string secret, bool store_secret, GLib.HashTable<string,string[]> methods, string caption, string realms, string access_control_list, Signon.IdentityType type, Signon.IdentityStoreCredentialsCb cb);
623- public void store_credentials_with_info (Signon.IdentityInfo info, Signon.IdentityStoreCredentialsCb cb);
624- public void verify_secret (string secret, Signon.IdentityVerifyCb cb);
625- [NoAccessorMethod]
626- public uint id { get; set; }
627- [HasEmitter]
628- public signal void signout ();
629- }
630- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "signon_identity_info_get_type ()")]
631- [Compact]
632- public class IdentityInfo {
633- [CCode (has_construct_function = false)]
634- public IdentityInfo ();
635- public Signon.IdentityInfo copy ();
636- public void free ();
637- [CCode (array_length = false, array_null_terminated = true)]
638- public unowned string[] get_access_control_list ();
639- public unowned string get_caption ();
640- public int get_id ();
641- public Signon.IdentityType get_identity_type ();
642- public unowned GLib.HashTable<string,string[]> get_methods ();
643- [CCode (array_length = false, array_null_terminated = true)]
644- public unowned string[] get_realms ();
645- public bool get_storing_secret ();
646- public unowned string get_username ();
647- public void remove_method (string method);
648- public void set_access_control_list (string access_control_list);
649- public void set_caption (string caption);
650- public void set_identity_type (Signon.IdentityType type);
651- public void set_method (string method, string mechanisms);
652- public void set_realms (string realms);
653- public void set_secret (string secret, bool store_secret);
654- public void set_username (string username);
655- }
656- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_IDENTITY_TYPE_")]
657- [Flags]
658- public enum IdentityType {
659- OTHER,
660- APP,
661- WEB,
662- NETWORK
663- }
664- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_POLICY_")]
665- public enum SessionDataUiPolicy {
666- DEFAULT,
667- REQUEST_PASSWORD,
668- NO_USER_INTERACTION,
669- VALIDATION
670- }
671- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cprefix = "SIGNON_ERROR_")]
672- public errordomain Error {
673- UNKNOWN,
674- INTERNAL_SERVER,
675- INTERNAL_COMMUNICATION,
676- PERMISSION_DENIED,
677- METHOD_NOT_KNOWN,
678- SERVICE_NOT_AVAILABLE,
679- INVALID_QUERY,
680- METHOD_NOT_AVAILABLE,
681- IDENTITY_NOT_FOUND,
682- STORE_FAILED,
683- REMOVE_FAILED,
684- SIGNOUT_FAILED,
685- IDENTITY_OPERATION_CANCELED,
686- CREDENTIALS_NOT_AVAILABLE,
687- REFERENCE_NOT_FOUND,
688- MECHANISM_NOT_AVAILABLE,
689- MISSING_DATA,
690- INVALID_CREDENTIALS,
691- NOT_AUTHORIZED,
692- WRONG_STATE,
693- OPERATION_NOT_SUPPORTED,
694- NO_CONNECTION,
695- NETWORK,
696- SSL,
697- RUNTIME,
698- SESSION_CANCELED,
699- TIMED_OUT,
700- USER_INTERACTION,
701- OPERATION_FAILED,
702- ENCRYPTION_FAILED,
703- TOS_NOT_ACCEPTED,
704- FORGOT_PASSWORD,
705- METHOD_OR_MECHANISM_NOT_ALLOWED,
706- INCORRECT_DATE,
707- USER_ERROR;
708- public static GLib.Quark quark ();
709- }
710- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
711- public delegate void AuthSessionProcessCb (Signon.AuthSession self, owned GLib.HashTable<string,GLib.Value?> session_data, GLib.Error error);
712- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
713- public delegate void AuthSessionQueryAvailableMechanismsCb (Signon.AuthSession self, [CCode (array_length = false, array_null_terminated = true)] owned string[] mechanisms, GLib.Error error);
714- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
715- public delegate void AuthSessionQueryAvailableMethodsCb (Signon.AuthSession self, [CCode (array_length = false, array_null_terminated = true)] owned string[] mechanisms, GLib.Error error);
716- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
717- public delegate void IdentityInfoCb (Signon.Identity self, Signon.IdentityInfo info, GLib.Error error);
718- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 2.9)]
719- public delegate void IdentityReferenceAddedCb (Signon.Identity self, GLib.Error error);
720- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 2.9)]
721- public delegate void IdentityReferenceRemovedCb (Signon.Identity self, GLib.Error error);
722- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 2.9)]
723- public delegate void IdentityRemovedCb (Signon.Identity self, GLib.Error error);
724- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 2.9)]
725- public delegate void IdentitySignedOutCb (Signon.Identity self, GLib.Error error);
726- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
727- public delegate void IdentityStoreCredentialsCb (Signon.Identity self, uint32 id, GLib.Error error);
728- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
729- public delegate void IdentityVerifyCb (Signon.Identity self, bool valid, GLib.Error error);
730- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 2.9)]
731- public delegate void IdentityVoidCb (Signon.Identity self, GLib.Error error);
732- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 4.9)]
733- public delegate void QueryMechanismCb (Signon.AuthService auth_service, string method, [CCode (array_length = false, array_null_terminated = true)] owned string[] mechanisms, GLib.Error error);
734- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", instance_pos = 3.9)]
735- public delegate void QueryMethodsCb (Signon.AuthService auth_service, [CCode (array_length = false, array_null_terminated = true)] owned string[] methods, GLib.Error error);
736- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_CAPTION")]
737- public const string SESSION_DATA_CAPTION;
738- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_PROXY")]
739- public const string SESSION_DATA_PROXY;
740- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_REALM")]
741- public const string SESSION_DATA_REALM;
742- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_RENEW_TOKEN")]
743- public const string SESSION_DATA_RENEW_TOKEN;
744- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_SECRET")]
745- public const string SESSION_DATA_SECRET;
746- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_TIMEOUT")]
747- public const string SESSION_DATA_TIMEOUT;
748- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_UI_POLICY")]
749- public const string SESSION_DATA_UI_POLICY;
750- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_USERNAME")]
751- public const string SESSION_DATA_USERNAME;
752- [CCode (cheader_filename = "libsignon-glib/signon-glib.h", cname = "SIGNON_SESSION_DATA_WINDOW_ID")]
753- public const string SESSION_DATA_WINDOW_ID;
754-}
755
756=== removed file 'tools/Makefile.am'
757--- tools/Makefile.am 2012-09-10 13:18:44 +0000
758+++ tools/Makefile.am 1970-01-01 00:00:00 +0000
759@@ -1,5 +0,0 @@
760-bin_SCRIPTS = \
761- account-console
762-
763-EXTRA_DIST = \
764- $(bin_SCRIPTS)

Subscribers

People subscribed via source and target branches