1 files changed, 21 insertions, 21 deletions

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index e63dc73726..a97cc8fd79 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -251,7 +251,7 @@ camel_imap_folder_new (CamelStore *parent, const char *folder_name,
 	}
 
 	if ((imap_store->parameters & IMAP_PARAM_FILTER_INBOX) &&
-	    !g_strcasecmp (folder_name, "INBOX"))
+	    !strcasecmp (folder_name, "INBOX"))
 		folder->folder_flags |= CAMEL_FOLDER_FILTER_RECENT;
 
 	imap_folder->search = camel_imap_search_new(folder_dir);
@@ -278,19 +278,19 @@ camel_imap_folder_selected (CamelFolder *folder, CamelImapResponse *response,
 	
 	for (i = 0; i < response->untagged->len; i++) {
 		resp = response->untagged->pdata[i] + 2;
-		if (!g_strncasecmp (resp, "FLAGS ", 6) &&
+		if (!strncasecmp (resp, "FLAGS ", 6) &&
 		    !folder->permanent_flags) {
 			resp += 6;
 			folder->permanent_flags = imap_parse_flag_list (&resp);
-		} else if (!g_strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {
+		} else if (!strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {
 			resp += 19;
 			folder->permanent_flags = imap_parse_flag_list (&resp);
-		} else if (!g_strncasecmp (resp, "OK [UIDVALIDITY ", 16)) {
+		} else if (!strncasecmp (resp, "OK [UIDVALIDITY ", 16)) {
 			validity = strtoul (resp + 16, NULL, 10);
 		} else if (isdigit ((unsigned char)*resp)) {
 			unsigned long num = strtoul (resp, &resp, 10);
 			
-			if (!g_strncasecmp (resp, " EXISTS", 7)) {
+			if (!strncasecmp (resp, " EXISTS", 7)) {
 				exists = num;
 				/* Remove from the response so nothing
 				 * else tries to interpret it.
@@ -348,12 +348,12 @@ camel_imap_folder_selected (CamelFolder *folder, CamelImapResponse *response,
 			val = strtoul (resp + 2, &resp, 10);
 			if (val == 0)
 				continue;
-			if (!g_strcasecmp (resp, " EXISTS")) {
+			if (!strcasecmp (resp, " EXISTS")) {
 				/* Another one?? */
 				exists = val;
 				continue;
 			}
-			if (uid != 0 || val != count || g_strncasecmp (resp, " FETCH (", 8) != 0)
+			if (uid != 0 || val != count || strncasecmp (resp, " FETCH (", 8) != 0)
 				continue;
 			
 			fetch_data = parse_fetch_response (imap_folder, resp + 7);
@@ -2064,7 +2064,7 @@ decode_internaldate (const unsigned char *in)
 		return (time_t) -1;
 	
 	for (n = 0; n < 12; n++) {
-		if (!g_strncasecmp (inptr, tm_months[n], 3))
+		if (!strncasecmp (inptr, tm_months[n], 3))
 			break;
 	}
 	
@@ -2589,7 +2589,7 @@ parse_fetch_response (CamelImapFolder *imap_folder, char *response)
 		seq = strtol (response + 2, &response, 10);
 		if (seq == 0)
 			return NULL;
-		if (g_strncasecmp (response, " FETCH (", 8) != 0)
+		if (strncasecmp (response, " FETCH (", 8) != 0)
 			return NULL;
 		response += 7;
 		
@@ -2600,7 +2600,7 @@ parse_fetch_response (CamelImapFolder *imap_folder, char *response)
 		/* Skip the initial '(' or the ' ' between elements */
 		response++;
 		
-		if (!g_strncasecmp (response, "FLAGS ", 6)) {
+		if (!strncasecmp (response, "FLAGS ", 6)) {
 			guint32 flags;
 			
 			response += 6;
@@ -2608,25 +2608,25 @@ parse_fetch_response (CamelImapFolder *imap_folder, char *response)
 			flags = imap_parse_flag_list (&response);
 			
 			g_datalist_set_data (&data, "FLAGS", GUINT_TO_POINTER (flags));
-		} else if (!g_strncasecmp (response, "RFC822.SIZE ", 12)) {
+		} else if (!strncasecmp (response, "RFC822.SIZE ", 12)) {
 			unsigned long size;
 			
 			response += 12;
 			size = strtoul (response, &response, 10);
 			g_datalist_set_data (&data, "RFC822.SIZE", GUINT_TO_POINTER (size));
-		} else if (!g_strncasecmp (response, "BODY[", 5) ||
-			   !g_strncasecmp (response, "RFC822 ", 7)) {
+		} else if (!strncasecmp (response, "BODY[", 5) ||
+			   !strncasecmp (response, "RFC822 ", 7)) {
 			char *p;
 			
 			if (*response == 'B') {
 				response += 5;
 				
 				/* HEADER], HEADER.FIELDS (...)], or 0] */
-				if (!g_strncasecmp (response, "HEADER", 6)) {
+				if (!strncasecmp (response, "HEADER", 6)) {
 					header = TRUE;
-					if (!g_strncasecmp (response + 6, ".FIELDS", 7))
+					if (!strncasecmp (response + 6, ".FIELDS", 7))
 						cache_header = FALSE;
-				} else if (!g_strncasecmp (response, "0]", 2))
+				} else if (!strncasecmp (response, "0]", 2))
 					header = TRUE;
 				
 				p = strchr (response, ']');
@@ -2643,7 +2643,7 @@ parse_fetch_response (CamelImapFolder *imap_folder, char *response)
 				part_spec = g_strdup ("");
 				response += 7;
 				
-				if (!g_strncasecmp (response, "HEADER", 6))
+				if (!strncasecmp (response, "HEADER", 6))
 					header = TRUE;
 			}
 			
@@ -2658,20 +2658,20 @@ parse_fetch_response (CamelImapFolder *imap_folder, char *response)
 			g_datalist_set_data_full (&data, "BODY_PART_SPEC", part_spec, g_free);
 			g_datalist_set_data_full (&data, "BODY_PART_DATA", body, g_free);
 			g_datalist_set_data (&data, "BODY_PART_LEN", GINT_TO_POINTER (body_len));
-		} else if (!g_strncasecmp (response, "BODY ", 5) ||
-			   !g_strncasecmp (response, "BODYSTRUCTURE ", 14)) {
+		} else if (!strncasecmp (response, "BODY ", 5) ||
+			   !strncasecmp (response, "BODYSTRUCTURE ", 14)) {
 			response = strchr (response, ' ') + 1;
 			start = response;
 			imap_skip_list ((const char **) &response);
 			g_datalist_set_data_full (&data, "BODY", g_strndup (start, response - start), g_free);
-		} else if (!g_strncasecmp (response, "UID ", 4)) {
+		} else if (!strncasecmp (response, "UID ", 4)) {
 			int len;
 			
 			len = strcspn (response + 4, " )");
 			uid = g_strndup (response + 4, len);
 			g_datalist_set_data_full (&data, "UID", uid, g_free);
 			response += 4 + len;
-		} else if (!g_strncasecmp (response, "INTERNALDATE ", 13)) {
+		} else if (!strncasecmp (response, "INTERNALDATE ", 13)) {
 			int len;
 			
 			response += 13;