aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog2
-rw-r--r--camel/providers/nntp/camel-nntp-store.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 0bbc7e952b..d4419611b9 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -2,6 +2,8 @@
* providers/nntp/camel-nntp-store.c (camel_nntp_command):
disconnect if we get an io error or user cancellation.
+ (nntp_disconnect_online): reset current folder.
+ (connect_to_server): and here too just to make sure.
* providers/nntp/camel-nntp-folder.c (nntp_folder_sync_online):
only save the summary, don't update from server, thats what
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 57894efc0c..515c927f3c 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -258,6 +258,9 @@ connect_to_server (CamelService *service, int ssl_mode, CamelException *ex)
g_free (path);
retval = TRUE;
+
+ g_free(store->current_folder);
+ store->current_folder = NULL;
fail:
CAMEL_NNTP_STORE_UNLOCK(store, command_lock);
@@ -367,7 +370,9 @@ nntp_disconnect_online (CamelService *service, gboolean clean, CamelException *e
camel_object_unref (store->stream);
store->stream = NULL;
-
+ g_free(store->current_folder);
+ store->current_folder = NULL;
+
CAMEL_NNTP_STORE_UNLOCK(store, command_lock);
return TRUE;