File bgo-554182-gssapi.patch of Package evolution-data-server

commit f6729f13d63c16c764bd6e91a33132abce7bc6ea
Author: mcrha <mcrha@d0434b6f-c725-0410-8785-fd8a057797ef>
Date:   Thu Jan 8 10:51:42 2009 +0000

    2009-01-08  Milan Crha  <mcrha@redhat.com>
    
    	** Fix for bug #554182
    
    	* camel/providers/groupwise/camel-groupwise-provider.c: (groupwise_url_hash), (groupwise_url_equal):
    	* camel/providers/imap/camel-imap-provider.c: (imap_url_hash), (imap_url_equal):
    	* camel/providers/hula/camel-hula-provider.c: (hula_url_hash), (hula_url_equal):
    	* camel/providers/imap4/camel-imap4-provider.c: (imap4_url_hash), (imap4_url_equal):
    	Don't use 'authmech' for URL comparision.
    
    
    
    git-svn-id: svn+ssh://svn.gnome.org/svn/evolution-data-server/trunk@9885 d0434b6f-c725-0410-8785-fd8a057797ef

diff --git a/camel/providers/groupwise/camel-groupwise-provider.c b/camel/providers/groupwise/camel-groupwise-provider.c
index a1dffc0..ceabe6b 100644
--- a/camel/providers/groupwise/camel-groupwise-provider.c
+++ b/camel/providers/groupwise/camel-groupwise-provider.c
@@ -165,7 +165,6 @@ groupwise_url_hash (gconstpointer key)
 	guint hash = 0;
 
 	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
 	add_hash (&hash, u->host);
 	hash ^= u->port;
 	
@@ -195,7 +194,6 @@ groupwise_url_equal (gconstpointer a, gconstpointer b)
 	
 	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/hula/camel-hula-provider.c b/camel/providers/hula/camel-hula-provider.c
index f860fa7..501d620 100644
--- a/camel/providers/hula/camel-hula-provider.c
+++ b/camel/providers/hula/camel-hula-provider.c
@@ -148,7 +148,6 @@ hula_url_hash (gconstpointer key)
 	guint hash = 0;
 
 	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
 	add_hash (&hash, u->host);
 	hash ^= u->port;
 	
@@ -178,7 +177,6 @@ hula_url_equal (gconstpointer a, gconstpointer b)
 	
 	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/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index eceb565..48c965e 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -133,7 +133,6 @@ imap_url_hash (gconstpointer key)
 	guint hash = 0;
 
 	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
 	add_hash (&hash, u->host);
 	hash ^= u->port;
 	
@@ -163,7 +162,6 @@ imap_url_equal (gconstpointer a, gconstpointer b)
 	
 	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 334fbf8..99f62c5 100644
--- a/camel/providers/imap4/camel-imap4-provider.c
+++ b/camel/providers/imap4/camel-imap4-provider.c
@@ -105,7 +105,6 @@ imap4_url_hash (gconstpointer key)
 	guint hash = 0;
 	
 	add_hash (&hash, u->user);
-	add_hash (&hash, u->authmech);
 	add_hash (&hash, u->host);
 	hash ^= u->port;
 	
@@ -135,7 +134,6 @@ imap4_url_equal (gconstpointer a, gconstpointer b)
 	
 	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;
 }