diff options
| author | Michael Zucci <zucchi@src.gnome.org> | 2000-12-24 09:41:17 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2000-12-24 09:41:17 +0800 |
| commit | 5363e65d856ac986e6c39eaa6aac53293a7db4f7 (patch) | |
| tree | e8c8845eeaeddbca4fc18241686ffba6ded72db3 | |
| parent | a09b678766bc3dc2392fad6e62e68979faed19b4 (diff) | |
| download | gsoc2013-evolution-5363e65d856ac986e6c39eaa6aac53293a7db4f7.tar.gz gsoc2013-evolution-5363e65d856ac986e6c39eaa6aac53293a7db4f7.tar.zst gsoc2013-evolution-5363e65d856ac986e6c39eaa6aac53293a7db4f7.zip | |
clean up a stubborn and hard to remove imap_folder->summary.
svn path=/trunk/; revision=7155
| -rw-r--r-- | camel/ChangeLog | 2 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 8 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-folder.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 833282f2dd..298627e4b3 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -8,6 +8,7 @@ * providers/imap/camel-imap-folder.h (CamelImapFolder): Added a private field. + (CamelImapFolder): Removed summary again from here. * providers/imap/camel-imap-private.h: Added lock for imap searches. @@ -27,6 +28,7 @@ directly. (imap_refresh_info): Free any info lookups. Use folder->summary not imap_folder->summary. And lock around commands. + (camel_imap_folder_changed): Use folder->summary again. 2000-12-22 Dan Winship <danw@helixcode.com> diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 3f9149d627..f343de8450 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -288,12 +288,12 @@ imap_refresh_info (CamelFolder *folder, CamelException *ex) if (!new[i].uid) continue; - info = camel_folder_summary_index (imap_folder->summary, i); + info = camel_folder_summary_index (folder->summary, i); iinfo = (CamelImapMessageInfo *)info; if (strcmp (camel_message_info_uid (info), new[i].uid) != 0) { camel_folder_change_info_remove_uid (changes, camel_message_info_uid (info)); - camel_folder_summary_remove (imap_folder->summary, info); + camel_folder_summary_remove (folder->summary, info); camel_folder_summary_info_free(folder->summary, info); g_free (new[i].uid); i--; @@ -733,9 +733,9 @@ camel_imap_folder_changed (CamelFolder *folder, int exists, for (i = 0; i < expunged->len; i++) { id = g_array_index (expunged, int, i); - info = camel_folder_summary_index (imap_folder->summary, id - 1); + info = camel_folder_summary_index (folder->summary, id - 1); camel_folder_change_info_remove_uid (changes, camel_message_info_uid (info)); - camel_folder_summary_remove (imap_folder->summary, info); + camel_folder_summary_remove (folder->summary, info); } } diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h index cff11255c2..ffc7b5ec21 100644 --- a/camel/providers/imap/camel-imap-folder.h +++ b/camel/providers/imap/camel-imap-folder.h @@ -47,7 +47,6 @@ typedef struct { struct _CamelImapFolderPrivate *priv; CamelFolderSearch *search; - CamelFolderSummary *summary; int exists; } CamelImapFolder; |