Online Accounts: libaccounts-glib

Merge lp:~mardy/libaccounts-glib/packaging into lp:libaccounts-glib

  1. packaging
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 172
Proposed branch: lp:~mardy/libaccounts-glib/packaging
Merge into: lp:libaccounts-glib
Diff against target: 1165 lines (+343/-328)
19 files modified
NEWS (+21/-0)
configure.ac (+22/-4)
debian/changelog (+17/-0)
debian/control (+3/-2)
debian/rules (+4/-0)
libaccounts-glib/Makefile.am (+2/-2)
libaccounts-glib/accounts.deps (+0/-1)
libaccounts-glib/accounts.vapi (+0/-229)
libaccounts-glib/ag-service.c (+7/-1)
libaccounts-glib/libaccounts-glib.deps (+1/-0)
libaccounts-glib/libaccounts-glib.vapi (+229/-0)
tests/.gitignore (+1/-0)
tests/Makefile.am (+21/-1)
tests/accounts-glib-test.sh (+4/-1)
tests/check_ag.c (+0/-67)
tests/test-process.c (+0/-2)
tests/tests.xml (+0/-16)
tests/tests.xml.in (+11/-0)
tools/main.c (+0/-2)
To merge this branch: bzr merge lp:~mardy/libaccounts-glib/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Ken VanDine Approve
Review via email: mp+166800@code.launchpad.net

Commit message

Version 1.10

Description of the change

Version 1.9

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-saucy-amd64-autolanding/1/console

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

FAILED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-saucy-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/2/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-autolanding/1/console

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

FAILED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/3/rebuild

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

PASSED: Continuous integration, rev:174
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/4/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-autolanding/2/console

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-autolanding/3/console

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

FAILED: Continuous integration, rev:175
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/5/rebuild

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

FAILED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-raring-amd64-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/6/rebuild

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-autolanding/5/
Executed test runs:

review: Needs Fixing (continuous-integration)
lp:~mardy/libaccounts-glib/packaging updated
172. By Alberto Mardegan

bump dbus-test-runner timeout to 360
.

Approved by PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2013-02-21 16:11:49 +0000
3+++ NEWS 2013-06-05 14:03:26 +0000
4@@ -1,5 +1,26 @@
5 libaccounts-glib NEWS
6
7+Version 1.11
8+------------
9+
10+* Tests: don't run tests in parallel
11+
12+Version 1.10
13+------------
14+
15+* Vala: rename .vapi and .deps files
16+ Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=176
17+* Tests: don't fail on critical warnings
18+* AgService: load the XML file before returning tags
19+* Removed deprecated g_type_init and bumped GObject dependency
20+
21+Version 1.9
22+-----------
23+
24+* Fix compilation with GCC 4.8
25+* Install tests
26+* Add installcheck target for installed tests
27+
28 Version 1.8
29 -----------
30
31
32=== modified file 'configure.ac'
33--- configure.ac 2013-02-06 12:32:32 +0000
34+++ configure.ac 2013-06-05 14:03:26 +0000
35@@ -1,7 +1,7 @@
36 dnl Process this file with autoconf to produce a configure script.
37 AC_PREREQ([2.64])
38 AC_INIT([libaccounts-glib],
39- [1.8],
40+ [1.11],
41 [http://code.google.com/p/accounts-sso/issues/entry],
42 [libaccounts-glib],
43 [http://code.google.com/p/accounts-sso/])
44@@ -11,11 +11,12 @@
45 AC_CONFIG_SRCDIR([libaccounts-glib.pc.in])
46 AC_CONFIG_MACRO_DIR([m4])
47
48-AM_INIT_AUTOMAKE([1.11 -Wall check-news nostdinc silent-rules subdir-objects])
49+AM_INIT_AUTOMAKE([1.11 -Wall check-news nostdinc silent-rules subdir-objects serial-tests])
50
51 AC_PROG_CC
52 AC_PROG_CC_STDC
53 AM_PROG_CC_C_O
54+AC_PROG_SED
55
56 LT_PREREQ([2.2])
57 LT_INIT([disable-static])
58@@ -26,7 +27,7 @@
59 LIBACCOUNTS_REQUIRED="glib-2.0 >= 2.26
60 gio-2.0 >= 2.30
61 gio-unix-2.0
62- gobject-2.0
63+ gobject-2.0 >= 2.35.1
64 libxml-2.0
65 sqlite3 >= 3.7.0"
66 PKG_CHECK_MODULES([LIBACCOUNTS], [$LIBACCOUNTS_REQUIRED])
67@@ -51,7 +52,24 @@
68 AS_IF([test "x$have_check" = "xyes"],
69 [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED $LIBACCOUNTS_REQUIRED])
70 AC_SUBST([CHECK_CFLAGS])
71- AC_SUBST([CHECK_LIBS])],
72+ AC_SUBST([CHECK_LIBS])
73+ AC_MSG_CHECKING([where to install tests])
74+ AC_ARG_WITH([testdir],
75+ [AS_HELP_STRING([--with-testdir=DIR],
76+ [installation directory for tests [default=PKGLIBDIR]])],
77+ [testdir="$withval"],
78+ [testdir="\${pkglibdir}"])
79+ AC_MSG_RESULT([$testdir])
80+ AC_SUBST([testdir])
81+
82+ AC_MSG_CHECKING([where to install test data])
83+ AC_ARG_WITH([testdatadir],
84+ [AS_HELP_STRING([--with-testdatadir=DIR],
85+ [installation directory for test data [default=PKGDATADIR/testdata]])],
86+ [testdatadir="$withval"],
87+ [testdatadir="\${pkgdatadir}/testdata"])
88+ AC_MSG_RESULT([$testdatadir])
89+ AC_SUBST([testdatadir])],
90 [AS_IF([test "x$enable_tests" = "xyes"],
91 [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
92
93
94=== modified file 'debian/changelog'
95--- debian/changelog 2013-05-01 07:55:51 +0000
96+++ debian/changelog 2013-06-05 14:03:26 +0000
97@@ -1,3 +1,20 @@
98+libaccounts-glib (1.11-0ubuntu1) UNRELEASED; urgency=low
99+
100+ * New upstream release (1.9).
101+ - Fix compilation with GCC 4.8
102+ - Install tests
103+ - Add installcheck target for installed tests
104+ * New upstream release (1.10).
105+ - Vala: rename .vapi and .deps files
106+ Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=176
107+ - Tests: don't fail on critical warnings
108+ - AgService: load the XML file before returning tags
109+ - Removed deprecated g_type_init and bumped GObject dependency
110+ * New upstream release (1.11).
111+ - Tests: don't run tests in parallel
112+
113+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 05 Jun 2013 16:25:07 +0300
114+
115 libaccounts-glib (1.8daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
116
117 [ Ken VanDine ]
118
119=== modified file 'debian/control'
120--- debian/control 2013-01-25 07:15:50 +0000
121+++ debian/control 2013-06-05 14:03:26 +0000
122@@ -1,7 +1,8 @@
123 Source: libaccounts-glib
124 Priority: optional
125 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
126-Build-Depends: autotools-dev,
127+Build-Depends: automake (>= 1:1.13),
128+ autotools-dev,
129 check,
130 dbus-test-runner,
131 debhelper (>= 9),
132@@ -10,7 +11,7 @@
133 gtk-doc-tools,
134 intltool,
135 libgirepository1.0-dev,
136- libglib2.0-dev (>= 2.26),
137+ libglib2.0-dev (>= 2.35.1),
138 libsqlite3-dev (>= 3.7.0),
139 libtool,
140 libxml2-dev,
141
142=== modified file 'debian/rules'
143--- debian/rules 2013-01-30 10:46:47 +0000
144+++ debian/rules 2013-06-05 14:03:26 +0000
145@@ -15,7 +15,11 @@
146 rm debian/tmp/usr/lib/*/*.la
147 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
148 rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
149+ rm -rf debian/tmp/usr/lib/python3/dist-packages/gi/overrides/__pycache__/
150 rm debian/tmp/usr/share/backup-framework/applications/accounts.conf
151+ # Remove the installed tests
152+ rm -rf debian/tmp/usr/share/libaccounts-glib/testdata
153+ rm -rf debian/tmp/usr/lib/x86_64-linux-gnu/libaccounts-glib
154 dh_install --fail-missing
155 dh_python2 -pgir1.2-accounts-1.0
156
157
158=== modified file 'libaccounts-glib/Makefile.am'
159--- libaccounts-glib/Makefile.am 2013-01-29 14:56:24 +0000
160+++ libaccounts-glib/Makefile.am 2013-06-05 14:03:26 +0000
161@@ -130,5 +130,5 @@
162 # Vala bindings
163 vapidir = $(datadir)/vala/vapi
164 dist_vapi_DATA = \
165- accounts.deps \
166- accounts.vapi
167+ libaccounts-glib.deps \
168+ libaccounts-glib.vapi
169
170=== removed file 'libaccounts-glib/accounts.deps'
171--- libaccounts-glib/accounts.deps 2012-07-16 11:47:41 +0000
172+++ libaccounts-glib/accounts.deps 1970-01-01 00:00:00 +0000
173@@ -1,1 +0,0 @@
174-gio-unix-2.0
175
176=== removed file 'libaccounts-glib/accounts.vapi'
177--- libaccounts-glib/accounts.vapi 2013-01-29 11:10:02 +0000
178+++ libaccounts-glib/accounts.vapi 1970-01-01 00:00:00 +0000
179@@ -1,229 +0,0 @@
180-/* accounts.vapi generated by vapigen, do not modify. */
181-
182-[CCode (cprefix = "Ag", gir_namespace = "Accounts", gir_version = "1.0", lower_case_cprefix = "ag_")]
183-namespace Ag {
184- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_get_type ()")]
185- public class Account : GLib.Object {
186- [CCode (has_construct_function = false)]
187- protected Account ();
188- public void @delete ();
189- public unowned string get_display_name ();
190- public bool get_enabled ();
191- public unowned Ag.Manager get_manager ();
192- public unowned string get_provider_name ();
193- public Ag.Service get_selected_service ();
194- public Ag.AccountSettingIter get_settings_iter (string? key_prefix);
195- [Deprecated (replacement = "get_variant", since = "1.4")]
196- public Ag.SettingSource get_value (string key, ref GLib.Value value);
197- public GLib.Variant get_variant (string key, out Ag.SettingSource? source);
198- public GLib.List<Ag.Service> list_enabled_services ();
199- public GLib.List<Ag.Service> list_services ();
200- public GLib.List<Ag.Service> list_services_by_type (string service_type);
201- public void remove_watch (Ag.AccountWatch watch);
202- public void select_service (Ag.Service? service);
203- public void set_display_name (string display_name);
204- public void set_enabled (bool enabled);
205- [Deprecated (replacement = "set_variant", since = "1.4")]
206- public void set_value (string key, GLib.Value? value);
207- public void set_variant (string key, GLib.Variant? value);
208- public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix);
209- public void sign (string key, string token);
210- [Deprecated (replacement = "store_async", since="1.4")]
211- public void store (Ag.AccountStoreCb callback);
212- public async void store_async (GLib.Cancellable? cancellable = null) throws Ag.AccountsError;
213- public bool store_blocking () throws Ag.AccountsError;
214- public bool supports_service (string service_type);
215- public bool verify (string key, string token);
216- public bool verify_with_tokens (string key, string tokens);
217- public unowned Ag.AccountWatch watch_dir (string key_prefix, Ag.AccountNotifyCb callback);
218- public unowned Ag.AccountWatch watch_key (string key, Ag.AccountNotifyCb callback);
219- public string display_name { get; }
220-/* FIXME: Same name as a signal, so ignore for the moment.
221- public bool enabled { get; }
222- */
223- public bool foreign { construct; }
224- [NoAccessorMethod]
225- public uint id { get; construct; }
226- public Ag.Manager manager { get; construct; }
227- public string provider { get; construct; }
228- public signal void deleted ();
229- public signal void display_name_changed ();
230- public signal void enabled (string service, bool enabled);
231- }
232- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_service_get_type ()")]
233- public class AccountService : GLib.Object {
234- [CCode (has_construct_function = false)]
235- public AccountService (owned Ag.Account account, owned Ag.Service? service);
236- public unowned Ag.Account get_account ();
237- public Ag.AuthData get_auth_data ();
238- [CCode (array_length = false, array_null_terminated = true)]
239- public string[] get_changed_fields ();
240- public bool get_enabled ();
241- public unowned Ag.Service get_service ();
242- public Ag.AccountSettingIter get_settings_iter (string? key_prefix);
243- [Deprecated (replacement = "get_variant", since = "1.4")]
244- public Ag.SettingSource get_value (string key, ref GLib.Value value);
245- public GLib.Variant get_variant (string key, out Ag.SettingSource? source);
246- [Deprecated (replacement = "set_variant", since = "1.4")]
247- public void set_value (string key, GLib.Value? value);
248- public void set_variant (string key, GLib.Variant? value);
249- public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix);
250- [Deprecated (since = "1.4")]
251- public static bool settings_iter_next (Ag.AccountSettingIter iter, out unowned string key, out GLib.Value value);
252- public Ag.Account account { construct; }
253-/* FIXME: Same name as a signal, so ignore for the moment.
254- public bool enabled { get; }
255- */
256- public Ag.Service service { construct; }
257- public signal void changed ();
258- public signal void enabled (bool enabled);
259- }
260- [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 ()")]
261- [Compact]
262- public class AccountSettingIter {
263- public weak Ag.Account account;
264- public void free ();
265- public bool next (out unowned string key, out GLib.Value value);
266- }
267- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
268- [Compact]
269- public class AccountWatch {
270- }
271- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_application_get_type ()")]
272- [Compact]
273- public class Application {
274- public unowned string get_description ();
275- public GLib.DesktopAppInfo get_desktop_app_info ();
276- public unowned string get_i18n_domain ();
277- public unowned string get_name ();
278- public unowned string get_service_usage (Ag.Service service);
279- public Ag.Application @ref ();
280- public void unref ();
281- }
282- [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 ()")]
283- [Compact]
284- public class AuthData {
285- public uint get_credentials_id ();
286- public unowned string get_mechanism ();
287- public unowned string get_method ();
288- public unowned GLib.Variant get_login_parameters (GLib.Variant variant);
289- [Deprecated (replacement = "get_login_parameters", since = "1.4")]
290- public unowned GLib.HashTable<string,GLib.Value?> get_parameters ();
291- [Deprecated (replacement = "get_login_parameters", since = "1.4")]
292- public void insert_parameters (GLib.HashTable<string,GLib.Value?> parameters);
293- public Ag.AuthData @ref ();
294- public void unref ();
295- }
296- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_manager_get_type ()")]
297- public class Manager : GLib.Object {
298- [CCode (has_construct_function = false)]
299- public Manager ();
300- public Ag.Account create_account (string provider_name);
301- [CCode (has_construct_function = false)]
302- public Manager.for_service_type (string service_type);
303- public bool get_abort_on_db_timeout ();
304- public Ag.Account get_account (Ag.AccountId account_id);
305- public GLib.List<Ag.AccountService> get_account_services ();
306- public Ag.Application get_application (string application_name);
307- public uint get_db_timeout ();
308- public GLib.List<Ag.AccountService> get_enabled_account_services ();
309- public Ag.Provider get_provider (string provider_name);
310- public Ag.Service get_service (string service_name);
311- public unowned string get_service_type ();
312- public GLib.List<uint> list ();
313- public GLib.List<Ag.Application> list_applications_by_service (Ag.Service service);
314- public GLib.List<uint> list_by_service_type (string service_type);
315- public GLib.List<uint> list_enabled ();
316- public GLib.List<uint> list_enabled_by_service_type (string service_type);
317- public static void list_free (GLib.List<uint> list);
318- public GLib.List<Ag.Provider> list_providers ();
319- public GLib.List<Ag.ServiceType> list_service_types ();
320- public GLib.List<Ag.Service> list_services ();
321- public GLib.List<Ag.Service> list_services_by_type (string service_type);
322- public Ag.Account load_account (Ag.AccountId account_id) throws Ag.AccountsError;
323- public Ag.ServiceType load_service_type (string service_type);
324- public void set_abort_on_db_timeout (bool abort);
325- public void set_db_timeout (uint timeout_ms);
326- public string service_type { get; construct; }
327- public signal void account_created (uint account_id);
328- public virtual signal void account_deleted (uint id);
329- public signal void account_updated (uint account_id);
330- public signal void enabled_event (uint account_id);
331- }
332- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_provider_get_type ()")]
333- [Compact]
334- public class Provider {
335- public unowned string get_display_name ();
336- public unowned string get_description ();
337- public unowned string get_domains_regex ();
338- public void get_file_contents (string contents);
339- public unowned string get_i18n_domain ();
340- public unowned string get_icon_name ();
341- public unowned string get_name ();
342- public unowned string get_plugin_name ();
343- public static void list_free (GLib.List<Ag.Provider> list);
344- public bool match_domain (string domain);
345- public Ag.Provider @ref ();
346- public void unref ();
347- }
348- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_service_get_type ()")]
349- [Compact]
350- public class Service {
351- public unowned string get_display_name ();
352- public unowned string get_description ();
353- public void get_file_contents (string contents, size_t data_offset);
354- public unowned string get_i18n_domain ();
355- public unowned string get_icon_name ();
356- public unowned string get_name ();
357- public unowned string get_provider ();
358- public unowned string get_service_type ();
359- public GLib.List<weak string> get_tags ();
360- public bool has_tag (string tag);
361- public static void list_free (GLib.List<Ag.Service> list);
362- public Ag.Service @ref ();
363- public void unref ();
364- }
365- [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 ()")]
366- [Compact]
367- public class ServiceType {
368- public unowned string get_display_name ();
369- public unowned string get_description ();
370- public void get_file_contents (string contents, size_t len);
371- public unowned string get_i18n_domain ();
372- public unowned string get_icon_name ();
373- public unowned string get_name ();
374- public GLib.List<weak string> get_tags ();
375- public bool has_tag (string tag);
376- public static void list_free (GLib.List<Ag.ServiceType> list);
377- public Ag.ServiceType @ref ();
378- public void unref ();
379- }
380- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
381- [SimpleType]
382- public struct AccountId : uint {
383- }
384- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_ACCOUNTS_ERROR_")]
385- public errordomain AccountsError {
386- DB,
387- DISPOSED,
388- DELETED,
389- DB_LOCKED,
390- ACCOUNT_NOT_FOUND,
391- STORE_IN_PROGRESS
392- }
393- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_SETTING_SOURCE_")]
394- public enum SettingSource {
395- NONE,
396- ACCOUNT,
397- PROFILE
398- }
399- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
400- public delegate void AccountNotifyCb (Ag.Account account, string key);
401- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
402- public delegate void AccountServiceNotifyCb (Ag.AccountService self, string key);
403- [Deprecated (since = "1.4")]
404- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
405- public delegate void AccountStoreCb (Ag.Account account, GLib.Error error);
406- [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
407- public static GLib.Quark errors_quark ();
408-}
409
410=== modified file 'libaccounts-glib/ag-service.c'
411--- libaccounts-glib/ag-service.c 2012-10-16 14:25:19 +0000
412+++ libaccounts-glib/ag-service.c 2013-06-05 14:03:26 +0000
413@@ -146,7 +146,7 @@
414 }
415 else if (strcmp (name, "type_data") == 0)
416 {
417- static const gchar *element = "<type_data";
418+ static const gchar element[] = "<type_data";
419 gsize offset;
420
421 /* find the offset in the file where this element begins */
422@@ -475,6 +475,9 @@
423 {
424 g_return_val_if_fail (service != NULL, FALSE);
425
426+ if (!service->file_data)
427+ _ag_service_load_from_file (service);
428+
429 if (service->tags == NULL)
430 copy_tags_from_type (service);
431
432@@ -496,6 +499,9 @@
433 {
434 g_return_val_if_fail (service != NULL, NULL);
435
436+ if (!service->file_data)
437+ _ag_service_load_from_file (service);
438+
439 if (service->tags == NULL)
440 copy_tags_from_type (service);
441
442
443=== added file 'libaccounts-glib/libaccounts-glib.deps'
444--- libaccounts-glib/libaccounts-glib.deps 1970-01-01 00:00:00 +0000
445+++ libaccounts-glib/libaccounts-glib.deps 2013-06-05 14:03:26 +0000
446@@ -0,0 +1,1 @@
447+gio-unix-2.0
448
449=== added file 'libaccounts-glib/libaccounts-glib.vapi'
450--- libaccounts-glib/libaccounts-glib.vapi 1970-01-01 00:00:00 +0000
451+++ libaccounts-glib/libaccounts-glib.vapi 2013-06-05 14:03:26 +0000
452@@ -0,0 +1,229 @@
453+/* accounts.vapi generated by vapigen, do not modify. */
454+
455+[CCode (cprefix = "Ag", gir_namespace = "Accounts", gir_version = "1.0", lower_case_cprefix = "ag_")]
456+namespace Ag {
457+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_get_type ()")]
458+ public class Account : GLib.Object {
459+ [CCode (has_construct_function = false)]
460+ protected Account ();
461+ public void @delete ();
462+ public unowned string get_display_name ();
463+ public bool get_enabled ();
464+ public unowned Ag.Manager get_manager ();
465+ public unowned string get_provider_name ();
466+ public Ag.Service get_selected_service ();
467+ public Ag.AccountSettingIter get_settings_iter (string? key_prefix);
468+ [Deprecated (replacement = "get_variant", since = "1.4")]
469+ public Ag.SettingSource get_value (string key, ref GLib.Value value);
470+ public GLib.Variant get_variant (string key, out Ag.SettingSource? source);
471+ public GLib.List<Ag.Service> list_enabled_services ();
472+ public GLib.List<Ag.Service> list_services ();
473+ public GLib.List<Ag.Service> list_services_by_type (string service_type);
474+ public void remove_watch (Ag.AccountWatch watch);
475+ public void select_service (Ag.Service? service);
476+ public void set_display_name (string display_name);
477+ public void set_enabled (bool enabled);
478+ [Deprecated (replacement = "set_variant", since = "1.4")]
479+ public void set_value (string key, GLib.Value? value);
480+ public void set_variant (string key, GLib.Variant? value);
481+ public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix);
482+ public void sign (string key, string token);
483+ [Deprecated (replacement = "store_async", since="1.4")]
484+ public void store (Ag.AccountStoreCb callback);
485+ public async void store_async (GLib.Cancellable? cancellable = null) throws Ag.AccountsError;
486+ public bool store_blocking () throws Ag.AccountsError;
487+ public bool supports_service (string service_type);
488+ public bool verify (string key, string token);
489+ public bool verify_with_tokens (string key, string tokens);
490+ public unowned Ag.AccountWatch watch_dir (string key_prefix, Ag.AccountNotifyCb callback);
491+ public unowned Ag.AccountWatch watch_key (string key, Ag.AccountNotifyCb callback);
492+ public string display_name { get; }
493+/* FIXME: Same name as a signal, so ignore for the moment.
494+ public bool enabled { get; }
495+ */
496+ public bool foreign { construct; }
497+ [NoAccessorMethod]
498+ public uint id { get; construct; }
499+ public Ag.Manager manager { get; construct; }
500+ public string provider { get; construct; }
501+ public signal void deleted ();
502+ public signal void display_name_changed ();
503+ public signal void enabled (string service, bool enabled);
504+ }
505+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_service_get_type ()")]
506+ public class AccountService : GLib.Object {
507+ [CCode (has_construct_function = false)]
508+ public AccountService (owned Ag.Account account, owned Ag.Service? service);
509+ public unowned Ag.Account get_account ();
510+ public Ag.AuthData get_auth_data ();
511+ [CCode (array_length = false, array_null_terminated = true)]
512+ public string[] get_changed_fields ();
513+ public bool get_enabled ();
514+ public unowned Ag.Service get_service ();
515+ public Ag.AccountSettingIter get_settings_iter (string? key_prefix);
516+ [Deprecated (replacement = "get_variant", since = "1.4")]
517+ public Ag.SettingSource get_value (string key, ref GLib.Value value);
518+ public GLib.Variant get_variant (string key, out Ag.SettingSource? source);
519+ [Deprecated (replacement = "set_variant", since = "1.4")]
520+ public void set_value (string key, GLib.Value? value);
521+ public void set_variant (string key, GLib.Variant? value);
522+ public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix);
523+ [Deprecated (since = "1.4")]
524+ public static bool settings_iter_next (Ag.AccountSettingIter iter, out unowned string key, out GLib.Value value);
525+ public Ag.Account account { construct; }
526+/* FIXME: Same name as a signal, so ignore for the moment.
527+ public bool enabled { get; }
528+ */
529+ public Ag.Service service { construct; }
530+ public signal void changed ();
531+ public signal void enabled (bool enabled);
532+ }
533+ [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 ()")]
534+ [Compact]
535+ public class AccountSettingIter {
536+ public weak Ag.Account account;
537+ public void free ();
538+ public bool next (out unowned string key, out GLib.Value value);
539+ }
540+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
541+ [Compact]
542+ public class AccountWatch {
543+ }
544+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_application_get_type ()")]
545+ [Compact]
546+ public class Application {
547+ public unowned string get_description ();
548+ public GLib.DesktopAppInfo get_desktop_app_info ();
549+ public unowned string get_i18n_domain ();
550+ public unowned string get_name ();
551+ public unowned string get_service_usage (Ag.Service service);
552+ public Ag.Application @ref ();
553+ public void unref ();
554+ }
555+ [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 ()")]
556+ [Compact]
557+ public class AuthData {
558+ public uint get_credentials_id ();
559+ public unowned string get_mechanism ();
560+ public unowned string get_method ();
561+ public unowned GLib.Variant get_login_parameters (GLib.Variant variant);
562+ [Deprecated (replacement = "get_login_parameters", since = "1.4")]
563+ public unowned GLib.HashTable<string,GLib.Value?> get_parameters ();
564+ [Deprecated (replacement = "get_login_parameters", since = "1.4")]
565+ public void insert_parameters (GLib.HashTable<string,GLib.Value?> parameters);
566+ public Ag.AuthData @ref ();
567+ public void unref ();
568+ }
569+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_manager_get_type ()")]
570+ public class Manager : GLib.Object {
571+ [CCode (has_construct_function = false)]
572+ public Manager ();
573+ public Ag.Account create_account (string provider_name);
574+ [CCode (has_construct_function = false)]
575+ public Manager.for_service_type (string service_type);
576+ public bool get_abort_on_db_timeout ();
577+ public Ag.Account get_account (Ag.AccountId account_id);
578+ public GLib.List<Ag.AccountService> get_account_services ();
579+ public Ag.Application get_application (string application_name);
580+ public uint get_db_timeout ();
581+ public GLib.List<Ag.AccountService> get_enabled_account_services ();
582+ public Ag.Provider get_provider (string provider_name);
583+ public Ag.Service get_service (string service_name);
584+ public unowned string get_service_type ();
585+ public GLib.List<uint> list ();
586+ public GLib.List<Ag.Application> list_applications_by_service (Ag.Service service);
587+ public GLib.List<uint> list_by_service_type (string service_type);
588+ public GLib.List<uint> list_enabled ();
589+ public GLib.List<uint> list_enabled_by_service_type (string service_type);
590+ public static void list_free (GLib.List<uint> list);
591+ public GLib.List<Ag.Provider> list_providers ();
592+ public GLib.List<Ag.ServiceType> list_service_types ();
593+ public GLib.List<Ag.Service> list_services ();
594+ public GLib.List<Ag.Service> list_services_by_type (string service_type);
595+ public Ag.Account load_account (Ag.AccountId account_id) throws Ag.AccountsError;
596+ public Ag.ServiceType load_service_type (string service_type);
597+ public void set_abort_on_db_timeout (bool abort);
598+ public void set_db_timeout (uint timeout_ms);
599+ public string service_type { get; construct; }
600+ public signal void account_created (uint account_id);
601+ public virtual signal void account_deleted (uint id);
602+ public signal void account_updated (uint account_id);
603+ public signal void enabled_event (uint account_id);
604+ }
605+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_provider_get_type ()")]
606+ [Compact]
607+ public class Provider {
608+ public unowned string get_display_name ();
609+ public unowned string get_description ();
610+ public unowned string get_domains_regex ();
611+ public void get_file_contents (string contents);
612+ public unowned string get_i18n_domain ();
613+ public unowned string get_icon_name ();
614+ public unowned string get_name ();
615+ public unowned string get_plugin_name ();
616+ public static void list_free (GLib.List<Ag.Provider> list);
617+ public bool match_domain (string domain);
618+ public Ag.Provider @ref ();
619+ public void unref ();
620+ }
621+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_service_get_type ()")]
622+ [Compact]
623+ public class Service {
624+ public unowned string get_display_name ();
625+ public unowned string get_description ();
626+ public void get_file_contents (string contents, size_t data_offset);
627+ public unowned string get_i18n_domain ();
628+ public unowned string get_icon_name ();
629+ public unowned string get_name ();
630+ public unowned string get_provider ();
631+ public unowned string get_service_type ();
632+ public GLib.List<weak string> get_tags ();
633+ public bool has_tag (string tag);
634+ public static void list_free (GLib.List<Ag.Service> list);
635+ public Ag.Service @ref ();
636+ public void unref ();
637+ }
638+ [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 ()")]
639+ [Compact]
640+ public class ServiceType {
641+ public unowned string get_display_name ();
642+ public unowned string get_description ();
643+ public void get_file_contents (string contents, size_t len);
644+ public unowned string get_i18n_domain ();
645+ public unowned string get_icon_name ();
646+ public unowned string get_name ();
647+ public GLib.List<weak string> get_tags ();
648+ public bool has_tag (string tag);
649+ public static void list_free (GLib.List<Ag.ServiceType> list);
650+ public Ag.ServiceType @ref ();
651+ public void unref ();
652+ }
653+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
654+ [SimpleType]
655+ public struct AccountId : uint {
656+ }
657+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_ACCOUNTS_ERROR_")]
658+ public errordomain AccountsError {
659+ DB,
660+ DISPOSED,
661+ DELETED,
662+ DB_LOCKED,
663+ ACCOUNT_NOT_FOUND,
664+ STORE_IN_PROGRESS
665+ }
666+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_SETTING_SOURCE_")]
667+ public enum SettingSource {
668+ NONE,
669+ ACCOUNT,
670+ PROFILE
671+ }
672+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
673+ public delegate void AccountNotifyCb (Ag.Account account, string key);
674+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
675+ public delegate void AccountServiceNotifyCb (Ag.AccountService self, string key);
676+ [Deprecated (since = "1.4")]
677+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)]
678+ public delegate void AccountStoreCb (Ag.Account account, GLib.Error error);
679+ [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")]
680+ public static GLib.Quark errors_quark ();
681+}
682
683=== modified file 'tests/.gitignore'
684--- tests/.gitignore 2012-03-07 11:25:09 +0000
685+++ tests/.gitignore 2013-06-05 14:03:26 +0000
686@@ -1,3 +1,4 @@
687 accounts-glib-testsuite
688 accounts_glib_testsuite-check_ag.c
689 test-process
690+tests.xml
691
692=== modified file 'tests/Makefile.am'
693--- tests/Makefile.am 2013-01-29 14:56:23 +0000
694+++ tests/Makefile.am 2013-06-05 14:03:26 +0000
695@@ -2,6 +2,10 @@
696
697 AM_CPPFLAGS = -I$(top_srcdir)
698
699+test_PROGRAMS = \
700+ accounts-glib-testsuite \
701+ test-process
702+
703 check_PROGRAMS = \
704 accounts-glib-testsuite \
705 test-process
706@@ -12,6 +16,9 @@
707 xml_test =
708 endif
709
710+test_SCRIPTS = \
711+ accounts-glib-test.sh
712+
713 dist_check_SCRIPTS = \
714 accounts-glib-test.sh \
715 $(xml_test)
716@@ -40,8 +47,18 @@
717
718 TESTS = $(dist_check_SCRIPTS)
719
720+tests.xml: tests.xml.in Makefile
721+ $(SED) -e 's|@''TESTDIR''@|$(testdir)|' \
722+ -e 's|@''TESTDATADIR''@|$(testdatadir)|' $< > $@
723+CLEANFILES = tests.xml
724+
725 dist_noinst_DATA = \
726- tests.xml \
727+ tests.xml.in
728+
729+test_DATA = \
730+ tests.xml
731+
732+dist_testdata_DATA = \
733 e-mail.service-type \
734 Gallery.application \
735 Mailer.application \
736@@ -50,3 +67,6 @@
737 MyService2.service \
738 OtherService.service \
739 maemo.provider
740+
741+installcheck-local: $(TESTS)
742+ cd "$(testdir)" && TESTDATADIR="$(testdatadir)" ./accounts-glib-test.sh
743
744=== modified file 'tests/accounts-glib-test.sh'
745--- tests/accounts-glib-test.sh 2012-10-18 06:58:02 +0000
746+++ tests/accounts-glib-test.sh 2013-06-05 14:03:26 +0000
747@@ -7,7 +7,10 @@
748 export ACCOUNTS=/tmp/
749 export AG_DEBUG=all
750 export G_MESSAGES_DEBUG=all
751-export G_DEBUG=fatal-criticals
752+# Since https://mail.gnome.org/archives/commits-list/2013-April/msg08256.html
753+# returning NULL from a constructor will emit a critical warning; until we take
754+# GInitable into use, disable failing on critical messages:
755+# export G_DEBUG=fatal-criticals
756 export G_SLICE=debug-blocks
757 export PATH=.:$PATH
758
759
760=== modified file 'tests/check_ag.c'
761--- tests/check_ag.c 2013-02-20 08:21:37 +0000
762+++ tests/check_ag.c 2013-06-05 14:03:26 +0000
763@@ -152,7 +152,6 @@
764
765 START_TEST(test_init)
766 {
767- g_type_init ();
768 manager = ag_manager_new ();
769
770 fail_unless (AG_IS_MANAGER (manager),
771@@ -164,7 +163,6 @@
772
773 START_TEST(test_object)
774 {
775- g_type_init ();
776 manager = ag_manager_new ();
777
778 account = ag_manager_create_account (manager, NULL);
779@@ -187,7 +185,6 @@
780 GList *providers, *list;
781 gboolean found;
782
783- g_type_init ();
784 manager = ag_manager_new ();
785
786 account = ag_manager_create_account (manager, PROVIDER);
787@@ -245,7 +242,6 @@
788 AgProvider *provider;
789 GVariant *variant;
790
791- g_type_init ();
792 manager = ag_manager_new ();
793
794 account = ag_manager_create_account (manager, "MyProvider");
795@@ -285,7 +281,6 @@
796
797 START_TEST(test_store)
798 {
799- g_type_init ();
800 manager = ag_manager_new ();
801
802 account = ag_manager_create_account (manager, PROVIDER);
803@@ -331,7 +326,6 @@
804 {
805 sqlite3 *db;
806
807- g_type_init ();
808 manager = ag_manager_new ();
809
810 account = ag_manager_create_account (manager, PROVIDER);
811@@ -394,7 +388,6 @@
812 GCancellable *cancellable;
813 gboolean cb_called = FALSE;
814
815- g_type_init ();
816 manager = ag_manager_new ();
817
818 account = ag_manager_create_account (manager, PROVIDER);
819@@ -438,8 +431,6 @@
820 AgSettingSource source;
821 AgAccountService *account_service;
822
823- g_type_init ();
824-
825 manager = ag_manager_new ();
826 account = ag_manager_create_account (manager, PROVIDER);
827
828@@ -526,8 +517,6 @@
829 gboolean service_enabled = FALSE;
830 GError *error = NULL;
831
832- g_type_init ();
833-
834 manager = ag_manager_new ();
835 account = ag_manager_create_account (manager, PROVIDER);
836
837@@ -659,8 +648,6 @@
838 AgSettingSource source;
839 gchar **changed_fields = NULL;
840
841- g_type_init ();
842-
843 manager = ag_manager_new ();
844 account = ag_manager_create_account (manager, PROVIDER);
845
846@@ -782,8 +769,6 @@
847 /* delete the database */
848 g_unlink (db_filename);
849
850- g_type_init ();
851-
852 manager = ag_manager_new ();
853
854 /* create a few accounts */
855@@ -982,8 +967,6 @@
856 /* delete the database */
857 g_unlink (db_filename);
858
859- g_type_init ();
860-
861 manager = ag_manager_new ();
862
863 key_prefix = g_strdup_printf ("auth/%s/%s", method, mechanism);
864@@ -1087,8 +1070,6 @@
865 const gchar *display = "desktop";
866 const gchar *animal = "cat";
867
868- g_type_init ();
869-
870 manager = ag_manager_new_for_service_type ("e-mail");
871
872 /* first, check the default parameters on a non-stored account */
873@@ -1168,8 +1149,6 @@
874 const gchar *display = "desktop";
875 const gchar *animal = "cat";
876
877- g_type_init ();
878-
879 manager = ag_manager_new_for_service_type ("e-mail");
880
881 /* reload the account and get the AccountService */
882@@ -1219,8 +1198,6 @@
883 GList *list;
884 gint i;
885
886- g_type_init ();
887-
888 manager = ag_manager_new ();
889
890 application = ag_manager_get_application (manager, "Mailer");
891@@ -1301,8 +1278,6 @@
892 AgSettingSource source;
893 GError *error = NULL;
894
895- g_type_init ();
896-
897 manager = ag_manager_new ();
898 account = ag_manager_create_account (manager, PROVIDER);
899
900@@ -1555,7 +1530,6 @@
901 GList *services;
902 AgService *service;
903
904- g_type_init ();
905 manager = ag_manager_new ();
906
907 account = ag_manager_create_account (manager, "maemo");
908@@ -1605,8 +1579,6 @@
909 gboolean notify_display_name_called = FALSE;
910 gboolean enabled = FALSE;
911
912- g_type_init ();
913-
914 manager = ag_manager_new ();
915 account = ag_manager_create_account (manager, PROVIDER);
916
917@@ -1652,8 +1624,6 @@
918 AgSettingSource source;
919 GList *list;
920
921- g_type_init ();
922-
923 manager = ag_manager_new ();
924 account = ag_manager_create_account (manager, PROVIDER);
925
926@@ -1757,8 +1727,6 @@
927 gint i, n_values, n_read;
928 const gint new_port_value = 432412;
929
930- g_type_init ();
931-
932 manager = ag_manager_new ();
933 account = ag_manager_create_account (manager, PROVIDER);
934
935@@ -1926,8 +1894,6 @@
936 gint i, n_values, n_read;
937 const gint new_port_value = 32412;
938
939- g_type_init ();
940-
941 manager = ag_manager_new ();
942 account = ag_manager_create_account (manager, PROVIDER);
943
944@@ -2073,8 +2039,6 @@
945 AgService *service;
946 const gchar *name;
947
948- g_type_init ();
949-
950 manager = ag_manager_new ();
951
952 /* get all services */
953@@ -2120,7 +2084,6 @@
954 AgServiceType *service_type;
955 const gchar *name, *tag;
956
957- g_type_init ();
958 manager = ag_manager_new ();
959
960 service_types = ag_manager_list_service_types (manager);
961@@ -2164,8 +2127,6 @@
962 AgAccountId id;
963 gboolean enabled_called, deleted_called;
964
965- g_type_init ();
966-
967 manager = ag_manager_new ();
968
969 /* create an account */
970@@ -2247,8 +2208,6 @@
971 AgAccountWatch w_server, w_port, w_dir;
972 GValue value = { 0 };
973
974- g_type_init ();
975-
976 manager = ag_manager_new ();
977 account = ag_manager_create_account (manager, PROVIDER);
978
979@@ -2398,8 +2357,6 @@
980 NULL
981 };
982
983- g_type_init ();
984-
985 manager = ag_manager_new ();
986
987 g_signal_connect (manager, "account-created",
988@@ -2608,8 +2565,6 @@
989 * reproducible only when the service was not yet in DB */
990 g_unlink (db_filename);
991
992- g_type_init ();
993-
994 manager = ag_manager_new ();
995 account = ag_manager_create_account (manager, PROVIDER);
996
997@@ -2706,8 +2661,6 @@
998 gint fd;
999 gint ret;
1000
1001- g_type_init ();
1002-
1003 /* create an account */
1004 manager = ag_manager_new ();
1005 account = ag_manager_create_account (manager, PROVIDER);
1006@@ -2793,8 +2746,6 @@
1007 /* delete the database */
1008 g_unlink (db_filename);
1009
1010- g_type_init ();
1011-
1012 manager = ag_manager_new ();
1013 account = ag_manager_create_account (manager, provider1);
1014 fail_unless (account != NULL);
1015@@ -2858,8 +2809,6 @@
1016 /* delete the database */
1017 g_unlink (db_filename);
1018
1019- g_type_init ();
1020-
1021 manager1 = ag_manager_new ();
1022 manager2 = ag_manager_new ();
1023
1024@@ -2905,8 +2854,6 @@
1025 {
1026 EnabledCbData ecd;
1027
1028- g_type_init();
1029-
1030 manager = ag_manager_new ();
1031 account = ag_manager_create_account (manager, PROVIDER);
1032
1033@@ -2942,8 +2889,6 @@
1034 AgAccountService *account_service;
1035 gboolean enabled_called, deleted_called;
1036
1037- g_type_init ();
1038-
1039 manager = ag_manager_new_for_service_type ("e-mail");
1040
1041 /* create an account */
1042@@ -3009,8 +2954,6 @@
1043 {
1044 gint create_signal_counter;
1045
1046- g_type_init ();
1047-
1048 manager = ag_manager_new ();
1049
1050 g_signal_connect (manager, "account-created",
1051@@ -3057,8 +3000,6 @@
1052 /* delete the database */
1053 g_unlink (db_filename);
1054
1055- g_type_init ();
1056-
1057 manager = ag_manager_new_for_service_type ("e-mail");
1058 fail_unless (g_strcmp0 (ag_manager_get_service_type (manager),
1059 "e-mail") == 0);
1060@@ -3141,8 +3082,6 @@
1061 {
1062 gint ret;
1063
1064- g_type_init();
1065-
1066 /* consume any still unprocessed D-Bus signals */
1067 run_main_loop_for_n_seconds (2);
1068
1069@@ -3208,7 +3147,6 @@
1070 AgAccount *account3 = NULL;
1071 const gchar *name = NULL;
1072
1073- g_type_init ();
1074 manager = ag_manager_new ();
1075 fail_unless (manager != NULL, "Manager should not be NULL");
1076
1077@@ -3286,8 +3224,6 @@
1078 * */
1079 AgAccount *account4;
1080
1081- g_type_init ();
1082-
1083 /* delete the database */
1084 g_unlink (db_filename);
1085
1086@@ -3392,8 +3328,6 @@
1087 const gchar *string;
1088 AgServiceType *service_type;
1089
1090- g_type_init ();
1091-
1092 manager = ag_manager_new ();
1093
1094 service_type = ag_manager_load_service_type (manager, "I don't exist");
1095@@ -3472,7 +3406,6 @@
1096 * account-created signal and call
1097 * ag_account_list_enabled_services(), we shouldn't be blocked.
1098 */
1099- g_type_init ();
1100
1101 /* first, create a lock file to synchronize the test */
1102 lock_filename = "/tmp/check_ag.lock";
1103
1104=== modified file 'tests/test-process.c'
1105--- tests/test-process.c 2012-10-17 14:02:06 +0000
1106+++ tests/test-process.c 2013-06-05 14:03:26 +0000
1107@@ -372,8 +372,6 @@
1108 {
1109 TestArgs args;
1110
1111- g_type_init ();
1112-
1113 if (argc >= 2)
1114 {
1115 const gchar *test_name = argv[1];
1116
1117=== removed file 'tests/tests.xml'
1118--- tests/tests.xml 2010-03-04 13:06:31 +0000
1119+++ tests/tests.xml 1970-01-01 00:00:00 +0000
1120@@ -1,16 +0,0 @@
1121-<testdefinition version="0.1">
1122- <suite name="libaccounts-glib0-tests" domain="Accounts and SSO">
1123- <set description="libaccounts-glib0-tests:accounts-glib-tests" name="/usr/bin/accounts-glib-test.sh">
1124- <case description="libaccounts-glib-tests:accounts-glib-test.sh" name="accounts-glib-test.sh" type="Functional" level="Feature">
1125- <step>/usr/bin/accounts-glib-test.sh</step>
1126- </case>
1127- <environments><scratchbox>true</scratchbox>
1128- <hardware>true</hardware></environments>
1129- </set>
1130- </suite>
1131-</testdefinition>
1132-
1133-
1134-
1135-
1136-
1137
1138=== added file 'tests/tests.xml.in'
1139--- tests/tests.xml.in 1970-01-01 00:00:00 +0000
1140+++ tests/tests.xml.in 2013-06-05 14:03:26 +0000
1141@@ -0,0 +1,11 @@
1142+<testdefinition version="0.1">
1143+ <suite name="libaccounts-glib0-tests" domain="Accounts and SSO">
1144+ <set description="libaccounts-glib0-tests:accounts-glib-tests" name="@TESTDIR@/accounts-glib-test.sh">
1145+ <case description="libaccounts-glib-tests:accounts-glib-test.sh" name="accounts-glib-test.sh" type="Functional" level="Feature">
1146+ <step>(cd @TESTDIR@ &amp;&amp; TESTDATADIR=@TESTDATADIR@ ./accounts-glib-test.sh)</step>
1147+ </case>
1148+ <environments><scratchbox>true</scratchbox>
1149+ <hardware>true</hardware></environments>
1150+ </set>
1151+ </suite>
1152+</testdefinition>
1153
1154=== modified file 'tools/main.c'
1155--- tools/main.c 2012-10-16 07:40:27 +0000
1156+++ tools/main.c 2013-06-05 14:03:26 +0000
1157@@ -1268,8 +1268,6 @@
1158 gint
1159 main (int argc, char **argv)
1160 {
1161- g_type_init ();
1162-
1163 gl_app_name = g_path_get_basename (argv[0]);
1164
1165 if (argc < 2)

Subscribers

People subscribed via source and target branches

to all changes: