Camel: Allow SSL certificate resave and use detailed errors from SSL stream

[platform/upstream/evolution-data-server.git] / addressbook / libedata-book / e-book-backend-db-cache.c

diff --git a/addressbook/libedata-book/e-book-backend-db-cache.c b/addressbook/libedata-book/e-book-backend-db-cache.c
index d060a4e..7c52cc4 100644 (file)
--- a/addressbook/libedata-book/e-book-backend-db-cache.c
+++ b/addressbook/libedata-book/e-book-backend-db-cache.c
@@ -29,9 +29,10 @@
 #include "e-book-backend-sexp.h"
 
 void
-string_to_dbt (const gchar *str, DBT *dbt)
+string_to_dbt (const gchar *str,
+               DBT *dbt)
 {
-       memset (dbt, 0, sizeof (dbt));
+       memset (dbt, 0, sizeof (DBT));
        dbt->data = (gpointer) str;
        dbt->size = strlen (str) + 1;
        dbt->flags = DB_DBT_USERMEM;
@@ -66,7 +67,8 @@ get_filename_from_uri (const gchar *uri)
  **/
 
 void
-e_book_backend_db_cache_set_filename (DB *db, const gchar *filename)
+e_book_backend_db_cache_set_filename (DB *db,
+                                      const gchar *filename)
 {
        DBT uid_dbt, vcard_dbt;
        gint db_error;
@@ -123,7 +125,8 @@ e_book_backend_db_cache_get_filename (DB *db)
  * Returns: A cached #EContact, or %NULL if @uid is not cached.
  **/
 EContact *
-e_book_backend_db_cache_get_contact (DB *db, const gchar *uid)
+e_book_backend_db_cache_get_contact (DB *db,
+                                     const gchar *uid)
 {
        DBT     uid_dbt, vcard_dbt;
        gint    db_error;
@@ -141,7 +144,7 @@ e_book_backend_db_cache_get_contact (DB *db, const gchar *uid)
                return NULL;
        }
 
-       contact = e_contact_new_from_vcard ((const gchar *) vcard_dbt.data);
+       contact = e_contact_new_from_vcard_with_uid ((const gchar *) vcard_dbt.data, uid);
        g_free (vcard_dbt.data);
        return contact;
 }
@@ -157,7 +160,7 @@ e_book_backend_db_cache_get_contact (DB *db, const gchar *uid)
  **/
 gboolean
 e_book_backend_db_cache_add_contact (DB *db,
-                                    EContact *contact)
+                                     EContact *contact)
 {
        DBT     uid_dbt, vcard_dbt;
        gint    db_error;
@@ -201,7 +204,7 @@ e_book_backend_db_cache_add_contact (DB *db,
  **/
 gboolean
 e_book_backend_db_cache_remove_contact (DB *db,
-                                       const gchar *uid)
+                                        const gchar *uid)
 
 {
        DBT     uid_dbt;
@@ -231,7 +234,8 @@ e_book_backend_db_cache_remove_contact (DB *db,
  * Returns: %TRUE if the cache contains the contact, %FALSE otherwise.
  **/
 gboolean
-e_book_backend_db_cache_check_contact (DB *db, const gchar *uid)
+e_book_backend_db_cache_check_contact (DB *db,
+                                       const gchar *uid)
 {
        DBT     uid_dbt, vcard_dbt;
        gint    db_error;
@@ -263,7 +267,8 @@ e_book_backend_db_cache_check_contact (DB *db, const gchar *uid)
  * Returns: A #GList of pointers to #EContact.
  **/
 GList *
-e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
+e_book_backend_db_cache_get_contacts (DB *db,
+                                      const gchar *query)
 {
        DBC     *dbc;
        DBT     uid_dbt, vcard_dbt;
@@ -294,7 +299,7 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
                if (vcard_dbt.data && !strncmp (vcard_dbt.data, "BEGIN:VCARD", 11)) {
                        contact = e_contact_new_from_vcard (vcard_dbt.data);
 
-                       if (e_book_backend_sexp_match_contact (sexp, contact))
+                       if (!sexp || e_book_backend_sexp_match_contact (sexp, contact))
                                list = g_list_prepend (list, contact);
                        else
                                g_object_unref (contact);
@@ -314,7 +319,7 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
 
 /**
  * e_book_backend_db_cache_search:
- * @backend: an #EBookBackend
+ * @db: DB handle
  * @query: an s-expression
  *
  * Returns an array of pointers to unique contact ID strings for contacts
@@ -324,7 +329,8 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
  * Returns: A #GPtrArray of pointers to contact ID strings.
  **/
 GPtrArray *
-e_book_backend_db_cache_search (DB *db, const gchar *query)
+e_book_backend_db_cache_search (DB *db,
+                                const gchar *query)
 {
        GList *matching_contacts, *temp;
        GPtrArray *ptr_array;
@@ -367,7 +373,7 @@ e_book_backend_db_cache_exists (const gchar *uri)
 
 /**
  * e_book_backend_db_cache_set_populated:
- * @backend: an #EBookBackend
+ * @db: DB handle
  *
  * Flags @cache as being populated - that is, it is up-to-date on the
  * contents of the book it's caching.
@@ -421,7 +427,8 @@ e_book_backend_db_cache_is_populated (DB *db)
  * Since: 2.26
  **/
 void
-e_book_backend_db_cache_set_time (DB *db, const gchar *t)
+e_book_backend_db_cache_set_time (DB *db,
+                                  const gchar *t)
 {
        DBT uid_dbt, vcard_dbt;
        gint db_error;