diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-04-17 17:34:37 +0000 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-04-17 17:34:37 +0000 |
| commit | ed7809ef16fee49bbc6bca94a1d97863b387d795 (patch) | |
| tree | 5b9eee97ba4b2bd6a0ce20f215bba140f74902d5 | |
| parent | d969e85d7bb1ec44bf9edd556706dfdf581e8f8d (diff) | |
| download | evolution-data-server-ed7809ef16fee49bbc6bca94a1d97863b387d795.tar.gz | |
Fix the merge from the trunk by s/imap_store/store/ appropriately.
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index aa9a63db8..ad0f53b9f 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2001-04-17 Ettore Perazzoli <ettore@ximian.com> + + * providers/imap/camel-imap-store.c (imap_disconnect): + s/imap_store/store/ to get it to compile. + 2001-04-16 Jeffrey Stedfast <fejj@ximian.com> * providers/local/camel-mbox-summary.c (summary_rebuild): Don't we diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index f8332045a..b4b5765f2 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -733,7 +733,7 @@ imap_disconnect (CamelService *service, gboolean clean, CamelException *ex) store->subscribed_folders = NULL; } - if (imap_store->authtypes) { + if (store->authtypes) { g_hash_table_foreach_remove (imap_store->authtypes, free_key, NULL); g_hash_table_destroy (imap_store->authtypes); |