← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evolution-couchdb/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/02_use_correct_cache_dir.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-25 17:39:14 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20110525173914-sn09e6y8cl5i94kv
Tags: 0.5.90-0ubuntu1
* New upstream release
* debian/patches/02_use_correct_cache_dir.patch:
  - Remove upstream patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_use_correct_cache_dir.patch
1
 
From 6fddc782fb384f55704bee4a6c724260a06c84f9 Mon Sep 17 00:00:00 2001
2
 
From: Rodrigo Moya <rodrigo@gnome-db.org>
3
 
Date: Wed, 6 Apr 2011 13:19:19 +0200
4
 
Subject: [PATCH] Use e_book_backend_get_cache_dir to get the correct dir for the cache
5
 
 
6
 
---
7
 
 addressbook/e-book-backend-couchdb.c |   13 +++++++++----
8
 
 1 files changed, 9 insertions(+), 4 deletions(-)
9
 
 
10
 
diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
11
 
index ccad894..cb31918 100644
12
 
--- a/addressbook/e-book-backend-couchdb.c
13
 
+++ b/addressbook/e-book-backend-couchdb.c
14
 
@@ -987,7 +987,8 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
15
 
                                    gboolean only_if_exists)
16
 
 #endif
17
 
 {
18
 
-       gchar *uri;
19
 
+       gchar *uri, *cache_filename;
20
 
+       const gchar *cache_dir;
21
 
        const gchar *property;
22
 
        GError *error = NULL;
23
 
        GSList *doc_list, *sl;
24
 
@@ -1100,9 +1101,13 @@ e_book_backend_couchdb_load_source (EBookBackend *backend,
25
 
        }
26
 
 
27
 
        /* Create cache */
28
 
-       uri = e_source_get_uri (source);
29
 
-       couchdb_backend->cache = e_book_backend_cache_new ((const gchar *) uri);
30
 
-       g_free (uri);
31
 
+       cache_dir = e_book_backend_get_cache_dir (E_BOOK_BACKEND (couchdb_backend));
32
 
+       cache_filename = g_build_filename (cache_dir,
33
 
+                                          couchdb_session_get_uri (couchdb_backend->couchdb),
34
 
+                                          "cache.xml", NULL);
35
 
+       g_debug ("Creating cache at %s", cache_filename);
36
 
+       couchdb_backend->cache = e_book_backend_cache_new ((const gchar *) cache_filename);
37
 
+       g_free (cache_filename);
38
 
 
39
 
        /* Populate the cache */
40
 
        e_file_cache_clean (E_FILE_CACHE (couchdb_backend->cache));
41
 
1.7.2.3
42