New function that decides if 2 word types are mergeable. An atom and a

2001-06-21  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-mime-utils.c (word_types_compatable): New function that
	decides if 2 word types are mergeable. An atom and a qstring are
	mergeable; 2 qstrings are mergeable; and 2 encoded words are
	mergeable.
	(header_encode_phrase_merge_words): If 2 words are merged, the new
	word type is the MAX of the combined types. This means that if we
	merge a qstring and an atom, the resulting word type is a
	qstring.

	* camel-internet-address.c (internet_format):
	s/g_string_sprintfa/g_string_append since this makes more sense in
	this particular case.
	(internet_encode): Same here.

svn path=/trunk/; revision=10377

1 files changed, 6 insertions, 5 deletions

diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
index 902178c303..f9ae9dd37b 100644
--- a/camel/camel-internet-address.c
+++ b/camel/camel-internet-address.c
@@ -132,7 +132,7 @@ internet_encode	(CamelAddress *a)
 			g_string_append(out, ", ");
 
 		enc = camel_internet_address_encode_address(&len, addr->name, addr->address);
-		g_string_sprintfa(out, "%s", enc);
+		g_string_append(out, enc);
 		g_free(enc);
 	}
 	
@@ -228,7 +228,7 @@ internet_format	(CamelAddress *a)
 			g_string_append(out, ", ");
 
 		enc = camel_internet_address_format_address(addr->name, addr->address);
-		g_string_sprintfa(out, "%s", enc);
+		g_string_append(out, enc);
 		g_free(enc);
 	}
 	
@@ -238,7 +238,8 @@ internet_format	(CamelAddress *a)
 	return ret;
 }
 
-static int    internet_cat		(CamelAddress *dest, const CamelAddress *source)
+static int
+internet_cat (CamelAddress *dest, const CamelAddress *source)
 {
 	int i;
 
@@ -292,7 +293,7 @@ camel_internet_address_new (void)
  * Return value: Index of added entry.
  **/
 int
-camel_internet_address_add	(CamelInternetAddress *a, const char *name, const char *address)
+camel_internet_address_add (CamelInternetAddress *a, const char *name, const char *address)
 {
 	struct _address *new;
 	int index;
@@ -320,7 +321,7 @@ camel_internet_address_add	(CamelInternetAddress *a, const char *name, const cha
  * Return value: TRUE if such an address exists, or FALSE otherwise.
  **/
 gboolean
-camel_internet_address_get	(const CamelInternetAddress *a, int index, const char **namep, const char **addressp)
+camel_internet_address_get (const CamelInternetAddress *a, int index, const char **namep, const char **addressp)
 {
 	struct _address *addr;