[evolution-data-server] [NNTP] Fix minor memory leaks
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] [NNTP] Fix minor memory leaks
- Date: Wed, 29 Apr 2015 09:18:37 +0000 (UTC)
commit e88e10973ee65527c40de784c1bbed73e99d3c46
Author: Milan Crha <mcrha redhat com>
Date: Wed Apr 29 11:18:10 2015 +0200
[NNTP] Fix minor memory leaks
camel/providers/nntp/camel-nntp-folder.c | 14 +++++++++-----
camel/providers/nntp/camel-nntp-folder.h | 1 -
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 399a233..1b910f5 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -139,6 +139,11 @@ nntp_folder_finalize (GObject *object)
{
CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (object);
+ if (nntp_folder->changes) {
+ camel_folder_change_info_free (nntp_folder->changes);
+ nntp_folder->changes = NULL;
+ }
+
g_mutex_clear (&nntp_folder->priv->search_lock);
g_mutex_clear (&nntp_folder->priv->cache_lock);
@@ -783,7 +788,7 @@ camel_nntp_folder_new (CamelStore *parent,
CamelNNTPFolder *nntp_folder;
CamelNNTPStore *nntp_store;
CamelNNTPStoreSummary *nntp_store_summary;
- gchar *root;
+ gchar *storage_path, *root;
CamelService *service;
CamelSettings *settings;
CamelStoreInfo *si;
@@ -812,13 +817,12 @@ camel_nntp_folder_new (CamelStore *parent,
folder->folder_flags |= CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;
- nntp_folder->storage_path =
- g_build_filename (user_cache_dir, folder_name, NULL);
-
- root = g_strdup_printf ("%s.cmeta", nntp_folder->storage_path);
+ storage_path = g_build_filename (user_cache_dir, folder_name, NULL);
+ root = g_strdup_printf ("%s.cmeta", storage_path);
camel_object_set_state_filename (CAMEL_OBJECT (nntp_folder), root);
camel_object_state_read (CAMEL_OBJECT (nntp_folder));
g_free (root);
+ g_free (storage_path);
folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (folder);
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 3a3cf5b..7f8308d 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -53,7 +53,6 @@ struct _CamelNNTPFolder {
CamelNNTPFolderPrivate *priv;
struct _CamelFolderChangeInfo *changes;
- gchar *storage_path;
CamelFolderSearch *search;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]