aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2004-06-24 11:01:42 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-06-24 11:01:42 +0800
commit758f7345f5c427fd060da29d82f59b9e7ada87d3 (patch)
treee2f16abee1f5dff388cb6469c7095c087a5b33b0 /camel/providers
parent73e4659023c5f2ec11c5e7c974aef116bb320c68 (diff)
downloadgsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.tar
gsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.tar.gz
gsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.tar.bz2
gsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.tar.lz
gsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.tar.xz
gsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.tar.zst
gsoc2013-evolution-758f7345f5c427fd060da29d82f59b9e7ada87d3.zip
Same.
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. svn path=/trunk/; revision=26488
Diffstat (limited to 'camel/providers')
-rw-r--r--camel/providers/imap/camel-imap-provider.c9
-rw-r--r--camel/providers/imap4/camel-imap4-provider.c9
-rw-r--r--camel/providers/imap4/camel-imap4-store.c5
3 files changed, 13 insertions, 10 deletions
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);
}