Merge lp:~online-accounts/libaccounts-glib/packaging into lp:libaccounts-glib

Proposed by Alberto Mardegan on 2015-12-09
Status: Merged
Approved by: David Barth on 2016-01-05
Approved revision: no longer in the source branch.
Merged at revision: 192
Proposed branch: lp:~online-accounts/libaccounts-glib/packaging
Merge into: lp:libaccounts-glib
Diff against target: 636 lines (+125/-50)
10 files modified
README (+0/-23)
README.md (+25/-0)
configure.ac (+11/-12)
debian/changelog (+15/-0)
docs/reference/libaccounts-glib-docs.xml (+1/-1)
libaccounts-glib/Makefile.am (+1/-1)
libaccounts-glib/ag-account.c (+14/-2)
libaccounts-glib/ag-manager.c (+16/-4)
m4/gcov.m4 (+6/-7)
tests/check_ag.c (+36/-0)
To merge this branch: bzr merge lp:~online-accounts/libaccounts-glib/packaging
Reviewer Review Type Date Requested Status
Online Accounts 2015-12-09 Pending
Review via email: mp+279982@code.launchpad.net

Commit message

New upstream release

- Build: ignore deprecations of GSimpleAsyncResult (LP: #1521226)
- Build: don't emit a build error on deprecations
- Coverage: allow lcov versions up to 1.11
- Build: fix handling of coverage flags
- Build: fix build errors when building with clang
- Update account ID after a remotely-executed store
- Vala: add allow-none and update VAPI file
  https://code.google.com/p/accounts-sso/issues/detail?id=241
- Build: multiarch fixes

Description of the change

New upstream release

- Build: ignore deprecations of GSimpleAsyncResult (LP: #1521226)
- Build: don't emit a build error on deprecations
- Coverage: allow lcov versions up to 1.11
- Build: fix handling of coverage flags
- Build: fix build errors when building with clang
- Update account ID after a remotely-executed store
- Vala: add allow-none and update VAPI file
  https://code.google.com/p/accounts-sso/issues/detail?id=241
- Build: multiarch fixes

To post a comment you must log in.
192. By Alberto Mardegan on 2015-12-21

New upstream release

- Build: ignore deprecations of GSimpleAsyncResult (LP: #1521226)
- Build: don't emit a build error on deprecations
- Coverage: allow lcov versions up to 1.11
- Build: fix handling of coverage flags
- Build: fix build errors when building with clang
- Update account ID after a remotely-executed store
- Vala: add allow-none and update VAPI file
  https://code.google.com/p/accounts-sso/issues/detail?id=241
- Build: multiarch fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-10-26 13:17:50 +0000
3+++ README 1970-01-01 00:00:00 +0000
4@@ -1,23 +0,0 @@
5-Accounts management library for GLib applications
6--------------------------------------------------
7-
8-This project is a library for managing accounts which can be used from GLib
9-applications. It is part of the accounts-sso project:
10-
11-http://code.google.com/p/accounts-sso/
12-
13-Dependencies
14-------------
15-
16-The project depends on GLib (including GIO and GObject), libxml2, sqlite3 and
17-check.
18-
19-Licence
20--------
21-
22-The library is licensed under the GNU LGPL version 2.1.
23-
24-Resources
25----------
26-
27-http://code.google.com/p/accounts-sso/sources/list?repo=libaccounts-glib
28
29=== target is u'README.md'
30=== added file 'README.md'
31--- README.md 1970-01-01 00:00:00 +0000
32+++ README.md 2015-12-21 08:56:17 +0000
33@@ -0,0 +1,25 @@
34+Accounts management library for GLib applications
35+=================================================
36+
37+This project is a library for managing accounts which can be used from GLib
38+applications. It is part of the @accounts-sso project.
39+
40+
41+License
42+-------
43+
44+See COPYING file.
45+
46+
47+Build instructions
48+------------------
49+
50+The project depends on GLib (including GIO and GObject), libxml2, sqlite3 and
51+check.
52+To build it, run:
53+```
54+./autogen.sh
55+./configure
56+make
57+make install
58+```
59
60=== modified file 'configure.ac'
61--- configure.ac 2014-09-01 13:14:34 +0000
62+++ configure.ac 2015-12-21 08:56:17 +0000
63@@ -1,10 +1,10 @@
64 dnl Process this file with autoconf to produce a configure script.
65 AC_PREREQ([2.64])
66 AC_INIT([libaccounts-glib],
67- [1.18],
68- [http://code.google.com/p/accounts-sso/issues/entry],
69+ [1.19],
70+ [https://gitlab.com/accounts-sso/libaccounts-glib/issues],
71 [libaccounts-glib],
72- [http://code.google.com/p/accounts-sso/])
73+ [https://gitlab.com/accounts-sso/libaccounts-glib])
74
75 AC_CONFIG_AUX_DIR([build-aux])
76 AC_CONFIG_HEADERS([config.h])
77@@ -69,18 +69,17 @@
78 [testdatadir="$withval"],
79 [testdatadir="\${pkgdatadir}/testdata"])
80 AC_MSG_RESULT([$testdatadir])
81- AC_SUBST([testdatadir])
82-
83- # gcov coverage reporting
84- m4_include([m4/gcov.m4])
85- AC_TDD_GCOV
86- AC_SUBST(COVERAGE_CFLAGS)
87- AC_SUBST(COVERAGE_CXXFLAGS)
88- AC_SUBST(COVERAGE_LDFLAGS)
89- ],
90+ AC_SUBST([testdatadir])],
91 [AS_IF([test "x$enable_tests" = "xyes"],
92 [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
93
94+# gcov coverage reporting
95+m4_include([m4/gcov.m4])
96+AC_TDD_GCOV
97+AC_SUBST(COVERAGE_CFLAGS)
98+AC_SUBST(COVERAGE_CXXFLAGS)
99+AC_SUBST(COVERAGE_LDFLAGS)
100+
101 AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
102
103 GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
104
105=== modified file 'debian/changelog'
106--- debian/changelog 2015-01-16 17:20:53 +0000
107+++ debian/changelog 2015-12-21 08:56:17 +0000
108@@ -1,3 +1,18 @@
109+libaccounts-glib (1.19-0ubuntu1) UNRELEASED; urgency=medium
110+
111+ * New upstream release
112+ - Build: ignore deprecations of GSimpleAsyncResult (LP: #1521226)
113+ - Build: don't emit a build error on deprecations
114+ - Coverage: allow lcov versions up to 1.11
115+ - Build: fix handling of coverage flags
116+ - Build: fix build errors when building with clang
117+ - Update account ID after a remotely-executed store
118+ - Vala: add allow-none and update VAPI file
119+ https://code.google.com/p/accounts-sso/issues/detail?id=241
120+ - Build: multiarch fixes
121+
122+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 09 Dec 2015 09:49:05 +0200
123+
124 libaccounts-glib (1.18+15.04.20150116-0ubuntu1) vivid; urgency=low
125
126 [ Ubuntu daily release ]
127
128=== modified file 'docs/reference/libaccounts-glib-docs.xml'
129--- docs/reference/libaccounts-glib-docs.xml 2013-01-08 13:37:54 +0000
130+++ docs/reference/libaccounts-glib-docs.xml 2015-12-21 08:56:17 +0000
131@@ -10,7 +10,7 @@
132 <releaseinfo>
133 This document is for libaccounts-glib, version &version;. The latest
134 version of this documentation can be built from the source code at
135- <ulink role="online-location" url="https://code.google.com/p/accounts-sso/source/checkout?repo=libaccounts-glib">https://code.google.com/p/accounts-sso/source/checkout?repo=libaccounts-glib</ulink>.
136+ <ulink role="online-location" url="https://gitlab.com/accounts-sso/libaccounts-glib">https://gitlab.com/accounts-sso/libaccounts-glib</ulink>.
137 </releaseinfo>
138 </bookinfo>
139
140
141=== modified file 'libaccounts-glib/Makefile.am'
142--- libaccounts-glib/Makefile.am 2014-10-30 15:35:02 +0000
143+++ libaccounts-glib/Makefile.am 2015-12-21 08:56:17 +0000
144@@ -9,7 +9,7 @@
145 libaccounts_glib_la_CFLAGS = \
146 $(LIBACCOUNTS_CFLAGS) \
147 $(COVERAGE_CFLAGS) \
148- -Wall -Werror
149+ -Wall -Werror -Wno-error=deprecated-declarations
150 libaccounts_glib_la_LIBADD = \
151 $(LIBACCOUNTS_LIBS)
152 libaccounts_glib_la_LDFLAGS = \
153
154=== modified file 'libaccounts-glib/ag-account.c'
155--- libaccounts-glib/ag-account.c 2014-01-03 13:25:25 +0000
156+++ libaccounts-glib/ag-account.c 2015-12-21 08:56:17 +0000
157@@ -291,8 +291,10 @@
158
159 if (ts)
160 {
161- g_variant_builder_add (&builder, "u", ts->tv_sec);
162- g_variant_builder_add (&builder, "u", ts->tv_nsec);
163+ guint32 sec = ts->tv_sec;
164+ guint32 nsec = ts->tv_nsec;
165+ g_variant_builder_add (&builder, "u", sec);
166+ g_variant_builder_add (&builder, "u", nsec);
167 }
168 g_variant_builder_add (&builder, "u", account->id);
169 g_variant_builder_add (&builder, "b", changes->created);
170@@ -695,7 +697,9 @@
171 {
172 AgAccountPrivate *priv = account->priv;
173
174+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
175 g_simple_async_result_complete_in_idle (priv->store_async_result);
176+G_GNUC_END_IGNORE_DEPRECATIONS
177 g_clear_object (&priv->store_async_result);
178
179 _ag_account_changes_free (changes);
180@@ -2485,28 +2489,34 @@
181 if (G_UNLIKELY (priv->store_async_result != NULL))
182 {
183 g_critical ("ag_account_store_async called again before completion");
184+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
185 g_simple_async_report_error_in_idle ((GObject *)account,
186 callback, user_data,
187 AG_ACCOUNTS_ERROR,
188 AG_ACCOUNTS_ERROR_STORE_IN_PROGRESS,
189 "Store operation already "
190 "in progress");
191+G_GNUC_END_IGNORE_DEPRECATIONS
192 return;
193 }
194
195+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
196 priv->store_async_result =
197 g_simple_async_result_new ((GObject *)account,
198 callback, user_data,
199 ag_account_store_async);
200 g_simple_async_result_set_check_cancellable (priv->store_async_result,
201 cancellable);
202+G_GNUC_END_IGNORE_DEPRECATIONS
203 g_object_add_weak_pointer ((GObject *)priv->store_async_result,
204 (gpointer *)&priv->store_async_result);
205
206 if (G_UNLIKELY (priv->changes == NULL))
207 {
208 /* Nothing to do: invoke the callback immediately */
209+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
210 g_simple_async_result_complete_in_idle (priv->store_async_result);
211+G_GNUC_END_IGNORE_DEPRECATIONS
212 g_clear_object (&priv->store_async_result);
213 return;
214 }
215@@ -2537,7 +2547,9 @@
216 g_return_val_if_fail (AG_IS_ACCOUNT (account), FALSE);
217
218 async_result = (GSimpleAsyncResult *)res;
219+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
220 return !g_simple_async_result_propagate_error (async_result, error);
221+G_GNUC_END_IGNORE_DEPRECATIONS
222 }
223
224 /**
225
226=== modified file 'libaccounts-glib/ag-manager.c'
227--- libaccounts-glib/ag-manager.c 2015-01-12 12:14:54 +0000
228+++ libaccounts-glib/ag-manager.c 2015-12-21 08:56:17 +0000
229@@ -187,6 +187,7 @@
230 GVariant *result;
231 GError *error_int = NULL;
232
233+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
234 result = g_dbus_connection_call_finish (conn, res, &error_int);
235 if (G_UNLIKELY (error_int))
236 {
237@@ -221,6 +222,7 @@
238
239 g_simple_async_result_complete_in_idle (async_result);
240 g_object_unref (async_result);
241+G_GNUC_END_IGNORE_DEPRECATIONS
242 }
243
244 static void
245@@ -233,11 +235,13 @@
246 GVariant *dbus_changes;
247
248 if (G_UNLIKELY (!priv->use_dbus)) {
249+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
250 g_simple_async_result_set_error (async_result,
251 AG_ACCOUNTS_ERROR,
252 AG_ACCOUNTS_ERROR_READONLY,
253 "DB read-only and D-Bus disabled");
254 g_simple_async_result_complete_in_idle (async_result);
255+G_GNUC_END_IGNORE_DEPRECATIONS
256 g_object_unref (async_result);
257 return;
258 }
259@@ -517,7 +521,7 @@
260 set_error_from_db (AgManager *manager)
261 {
262 AgManagerPrivate *priv = manager->priv;
263- AgError code;
264+ AgAccountsError code;
265 GError *error;
266
267 switch (sqlite3_errcode (priv->db))
268@@ -695,16 +699,18 @@
269 if (!object_path_is_interesting (object_path, priv->object_paths))
270 return;
271
272- memset (&ts, 0, sizeof (struct timespec));
273+ guint32 sec, nsec;
274 g_variant_get (msg,
275 "(uuubb&s@*)",
276- &ts.tv_sec,
277- &ts.tv_nsec,
278+ &sec,
279+ &nsec,
280 &account_id,
281 &created,
282 &deleted,
283 &provider_name,
284 &v_services);
285+ ts.tv_sec = sec;
286+ ts.tv_nsec = nsec;
287
288 DEBUG_INFO ("path = %s, time = %lu-%lu (%p)",
289 object_path, ts.tv_sec, ts.tv_nsec,
290@@ -1104,7 +1110,9 @@
291 finish:
292 if (error != NULL)
293 {
294+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
295 g_simple_async_result_take_error (sd->async_result, error);
296+G_GNUC_END_IGNORE_DEPRECATIONS
297 }
298
299 _ag_account_store_completed (account, sd->changes);
300@@ -2409,7 +2417,9 @@
301 finish:
302 if (error != NULL)
303 {
304+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
305 g_simple_async_result_take_error (async_result, error);
306+G_GNUC_END_IGNORE_DEPRECATIONS
307 }
308
309 _ag_account_store_completed (account, changes);
310@@ -2470,9 +2480,11 @@
311 sql = _ag_account_get_store_sql (account, &error);
312 if (G_UNLIKELY (error))
313 {
314+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
315 g_simple_async_result_take_error (async_result,
316 error);
317 g_simple_async_result_complete_in_idle (async_result);
318+G_GNUC_END_IGNORE_DEPRECATIONS
319 g_object_unref (async_result);
320 return;
321 }
322
323=== modified file 'm4/gcov.m4'
324--- m4/gcov.m4 2013-10-15 11:49:25 +0000
325+++ m4/gcov.m4 2015-12-21 08:56:17 +0000
326@@ -24,12 +24,11 @@
327 [
328 AC_ARG_ENABLE(gcov,
329 AS_HELP_STRING([--enable-gcov],
330- [enable coverage testing with gcov]),
331- [use_gcov=yes], [use_gcov=no])
332-
333- AM_CONDITIONAL(HAVE_GCOV, test "x$use_gcov" = "xyes")
334-
335- if test "x$use_gcov" = "xyes"; then
336+ [enable coverage testing with gcov]))
337+
338+ AM_CONDITIONAL(HAVE_GCOV, test "x$enable_gcov" = "xyes")
339+
340+ if test "x$enable_gcov" = "xyes"; then
341 # we need gcc:
342 if test "$GCC" != "yes"; then
343 AC_MSG_ERROR([GCC is required for --enable-gcov])
344@@ -47,7 +46,7 @@
345 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
346 fi
347
348- lcov_version_list="1.6 1.7 1.8 1.9"
349+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
350 AC_CHECK_PROG(LCOV, lcov, lcov)
351 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
352
353
354=== modified file 'tests/check_ag.c'
355--- tests/check_ag.c 2015-01-12 13:31:35 +0000
356+++ tests/check_ag.c 2015-12-21 08:56:17 +0000
357@@ -717,6 +717,7 @@
358 ag_account_store (account, account_store_now_cb, TEST_STRING);
359 run_main_loop_for_n_seconds(0);
360 fail_unless (data_stored, "Callback not invoked immediately");
361+ data_stored = FALSE;
362
363 service = ag_manager_get_service (manager, "MyService");
364 fail_unless (service != NULL);
365@@ -807,6 +808,7 @@
366 ag_account_store (account, account_store_now_cb, TEST_STRING);
367 run_main_loop_for_n_seconds(0);
368 fail_unless (data_stored, "Callback not invoked immediately");
369+ data_stored = FALSE;
370 account_id = account->id;
371
372 g_signal_connect (account_service, "enabled",
373@@ -820,6 +822,7 @@
374 ag_account_store (account, account_store_now_cb, TEST_STRING);
375 run_main_loop_for_n_seconds(0);
376 fail_unless (data_stored, "Callback not invoked immediately");
377+ data_stored = FALSE;
378
379 /* Still disabled, because the account is disabled */
380 fail_unless (service_enabled == FALSE);
381@@ -834,6 +837,7 @@
382 ag_account_store (account, account_store_now_cb, TEST_STRING);
383 run_main_loop_for_n_seconds(0);
384 fail_unless (data_stored, "Callback not invoked immediately");
385+ data_stored = FALSE;
386
387 fail_unless (service_enabled == TRUE);
388 service_enabled = FALSE;
389@@ -882,6 +886,7 @@
390 ag_account_store (account, account_store_now_cb, TEST_STRING);
391 run_main_loop_for_n_seconds(0);
392 fail_unless (data_stored, "Callback not invoked immediately");
393+ data_stored = FALSE;
394
395 fail_unless (service_enabled == FALSE);
396
397@@ -959,6 +964,7 @@
398 ag_account_store (account, account_store_now_cb, TEST_STRING);
399 run_main_loop_for_n_seconds(0);
400 fail_unless (data_stored, "Callback not invoked immediately");
401+ data_stored = FALSE;
402
403 /* The callback for the "changed" signal should have been emitted.
404 * Let's check what changed fields were reported, and what their value
405@@ -994,6 +1000,7 @@
406 ag_account_store (account, account_store_now_cb, TEST_STRING);
407 run_main_loop_for_n_seconds(0);
408 fail_unless (data_stored, "Callback not invoked immediately");
409+ data_stored = FALSE;
410
411 /* The callback for the "changed" signal should have been emitted.
412 * Let's check what changed fields were reported, and what their value
413@@ -1116,6 +1123,7 @@
414 ag_account_store (account, account_store_now_cb, TEST_STRING);
415 run_main_loop_for_n_seconds(0);
416 fail_unless (data_stored, "Callback not invoked immediately");
417+ data_stored = FALSE;
418 account_id[i] = account->id;
419 g_object_unref (account);
420 account = NULL;
421@@ -1153,6 +1161,7 @@
422 ag_account_store (account, account_store_now_cb, TEST_STRING);
423 run_main_loop_for_n_seconds(0);
424 fail_unless (data_stored, "Callback not invoked immediately");
425+ data_stored = FALSE;
426 g_object_unref (account);
427
428 account = ag_manager_get_account (manager, account_id[1]);
429@@ -1165,6 +1174,7 @@
430 ag_account_store (account, account_store_now_cb, TEST_STRING);
431 run_main_loop_for_n_seconds(0);
432 fail_unless (data_stored, "Callback not invoked immediately");
433+ data_stored = FALSE;
434 g_object_unref (account);
435
436 account = ag_manager_get_account (manager, account_id[2]);
437@@ -1176,6 +1186,7 @@
438 ag_account_store (account, account_store_now_cb, TEST_STRING);
439 run_main_loop_for_n_seconds(0);
440 fail_unless (data_stored, "Callback not invoked immediately");
441+ data_stored = FALSE;
442
443 g_object_unref (manager);
444
445@@ -1339,6 +1350,7 @@
446 ag_account_store (account, account_store_now_cb, TEST_STRING);
447 run_main_loop_for_n_seconds(0);
448 fail_unless (data_stored, "Callback not invoked immediately");
449+ data_stored = FALSE;
450 account_id = account->id;
451 g_object_unref (account);
452 account = NULL;
453@@ -1760,6 +1772,7 @@
454 ag_account_store (account, account_store_now_cb, TEST_STRING);
455 run_main_loop_for_n_seconds(0);
456 fail_unless (data_stored, "Callback not invoked immediately");
457+ data_stored = FALSE;
458
459 g_debug ("Service id: %d", service->id);
460 g_debug ("Service2 id: %d", service2->id);
461@@ -1859,6 +1872,7 @@
462 ag_account_store (account, account_store_now_cb, TEST_STRING);
463 run_main_loop_for_n_seconds(0);
464 fail_unless (data_stored, "Callback not invoked immediately");
465+ data_stored = FALSE;
466
467 fail_unless (ag_account_get_enabled (account) == TRUE,
468 "Account still disabled!");
469@@ -1990,6 +2004,7 @@
470 ag_account_store (account, account_store_now_cb, TEST_STRING);
471 run_main_loop_for_n_seconds(0);
472 fail_unless (data_stored, "Callback not invoked immediately");
473+ data_stored = FALSE;
474 account_id = account->id;
475
476 manager2 = ag_manager_new ();
477@@ -2012,6 +2027,7 @@
478 ag_account_store (account, account_store_now_cb, TEST_STRING);
479 run_main_loop_for_n_seconds(0);
480 fail_unless (data_stored, "Callback not invoked immediately");
481+ data_stored = FALSE;
482
483 main_loop = g_main_loop_new (NULL, FALSE);
484 g_timeout_add_seconds (2, quit_loop, main_loop);
485@@ -2054,6 +2070,7 @@
486 ag_account_store (account, account_store_now_cb, TEST_STRING);
487 run_main_loop_for_n_seconds(0);
488 fail_unless (data_stored, "Callback not invoked immediately");
489+ data_stored = FALSE;
490
491 fail_unless (account->id != 0, "Account ID is still 0!");
492
493@@ -2152,6 +2169,7 @@
494 ag_account_store (account, account_store_now_cb, TEST_STRING);
495 run_main_loop_for_n_seconds(0);
496 fail_unless (data_stored, "Callback not invoked immediately");
497+ data_stored = FALSE;
498
499 fail_unless (account->id != 0, "Account ID is still 0!");
500
501@@ -2247,6 +2265,7 @@
502 ag_account_store (account, account_store_now_cb, TEST_STRING);
503 run_main_loop_for_n_seconds(0);
504 fail_unless (data_stored, "Callback not invoked immediately");
505+ data_stored = FALSE;
506
507 /* enumerate the parameters */
508 n_read = 0;
509@@ -2317,6 +2336,7 @@
510 ag_account_store (account, account_store_now_cb, TEST_STRING);
511 run_main_loop_for_n_seconds(0);
512 fail_unless (data_stored, "Callback not invoked immediately");
513+ data_stored = FALSE;
514
515 fail_unless (account->id != 0, "Account ID is still 0!");
516
517@@ -2409,6 +2429,7 @@
518 ag_account_store (account, account_store_now_cb, TEST_STRING);
519 run_main_loop_for_n_seconds(0);
520 fail_unless (data_stored, "Callback not invoked immediately");
521+ data_stored = FALSE;
522
523 /* enumerate the parameters */
524 n_read = 0;
525@@ -2543,6 +2564,7 @@
526 ag_account_store (account, account_store_now_cb, TEST_STRING);
527 run_main_loop_for_n_seconds(0);
528 fail_unless (data_stored, "Callback not invoked immediately");
529+ data_stored = FALSE;
530
531 fail_unless (account->id != 0, "Account ID is still 0!");
532 id = account->id;
533@@ -2568,6 +2590,7 @@
534 ag_account_store (account, account_store_now_cb, TEST_STRING);
535 run_main_loop_for_n_seconds(0);
536 fail_unless (data_stored, "Callback not invoked immediately");
537+ data_stored = FALSE;
538
539 /* check that the signals are emitted */
540 fail_unless (enabled_called, "Accound enabled signal not emitted");
541@@ -2649,6 +2672,7 @@
542 ag_account_store (account, account_store_now_cb, TEST_STRING);
543 run_main_loop_for_n_seconds(0);
544 fail_unless (data_stored, "Callback not invoked immediately");
545+ data_stored = FALSE;
546
547 /* if we didn't change the server, make sure the callback is not
548 * invoked */
549@@ -2681,6 +2705,7 @@
550 ag_account_store (account, account_store_now_cb, TEST_STRING);
551 run_main_loop_for_n_seconds(0);
552 fail_unless (data_stored, "Callback not invoked immediately");
553+ data_stored = FALSE;
554
555 /* make sure the callback for the server is invoked */
556 fail_unless (server_changed == TRUE, "Callback for 'server' not invoked");
557@@ -3034,6 +3059,7 @@
558 ag_account_store (account, account_store_now_cb, TEST_STRING);
559 run_main_loop_for_n_seconds(0);
560 fail_unless (data_stored, "Callback not invoked immediately");
561+ data_stored = FALSE;
562
563 g_debug ("Service id: %d", service->id);
564 g_debug ("Account id: %d", account->id);
565@@ -3188,6 +3214,7 @@
566 ag_account_store (account, account_store_now_cb, TEST_STRING);
567 run_main_loop_for_n_seconds(0);
568 fail_unless (data_stored, "Callback not invoked immediately");
569+ data_stored = FALSE;
570
571 account_id1 = account->id;
572
573@@ -3198,6 +3225,7 @@
574 ag_account_store (account, account_store_now_cb, TEST_STRING);
575 run_main_loop_for_n_seconds(0);
576 fail_unless (data_stored, "Callback not invoked immediately");
577+ data_stored = FALSE;
578
579 /* after deleting the account, we shouldn't get it anymore, even if we
580 * didn't release our reference */
581@@ -3213,6 +3241,7 @@
582 ag_account_store (account, account_store_now_cb, TEST_STRING);
583 run_main_loop_for_n_seconds(0);
584 fail_unless (data_stored, "Callback not invoked immediately");
585+ data_stored = FALSE;
586
587 account_id2 = account->id;
588
589@@ -3266,10 +3295,12 @@
590 ag_account_store (account1, account_store_now_cb, TEST_STRING);
591 run_main_loop_for_n_seconds(0);
592 fail_unless (data_stored, "Callback not invoked immediately");
593+ data_stored = FALSE;
594
595 ag_account_store (account2, account_store_now_cb, TEST_STRING);
596 run_main_loop_for_n_seconds(0);
597 fail_unless (data_stored, "Callback not invoked immediately");
598+ data_stored = FALSE;
599
600 fail_unless (account1->id != 0);
601 fail_unless (account2->id != 0);
602@@ -3339,6 +3370,7 @@
603 ag_account_store (account, account_store_now_cb, TEST_STRING);
604 run_main_loop_for_n_seconds(0);
605 fail_unless (data_stored, "Callback not invoked immediately");
606+ data_stored = FALSE;
607
608 fail_unless (account->id != 0, "Account ID is still 0!");
609 id = account->id;
610@@ -3366,6 +3398,7 @@
611 ag_account_store (account, account_store_now_cb, TEST_STRING);
612 run_main_loop_for_n_seconds(0);
613 fail_unless (data_stored, "Callback not invoked immediately");
614+ data_stored = FALSE;
615
616 /* check that the signals are emitted */
617 fail_unless (enabled_called, "Accound enabled signal not emitted");
618@@ -3460,9 +3493,11 @@
619 ag_account_store (account1, account_store_now_cb, TEST_STRING);
620 run_main_loop_for_n_seconds(0);
621 fail_unless (data_stored, "Callback not invoked immediately");
622+ data_stored = FALSE;
623 ag_account_store (account2, account_store_now_cb, TEST_STRING);
624 run_main_loop_for_n_seconds(0);
625 fail_unless (data_stored, "Callback not invoked immediately");
626+ data_stored = FALSE;
627
628 fail_unless (account1->id != 0);
629 fail_unless (account2->id != 0);
630@@ -3538,6 +3573,7 @@
631 ag_account_store (account, account_store_now_cb, TEST_STRING);
632 run_main_loop_for_n_seconds(0);
633 fail_unless (data_stored, "Callback not invoked immediately");
634+ data_stored = FALSE;
635
636 main_loop = g_main_loop_new (NULL, FALSE);
637

Subscribers

No one subscribed via source and target branches