merge a lot of work. Rough ChangeLog will follow

svn path=/trunk/; revision=1052

1 files changed, 10 insertions, 10 deletions

diff --git a/camel/gstring-util.c b/camel/gstring-util.c
index 89cd263e85..8b89d1d9b4 100644
--- a/camel/gstring-util.c
+++ b/camel/gstring-util.c
@@ -92,7 +92,7 @@ g_string_dichotomy (GString *string, gchar sep, GString **prefix, GString **suff
 	gchar *str, *tmp;
 	gint pos, len, first;
 	
-	CAMEL_LOG(FULL_DEBUG,\
+	CAMEL_LOG_FULL_DEBUG (\
 		  "Entering string_dichotomy: \n\tseparator=%c \n\tprefix=%p \n\tsuffix=%p \n\toptions=%ld\n",\
 		  sep, prefix, suffix, options);
 	g_assert( tmp=string->str );
@@ -102,7 +102,7 @@ g_string_dichotomy (GString *string, gchar sep, GString **prefix, GString **suff
 			*prefix=NULL;
 		if (suffix)
 			*suffix=NULL;
-		CAMEL_LOG(FULL_DEBUG,"string_dichotomy: string is empty\n");
+		CAMEL_LOG_FULL_DEBUG ("string_dichotomy: string is empty\n");
 		return 'n';
 	}
 	first = 0;
@@ -117,7 +117,7 @@ g_string_dichotomy (GString *string, gchar sep, GString **prefix, GString **suff
 	if (first==len) {
 		if (prefix) *prefix=NULL;
 		if (suffix) *suffix=NULL;
-		CAMEL_LOG(FULL_DEBUG,"string_dichotomy: after stripping, string is empty\n");
+		CAMEL_LOG_FULL_DEBUG ("string_dichotomy: after stripping, string is empty\n");
 		return 'n';
 	}
 	
@@ -139,7 +139,7 @@ g_string_dichotomy (GString *string, gchar sep, GString **prefix, GString **suff
 		{
 			if (suffix) *suffix=NULL;
 			if (prefix) *prefix=NULL;
-			CAMEL_LOG(FULL_DEBUG,"string_dichotomy: separator not found\n");
+			CAMEL_LOG_FULL_DEBUG ("string_dichotomy: separator not found\n");
 			return 'n';
 		}
 	
@@ -149,7 +149,7 @@ g_string_dichotomy (GString *string, gchar sep, GString **prefix, GString **suff
 		{
 			if (suffix) *suffix=NULL;
 			if (prefix) *prefix=NULL;
-			CAMEL_LOG(FULL_DEBUG,"string_dichotomy: separator is last character\n");
+			CAMEL_LOG_FULL_DEBUG ("string_dichotomy: separator is last character\n");
 			return 'l';
 		}
 	/* if we have stripped leading separators, we should */
@@ -158,7 +158,7 @@ g_string_dichotomy (GString *string, gchar sep, GString **prefix, GString **suff
 		{
 			if (suffix) *suffix=NULL;
 			if (prefix) *prefix=NULL;
-			CAMEL_LOG(FULL_DEBUG,"string_dichotomy: separator is first character\n");
+			CAMEL_LOG_FULL_DEBUG ("string_dichotomy: separator is first character\n");
 			return 'l';
 		}
 	
@@ -279,7 +279,7 @@ g_string_split (GString *string, char sep, gchar *trim_chars, GStringTrimOption
 		last--;
 
 	
-	CAMEL_LOG(FULL_DEBUG,"g_string_split:: trim options: %d\n", trim_options);
+	CAMEL_LOG_FULL_DEBUG ("g_string_split:: trim options: %d\n", trim_options);
 
 	while (first<=last)  {
 		pos = first;
@@ -308,7 +308,7 @@ g_string_trim (GString *string, gchar *chars, GStringTrimOption options)
 	guint length;
 	gchar *str;
 
-	CAMEL_LOG(FULL_DEBUG,"**\nentering g_string_trim::\n");
+	CAMEL_LOG_FULL_DEBUG ("**\nentering g_string_trim::\n");
 
 	if ((!string) || (!string->str))
 		return; 
@@ -320,7 +320,7 @@ g_string_trim (GString *string, gchar *chars, GStringTrimOption options)
 	first_ok = 0;
 	last_ok = length - 1;
 	
-	CAMEL_LOG (FULL_DEBUG,"g_string_trim:: trim_options:%d\n", options);
+	CAMEL_LOG_FULL_DEBUG ("g_string_trim:: trim_options:%d\n", options);
 	if (options & GSTRING_TRIM_STRIP_LEADING)
 		while  ( (first_ok <= last_ok) && (strchr (chars, str[first_ok])) )
 			first_ok++;
@@ -328,7 +328,7 @@ g_string_trim (GString *string, gchar *chars, GStringTrimOption options)
 	if (options & GSTRING_TRIM_STRIP_TRAILING)
 		while  ( (first_ok <= last_ok) && (strchr (chars, str[last_ok])) )
 			last_ok++;
-	CAMEL_LOG (FULL_DEBUG,"g_string_trim::\n\t\"%s\":first ok:%d last_ok:%d\n",
+	CAMEL_LOG_FULL_DEBUG ("g_string_trim::\n\t\"%s\":first ok:%d last_ok:%d\n",
 		   string->str, first_ok, last_ok);
 
 	if (first_ok > 0)