camel_data_cache_get_filename: Remove unused GError parameter.

Don't want this parameter to result in unnecessary error handling.

diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index 5132cde..3824356 100644 (file)
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -453,7 +453,6 @@ camel_data_cache_get (CamelDataCache *cdc,
  * @cdc: A #CamelDataCache
  * @path: Path to the (sub) cache the item exists in.
  * @key: Key for the cache item.
- * @error: return location for a #GError, or %NULL
  *
  * Lookup the filename for an item in the cache
  *
@@ -464,14 +463,9 @@ camel_data_cache_get (CamelDataCache *cdc,
 gchar *
 camel_data_cache_get_filename (CamelDataCache *cdc,
                                const gchar *path,
-                               const gchar *key,
-                               GError **error)
+                               const gchar *key)
 {
-       gchar *real;
-
-       real = data_cache_path (cdc, FALSE, path, key);
-
-       return real;
+       return data_cache_path (cdc, FALSE, path, key);
 }
 
 /**

diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
index 8b3e454..c39dab2 100644 (file)
--- a/camel/camel-data-cache.h
+++ b/camel/camel-data-cache.h
@@ -88,8 +88,7 @@ gint          camel_data_cache_remove         (CamelDataCache *cdc,
                                                 GError **error);
 gchar *                camel_data_cache_get_filename   (CamelDataCache *cdc,
                                                 const gchar *path,
-                                                const gchar *key,
-                                                GError **error);
+                                                const gchar *key);
 void           camel_data_cache_clear          (CamelDataCache *cdc,
                                                 const gchar *path);
 

diff --git a/camel/camel-imapx-folder.c b/camel/camel-imapx-folder.c
index 37a54f9..ab78c46 100644 (file)
--- a/camel/camel-imapx-folder.c
+++ b/camel/camel-imapx-folder.c
@@ -252,7 +252,7 @@ imapx_get_filename (CamelFolder *folder,
 {
        CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) folder;
 
-       return camel_data_cache_get_filename (ifolder->cache, "cache", uid, error);
+       return camel_data_cache_get_filename (ifolder->cache, "cache", uid);
 }
 
 /* Algorithm for selecting a folder:

diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 1757240..b848068 100644 (file)
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -3296,10 +3296,10 @@ imapx_command_fetch_message_done (CamelIMAPXServer *is,
                        CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) job->folder;
 
                        if (stream) {
-                               gchar *tmp = camel_data_cache_get_filename (ifolder->cache, "tmp", data->uid, NULL);
+                               gchar *tmp = camel_data_cache_get_filename (ifolder->cache, "tmp", data->uid);
 
                                if (camel_stream_flush (stream, job->cancellable, &job->error) == 0 && camel_stream_close (stream, job->cancellable, &job->error) == 0) {
-                                       gchar *cache_file = camel_data_cache_get_filename  (ifolder->cache, "cur", data->uid, NULL);
+                                       gchar *cache_file = camel_data_cache_get_filename  (ifolder->cache, "cur", data->uid);
                                        gchar *temp = g_strrstr (cache_file, "/"), *dir;
 
                                        dir = g_strndup (cache_file, temp - cache_file);
@@ -3564,7 +3564,7 @@ imapx_command_append_message_done (CamelIMAPXServer *is,
                        data->appended_uid = g_strdup_printf ("%u", (guint) ic->status->u.appenduid.uid);
                        mi->uid = camel_pstring_add (data->appended_uid, FALSE);
 
-                       cur = camel_data_cache_get_filename  (ifolder->cache, "cur", mi->uid, NULL);
+                       cur = camel_data_cache_get_filename  (ifolder->cache, "cur", mi->uid);
                        g_rename (data->path, cur);
 
                        /* should we update the message count ? */
@@ -5769,7 +5769,7 @@ camel_imapx_server_sync_message (CamelIMAPXServer *is,
 
        /* Check if the cache file already exists and is non-empty. */
        cache_file = camel_data_cache_get_filename (
-               ifolder->cache, "cur", uid, NULL);
+               ifolder->cache, "cur", uid);
        is_cached = (g_stat (cache_file, &st) == 0 && st.st_size > 0);
        g_free (cache_file);
 
@@ -5871,7 +5871,7 @@ camel_imapx_server_append_message (CamelIMAPXServer *is,
                return FALSE;
        }
 
-       path = camel_data_cache_get_filename (ifolder->cache, "new", uid, NULL);
+       path = camel_data_cache_get_filename (ifolder->cache, "new", uid);
        info = camel_folder_summary_info_new_from_message ((CamelFolderSummary *) folder->summary, message, NULL);
        info->uid = camel_pstring_strdup (uid);
        if (mi)

diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index cee63ec..e4e79d7 100644 (file)
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -280,7 +280,7 @@ nntp_get_filename (CamelFolder *folder,
        }
        *msgid++ = 0;
 
-       return camel_data_cache_get_filename (nntp_store->cache, "cache", msgid, error);
+       return camel_data_cache_get_filename (nntp_store->cache, "cache", msgid);
 }
 
 static CamelStream *

diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index f573f9c..023d935 100644 (file)
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -449,7 +449,7 @@ pop3_folder_get_filename (CamelFolder *folder,
        }
 
        return camel_data_cache_get_filename (
-               pop3_store->cache, "cache", fi->uid, NULL);
+               pop3_store->cache, "cache", fi->uid);
 }
 
 static gboolean

diff --git a/configure.ac b/configure.ac
index 795e8c7..6afe83d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ LIBEBOOK_CURRENT=17
 LIBEBOOK_REVISION=1
 LIBEBOOK_AGE=3
 
-LIBCAMEL_CURRENT=37
+LIBCAMEL_CURRENT=38
 LIBCAMEL_REVISION=0
 LIBCAMEL_AGE=0