diff options
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-provider.c | 9 | ||||
| -rw-r--r-- | camel/providers/imap4/camel-imap4-provider.c | 9 | ||||
| -rw-r--r-- | camel/providers/imap4/camel-imap4-store.c | 5 |
4 files changed, 18 insertions, 10 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index a35ff1761f..6f75862c09 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,10 @@ 2004-06-23 Jeffrey Stedfast <fejj@novell.com> + * providers/imap/camel-imap-provider.c (imap_url_equal): Same. + + * providers/imap4/camel-imap4-provider.c (imap4_url_equal): Check + the protocol. + * providers/imap4/camel-imap4-store.c (imap4_build_folder_info): Hide password, etc info in the fi->uri's. (imap4_create_folder): Don't bother to use diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c index f7e3f732b9..bef15f681f 100644 --- a/camel/providers/imap/camel-imap-provider.c +++ b/camel/providers/imap/camel-imap-provider.c @@ -132,7 +132,7 @@ imap_url_hash (gconstpointer key) return hash; } -static gint +static int check_equal (char *s1, char *s2) { if (s1 == NULL) { @@ -144,16 +144,17 @@ check_equal (char *s1, char *s2) if (s2 == NULL) return FALSE; - + return strcmp (s1, s2) == 0; } -static gint +static int imap_url_equal (gconstpointer a, gconstpointer b) { const CamelURL *u1 = a, *u2 = b; - return check_equal (u1->user, u2->user) + return check_equal (u1->protocol, u2->protocol) + && check_equal (u1->user, u2->user) && check_equal (u1->authmech, u2->authmech) && check_equal (u1->host, u2->host) && u1->port == u2->port; diff --git a/camel/providers/imap4/camel-imap4-provider.c b/camel/providers/imap4/camel-imap4-provider.c index 045c3763ad..ab61d19abb 100644 --- a/camel/providers/imap4/camel-imap4-provider.c +++ b/camel/providers/imap4/camel-imap4-provider.c @@ -98,7 +98,7 @@ imap4_url_hash (gconstpointer key) return hash; } -static gint +static int check_equal (char *s1, char *s2) { if (s1 == NULL) { @@ -110,16 +110,17 @@ check_equal (char *s1, char *s2) if (s2 == NULL) return FALSE; - + return strcmp (s1, s2) == 0; } -static gint +static int imap4_url_equal (gconstpointer a, gconstpointer b) { const CamelURL *u1 = a, *u2 = b; - return check_equal (u1->user, u2->user) + return check_equal (u1->protocol, u2->protocol) + && check_equal (u1->user, u2->user) && check_equal (u1->authmech, u2->authmech) && check_equal (u1->host, u2->host) && u1->port == u2->port; diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c index 4223ab0c32..834ff93252 100644 --- a/camel/providers/imap4/camel-imap4-store.c +++ b/camel/providers/imap4/camel-imap4-store.c @@ -98,15 +98,16 @@ imap4_hash_folder_name (gconstpointer key) return g_str_hash (key); } -static gint +static int imap4_compare_folder_name (gconstpointer a, gconstpointer b) { gconstpointer aname = a, bname = b; - + if (g_ascii_strcasecmp (a, "INBOX") == 0) aname = "INBOX"; if (g_ascii_strcasecmp (b, "INBOX") == 0) bname = "INBOX"; + return g_str_equal (aname, bname); } |