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

[Alberto Mardegan]

New upstream release

Fix SQL query for ag_manager_list_by_service_type()
Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=208

New upstream release

Fix SQL query for ag_manager_list_by_service_type()
Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=208

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:181
http://jenkins.qa.ubuntu.com/job/libaccounts-glib-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libaccounts-glib-trusty-amd64-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libaccounts-glib-ci/33/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Approve

[lp:~mardy/libaccounts-glib/packaging]

180. By Alberto Mardegan on 2013-11-07

New upstream release

Fix SQL query for ag_manager_list_by_service_type()
Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=208
.

Approved by Ken VanDine, PS Jenkins bot.

=== modified file 'Makefile.am.coverage'
--- Makefile.am.coverage	2013-10-15 11:49:25 +0000
+++ Makefile.am.coverage	2013-10-30 13:44:50 +0000
@@ -1,8 +1,6 @@
 
 # Coverage targets
 
-if HAVE_GCOV
-
 .PHONY: clean-gcda
 clean-gcda:
 	@echo Removing old coverage results
@@ -13,6 +11,8 @@
 	-$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
 
+if HAVE_GCOV
+
 generate-coverage-html:
 	@echo Collecting coverage data
 	$(AM_V_at)$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
@@ -24,4 +24,14 @@
 
 clean-local: clean-coverage-html
 
+else
+
+generate-coverage-html:
+	$(AM_V_at)echo "Code coverage reporting not available"
+
+clean-coverage-html: clean-gcda
+	-$(AM_V_at)rm -rf coverage.info coveragereport
+
+clean-local: clean-coverage-html
+
 endif # HAVE_GCOV

=== modified file 'NEWS'
--- NEWS	2013-10-15 13:35:53 +0000
+++ NEWS	2013-10-30 13:44:50 +0000
@@ -1,5 +1,11 @@
 libaccounts-glib NEWS
 
+Version 1.15
+------------
+
+* Fix SQL query for ag_manager_list_by_service_type()
+  Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=208
+
 Version 1.14
 ------------
 

=== modified file 'configure.ac'
--- configure.ac	2013-10-15 13:35:53 +0000
+++ configure.ac	2013-10-30 13:44:50 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([libaccounts-glib],
-        [1.14],
+        [1.15],
         [http://code.google.com/p/accounts-sso/issues/entry],
         [libaccounts-glib],
         [http://code.google.com/p/accounts-sso/])

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-16 14:15:26 +0000
+++ debian/changelog	2013-10-30 13:44:50 +0000
@@ -1,3 +1,11 @@
+libaccounts-glib (1.15-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - Fix SQL query for ag_manager_list_by_service_type()
+      Fixes: http://code.google.com/p/accounts-sso/issues/detail?id=208
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 30 Oct 2013 15:42:48 +0200
+
 libaccounts-glib (1.14+13.10.20131016.2-0ubuntu1) saucy; urgency=low
 
   [ Alberto Mardegan ]

=== modified file 'libaccounts-glib/ag-manager.c'
--- libaccounts-glib/ag-manager.c	2013-10-03 13:44:27 +0000
+++ libaccounts-glib/ag-manager.c	2013-10-30 13:44:50 +0000
@@ -1699,9 +1699,8 @@
 
     g_return_val_if_fail (AG_IS_MANAGER (manager), NULL);
     sqlite3_snprintf (sizeof (sql), sql,
-                      "SELECT DISTINCT account FROM Settings "
-                      "JOIN Services ON Settings.service = Services.id "
-                      "WHERE Services.type = %Q;",
+                      "SELECT id FROM Accounts WHERE provider IN ("
+                      "SELECT provider FROM Services WHERE type = %Q);",
                       service_type);
     _ag_manager_exec_query (manager, (AgQueryCallback)add_id_to_list,
                             &list, sql);

=== modified file 'tests/check_ag.c'
--- tests/check_ag.c	2013-10-15 13:40:40 +0000
+++ tests/check_ag.c	2013-10-30 13:44:50 +0000
@@ -1843,6 +1843,8 @@
 START_TEST(test_list)
 {
     const gchar *display_name = "New account";
+    const gchar *provider_name = "other_provider";
+    const gchar *my_service_name = "MyService";
     const gchar *service_name = "OtherService";
     const gchar *service_type;
     GValue value = { 0 };
@@ -1850,7 +1852,7 @@
     GList *list;
 
     manager = ag_manager_new ();
-    account = ag_manager_create_account (manager, PROVIDER);
+    account = ag_manager_create_account (manager, provider_name);
 
     ag_account_set_enabled (account, TRUE);
     ag_account_set_display_name (account, display_name);
@@ -1874,7 +1876,7 @@
                       NULL);
         fail_unless (id_prop == account->id);
         fail_unless (manager_prop == manager);
-        fail_unless (g_strcmp0 (provider_prop, PROVIDER) == 0);
+        fail_unless (g_strcmp0 (provider_prop, provider_name) == 0);
         g_object_unref (manager);
         g_free (provider_prop);
     }
@@ -1886,36 +1888,23 @@
     g_list_free (list);
 
     /* check that it doesn't support the service type provided by MyService */
-    service = ag_manager_get_service (manager, service_name);
+    service = ag_manager_get_service (manager, my_service_name);
     service_type = ag_service_get_service_type (service);
-    fail_unless (service_type != NULL, "Service %s has no type", service_name);
+    fail_unless (service_type != NULL,
+                 "Service %s has no type", my_service_name);
 
     list = ag_manager_list_by_service_type (manager, service_type);
     fail_unless (g_list_find (list, GUINT_TO_POINTER (account->id)) == NULL,
                  "New account supports %s service type, but shouldn't",
                  service_type);
     g_list_free (list);
-
-    /* Add the service to the account */
-    fail_unless (service != NULL);
-
-    ag_account_select_service (account, service);
-    ag_account_set_enabled (account, TRUE);
-
-    /* test getting default setting from template */
-    g_value_init (&value, G_TYPE_INT);
-    source = ag_account_get_value (account, "parameters/port", &value);
-    fail_unless (source == AG_SETTING_SOURCE_PROFILE,
-                 "Cannot get port from profile");
-    fail_unless (g_value_get_int (&value) == 5223,
-                 "Wrong port number: %d", g_value_get_int (&value));
-    g_value_unset (&value);
-
-    ag_account_store (account, account_store_now_cb, TEST_STRING);
-    run_main_loop_for_n_seconds(0);
-    fail_unless (data_stored, "Callback not invoked immediately");
-
-    /* check that the service is now there */
+    ag_service_unref(service);
+
+    service = ag_manager_get_service (manager, service_name);
+    service_type = ag_service_get_service_type (service);
+    fail_unless (service_type != NULL,
+                 "Service %s has no type", service_name);
+
     list = ag_manager_list_by_service_type (manager, service_type);
     fail_unless (g_list_find (list, GUINT_TO_POINTER (account->id)) != NULL,
                  "New account doesn't supports %s service type, but should",