aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/groupwise-features
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/groupwise-features')
-rw-r--r--plugins/groupwise-features/ChangeLog9
-rw-r--r--plugins/groupwise-features/install-shared.c6
-rw-r--r--plugins/groupwise-features/send-options.c1
-rw-r--r--plugins/groupwise-features/share-folder-common.c5
4 files changed, 18 insertions, 3 deletions
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 075bd3661a..2aa572f794 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-18 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #515744
+
+ * send-options.c: (get_source):
+ * share-folder-common.c: (get_container_id):
+ * install-shared.c: (install_folder_response):
+ Memory leak fix.
+
2008-01-28 Andre Klapper <a9016009@gmx.de>
* proxy-add-dialog.glade: string "Read" needs gettext context,
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index c0bffb23e0..0b12c39983 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -97,6 +97,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
camel_exception_init (&ex);
if (!(store = (CamelStore *) camel_session_get_service (mail_component_peek_session(NULL), uri, CAMEL_PROVIDER_STORE, &ex))) {
camel_exception_clear (&ex);
+ g_strfreev (names);
return;
}
@@ -122,12 +123,15 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
camel_exception_init (&ex);
if (!(provider = camel_provider_get(uri, &ex))) {
camel_exception_clear (&ex);
+ g_strfreev (names);
return;
}
/* make sure the new store belongs in the tree */
- if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+ if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) {
+ g_strfreev (names);
return;
+ }
em_folder_tree_model_add_store (model, store, account->name);
camel_object_unref (store);
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index abfde2fd61..860b8469ec 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -374,6 +374,7 @@ get_source (ESourceList *list)
if (so_uri) {
if (!strcmp (so_uri, uri)) {
g_free (so_uri), so_uri = NULL;
+ g_strfreev (temp);
return E_SOURCE (r->data);
}
g_free (so_uri), so_uri = NULL;
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 36b2d15449..ca1f235651 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -531,8 +531,9 @@ get_container_id(EGwConnection *cnc, gchar *fname)
g_free (name);
}
e_gw_connection_free_container_list (container_list);
- if (names)
- g_strfreev(names);
}
+
+ if (names)
+ g_strfreev (names);
return id;
}