[evolution-kolab: 8/9] CamelImapxAcl: fixed CamelImapxAcl instance validation

[Christian Hilberg <chilberg src gnome org>]

commit f9cb07e2c404fb0a63421b9c1273417cd2fe98dc
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Oct 12 19:20:23 2012 +0200

    CamelImapxAcl: fixed CamelImapxAcl instance validation

 src/libekolab/camel-imapx-acl.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/libekolab/camel-imapx-acl.c b/src/libekolab/camel-imapx-acl.c
index c98e26e..e1642cb 100644
--- a/src/libekolab/camel-imapx-acl.c
+++ b/src/libekolab/camel-imapx-acl.c
@@ -170,7 +170,7 @@ imapx_acl_validate (CamelImapxAcl *acl,
 
 	g_return_val_if_fail (acl != NULL, FALSE);
 	g_return_val_if_fail (acl->mboxes != NULL, FALSE);
-	g_return_val_if_fail (acl->myrights, FALSE);
+	g_return_val_if_fail (acl->myrights != NULL, FALSE);
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	/* caller should hold acl->lock */
@@ -179,7 +179,7 @@ imapx_acl_validate (CamelImapxAcl *acl,
 	keys = g_hash_table_get_keys (acl->myrights);
 	keys_ptr = keys;
 	while (keys_ptr != NULL) {
-		tmp = g_hash_table_lookup (acl->myrights, keys_ptr);
+		tmp = g_hash_table_lookup (acl->myrights, keys_ptr->data);
 
 		ok = imapx_acl_entry_validate_rights ((const gchar *) tmp,
 		                                      &tmp_err);
@@ -195,7 +195,7 @@ imapx_acl_validate (CamelImapxAcl *acl,
 	keys_ptr = keys;
 	while (keys_ptr != NULL) {
 		entries = g_hash_table_lookup (acl->mboxes,
-		                               keys_ptr);
+		                               keys_ptr->data);
 		if (entries == NULL) {
 			g_set_error (&tmp_err,
 			             CAMEL_IMAPX_ERROR,
@@ -208,7 +208,7 @@ imapx_acl_validate (CamelImapxAcl *acl,
 		entries_keys = g_hash_table_get_keys (entries);
 		entries_keys_ptr = entries_keys;
 		while (entries_keys_ptr != NULL) {
-			ok = imapx_acl_entry_validate_access_id ((const gchar *) entries_keys_ptr->data,
+			ok = imapx_acl_entry_validate_access_id ((const gchar *) (entries_keys_ptr->data),
 			                                         &tmp_err);
 			if (! ok) {
 				g_list_free (entries_keys);
@@ -216,7 +216,7 @@ imapx_acl_validate (CamelImapxAcl *acl,
 			}
 
 			tmp = g_hash_table_lookup (entries,
-			                           entries_keys_ptr);
+			                           entries_keys_ptr->data);
 			ok = imapx_acl_entry_validate_rights ((const gchar *) tmp,
 			                                      &tmp_err);
 			if (! ok) {