summaryrefslogtreecommitdiff
path: root/addressbook
diff options
context:
space:
mode:
authorTristan Van Berkom <tristanvb@openismus.com>2013-10-12 20:51:31 +0200
committerTristan Van Berkom <tristanvb@openismus.com>2013-10-23 20:39:38 +0200
commite873213ba32b8794dea6c616c6819c6d13de0dab (patch)
tree5a6ea63a4e9643c5a15d9da58202de04b7233009 /addressbook
parent09281bac9c51bb50349291a7aac69d2002966b35 (diff)
downloadevolution-data-server-e873213ba32b8794dea6c616c6819c6d13de0dab.tar.gz
EBookBackendSqliteDB: Fix introspect_summary()
Fixed introspect_summary() to resolve whether the summary configuration has any attribute lists.
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/libedata-book/e-book-backend-sqlitedb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 3138319e8..089878669 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -747,7 +747,7 @@ introspect_summary (EBookBackendSqliteDB *ebsdb,
const gchar *folderid,
GError **error)
{
- gboolean success;
+ gboolean success, have_attr_list;
gchar *stmt;
GList *summary_columns = NULL, *l;
GArray *summary_fields = NULL;
@@ -830,6 +830,7 @@ introspect_summary (EBookBackendSqliteDB *ebsdb,
goto introspect_summary_finish;
ebsdb->priv->attr_list_indexes = 0;
+ ebsdb->priv->have_attr_list = have_attr_list = FALSE;
if (multivalues) {
gchar **fields = g_strsplit (multivalues, ":", 0);
@@ -841,7 +842,7 @@ introspect_summary (EBookBackendSqliteDB *ebsdb,
params = g_strsplit (fields[i], ";", 0);
field = e_contact_field_id (params[0]);
- iter = append_summary_field (summary_fields, field, NULL, NULL);
+ iter = append_summary_field (summary_fields, field, &have_attr_list, NULL);
if (iter) {
for (j = 1; params[j]; ++j) {
@@ -860,6 +861,8 @@ introspect_summary (EBookBackendSqliteDB *ebsdb,
g_strfreev (params);
}
+ ebsdb->priv->have_attr_list = have_attr_list;
+
g_strfreev (fields);
}