From f37b0a1ab7d9dd437905d10d85410992ad9abc0a Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Tue, 17 Dec 2002 20:38:25 +0000
Subject: ...And a whole bunch more build fixes.

2002-12-17  Jeffrey Stedfast  <fejj@ximian.com>

	...And a whole bunch more build fixes.

	* mail-vfolder.c (mail_vfolder_delete_uri): Don't use
	g_string_sprintfa() anymore since it is apparently deprecated.

	* mail-session.c (main_get_filter_driver): Don't use
	g_string_sprintfa() anymore since it is apparently deprecated.

	* mail-ops.c (build_from): Don't use g_string_sprintfa() anymore
	since it is apparently deprecated.

	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Don't use
	g_string_sprintfa() anymore since it is apparently deprecated.

	* mail-autofilter.c: Don't use g_string_sprintfa() anymore since
	it is apparently deprecated.

	* folder-browser.c: Don't use g_string_sprintfa() anymore since it
	is apparently deprecated.

	* mail-search.c (mail_search_set_subject): Remove the unnecessary
	g_strdup()'age as well as fix a possible buffer overrun.

	* mail-local.c (mail_local_folder_construct): Use
	g_path_get_basename().

	* mail-config-druid.c (make_account): Don't use e_utf8_*
	functions.

svn path=/trunk/; revision=19152
---
 mail/mail-format.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'mail/mail-format.c')

diff --git a/mail/mail-format.c b/mail/mail-format.c
index fd77b06a74..f2f2c3d01f 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1869,15 +1869,15 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
 	 * <P> to <PRE> switch.
 	 */
 	if (!strncasecmp (text, "<pre>", 5))
-		g_string_sprintfa (retval, "<PRE>");
+		g_string_append_printf (retval, "<PRE>");
 	
 	/* create credits */
 	cia = camel_mime_message_get_from (message);
 	buf = camel_address_format (CAMEL_ADDRESS (cia));
 	if (buf) {
 		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-		g_string_sprintfa (retval, "%s<b>From:</b> %s<br>",
-				   citation, html);
+		g_string_append_printf (retval, "%s<b>From:</b> %s<br>",
+					citation, html);
 		g_free (html);
 		g_free (buf);
 	}
@@ -1886,8 +1886,8 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
 	buf = camel_address_format (CAMEL_ADDRESS (cia));
 	if (buf) {
 		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-		g_string_sprintfa (retval, "%s<b>To:</b> %s<br>",
-				   citation, html);
+		g_string_append_printf (retval, "%s<b>To:</b> %s<br>",
+					citation, html);
 		g_free (html);
 		g_free (buf);
 	}
@@ -1896,8 +1896,8 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
 	buf = camel_address_format (CAMEL_ADDRESS (cia));
 	if (buf) {
 		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-		g_string_sprintfa (retval, "%s<b>Cc:</b> %s<br>",
-				   citation, html);
+		g_string_append_printf (retval, "%s<b>Cc:</b> %s<br>",
+					citation, html);
 		g_free (html);
 		g_free (buf);
 	}
@@ -1906,22 +1906,22 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
 	if (buf) {
 		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
 					   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
-		g_string_sprintfa (retval, "%s<b>Subject:</b> %s<br>",
-				   citation, html);
+		g_string_append_printf (retval, "%s<b>Subject:</b> %s<br>",
+					citation, html);
 		g_free (html);
 	}
 	
 	date_val = camel_mime_message_get_date (message, &offset);
 	buf = header_format_date (date_val, offset);
 	html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-	g_string_sprintfa (retval, "%s<b>Date:</b> %s<br>", citation, html);
+	g_string_append_printf (retval, "%s<b>Date:</b> %s<br>", citation, html);
 	g_free (html);
 	g_free (buf);
 	
 	if (!strncasecmp (text, "<pre>", 5))
-		g_string_sprintfa (retval, "%s<br>%s", citation, text + 5);
+		g_string_append_printf (retval, "%s<br>%s", citation, text + 5);
 	else
-		g_string_sprintfa (retval, "%s<br>%s", citation, text);
+		g_string_append_printf (retval, "%s<br>%s", citation, text);
 	g_free (text);
 	
 	buf = retval->str;
-- 
cgit v1.2.3