[evolution-data-server/openismus-work: 43/52] EBookBackendSqliteDB: More fixups

[Tristan Van Berkom <tvb src gnome org>]

commit 43d6702b54506b87af1d36847206b1b2c4f75cdc
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Mon Nov 19 20:37:51 2012 +0900

    EBookBackendSqliteDB: More fixups
    
    Conflicts:
    
    	addressbook/libedata-book/e-book-backend-sqlitedb.c
    	addressbook/libedata-book/e-book-backend-sqlitedb.h

 .../libedata-book/e-book-backend-sqlitedb.c        |   12 +++++++---
 .../libedata-book/e-book-backend-sqlitedb.h        |   23 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 17f2921..f2a61c0 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -571,8 +571,8 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
 			g_free (tmp);
 		}
 
-		if ((ebsdb->priv->summary_fields[i].index & INDEX_SUFFIX &&
-		     ebsdb->priv->summary_fields[i].type != E_TYPE_CONTACT_ATTR_LIST) != 0) {
+		if ((ebsdb->priv->summary_fields[i].index & INDEX_SUFFIX) != 0 &&
+		    ebsdb->priv->summary_fields[i].type != E_TYPE_CONTACT_ATTR_LIST) {
 			/* Derive index name from field & folder */
 			tmp = g_strdup_printf ("RINDEX_%s_%s",
 					       summary_dbname_from_field (ebsdb, ebsdb->priv->summary_fields[i].field),
@@ -1487,7 +1487,9 @@ e_book_backend_sqlitedb_get_contact (EBookBackendSqliteDB *ebsdb,
  * This only checks if all the fields are part of the default summary fields,
  * not part of the configured summary fields.
  *
- * Deprecated: 3.6: Use e_book_backend_sqlitedb_check_summary_fields() instead.
+ * Since: 3.2
+ *
+ * Deprecated: 3.8: Use e_book_backend_sqlitedb_check_summary_fields() instead.
  **/
 gboolean
 e_book_backend_sqlitedb_is_summary_fields (GHashTable *fields_of_interest)
@@ -1806,7 +1808,9 @@ e_book_backend_sqlitedb_check_summary_query (EBookBackendSqliteDB *ebsdb,
  *
  * Checks whether the query contains only checks for the default summary fields
  *
- * Deprecated: 3.6: Use e_book_backend_sqlitedb_check_summary_query() instead
+ * Since: 3.2
+ *
+ * Deprecated: 3.8: Use e_book_backend_sqlitedb_check_summary_query() instead
  **/
 gboolean
 e_book_backend_sqlitedb_is_summary_query (const gchar *query)
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.h b/addressbook/libedata-book/e-book-backend-sqlitedb.h
index 5a47046..dfbc43c 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.h
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.h
@@ -244,16 +244,21 @@ gboolean	e_book_backend_sqlitedb_delete_addressbook
 gboolean	e_book_backend_sqlitedb_remove		(EBookBackendSqliteDB *ebsdb,
 							 GError **error);
 void		e_book_backend_sqlitedb_search_data_free
-							(EbSdbSearchData *s_data);
+						(EbSdbSearchData *s_data);
+gboolean        e_book_backend_sqlitedb_check_summary_query
+                                                (EBookBackendSqliteDB *ebsdb,
+						 const gchar *query,
+						 gboolean *with_list_attrs);
+gboolean        e_book_backend_sqlitedb_check_summary_fields
+                                                (EBookBackendSqliteDB *ebsdb,
+						 GHashTable *fields_of_interest);
 
-gboolean        e_book_backend_sqlitedb_check_summary_query (EBookBackendSqliteDB *ebsdb,
-							     const gchar *query,
-							     gboolean *with_list_attrs);
-gboolean        e_book_backend_sqlitedb_check_summary_fields (EBookBackendSqliteDB *ebsdb,
-							      GHashTable *fields_of_interest);
-
-gboolean        e_book_backend_sqlitedb_is_summary_query (const gchar *query);
-gboolean        e_book_backend_sqlitedb_is_summary_fields (GHashTable *fields_of_interest);
+#ifndef EDS_DISABLE_DEPRECATED
+gboolean	e_book_backend_sqlitedb_is_summary_query
+						(const gchar *query);
+gboolean	e_book_backend_sqlitedb_is_summary_fields
+						(GHashTable *fields_of_interest);
+#endif
 
 G_END_DECLS