summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2010-06-20 23:43:28 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-06-28 13:31:58 +0100
commit5d159de5631aa363329f21379184e49ac0fec87b (patch)
tree5382e03278c74e1a613a20bc04ce4193a97b2b7a
parent93b397e5c397d9c8df9ab308a2e23980d1165d80 (diff)
downloadevolution-data-server-5d159de5631aa363329f21379184e49ac0fec87b.tar.gz
Remove redundant 'unseen' member of CamelIMAPXServer.
This was added in commit ed158d12 ("Fetch new messages first") seemingly by mistake -- there was already an 'unread' field. (cherry picked from commit 01d5bf8cab1cc7fb031e9cfd0c1ca2ec8e1b5837)
-rw-r--r--camel/providers/imapx/camel-imapx-server.c4
-rw-r--r--camel/providers/imapx/camel-imapx-server.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index e6569851f..1696a13ba 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -1443,7 +1443,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
if (sinfo) {
/* this is what we use atm */
imap->exists = sinfo->messages;
- imap->unread = sinfo->unseen;
+ imap->unseen = sinfo->unseen;
g_free (sinfo);
}
@@ -1771,7 +1771,7 @@ imapx_command_status_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
{
CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) ic->job->folder;
- ifolder->unread_on_server = is->unread;
+ ifolder->unread_on_server = is->unseen;
e_flag_set (ic->flag);
}
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index f385e9a36..5aec5b8b5 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -84,7 +84,6 @@ struct _CamelIMAPXServer {
guint32 exists;
guint32 recent;
guint32 mode;
- guint32 unread;
/* any expunges that happened from the last command, they are
processed after the command completes. */