Fix even more compiler warnings and disable one for format strings

4 files changed, 24 insertions, 25 deletions

diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 1f0fdb8ba9..bce0bbb469 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1421,7 +1421,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
 			current[len] = 0;
 		}
 	} else {
-		current = "imap";
+		current = (gchar*)"imap";
 	}
 
 	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
@@ -2257,7 +2257,7 @@ section:
 		case CAMEL_PROVIDER_CONF_CHECKBOX:
 			w = emae_option_toggle(service, url, entries[i].text, entries[i].name, atoi(entries[i].value));
 			gtk_table_attach((GtkTable *)parent, w, 0, 2, row, row+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-			g_hash_table_insert(extra, entries[i].name, w);
+			g_hash_table_insert(extra, (gpointer)entries[i].name, w);
 			if (depw)
 				depl = g_slist_prepend(depl, w);
 			row++;
@@ -2278,7 +2278,7 @@ section:
 			}
 			row++;
 			/* FIXME: this is another hack for exchange/groupwise connector */
-			g_hash_table_insert(item->extra_table, entries[i].name, w);
+			g_hash_table_insert(item->extra_table, (gpointer)entries[i].name, w);
 			break;
 		case CAMEL_PROVIDER_CONF_CHECKSPIN:
 			w = emae_option_checkspin(service, url, entries[i].name, entries[i].text, entries[i].value);
@@ -3053,7 +3053,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 
 		for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) {
 			struct _receive_options_item *item;
-			gchar *name = entries[i].name;
+			const gchar *name = entries[i].name;
 			gint myindex = index;
 
 			if (entries[i].type != CAMEL_PROVIDER_CONF_SECTION_START
@@ -3068,7 +3068,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 			item = g_malloc0(sizeof(*item));
 			item->item.type = E_CONFIG_SECTION_TABLE;
 			item->item.path = g_strdup_printf("20.receive_options/%02d.%s", myindex, name?name:"unnamed");
-			item->item.label = entries[i].text;
+			item->item.label = g_strdup (entries[i].text);
 
 			l = g_slist_prepend(l, item);
 
@@ -3076,12 +3076,12 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 			item->item.type = E_CONFIG_ITEM_TABLE;
 			item->item.path = g_strdup_printf("20.receive_options/%02d.%s/80.camelitem", myindex, name?name:"unnamed");
 			item->item.factory = emae_receive_options_extra_item;
-			item->item.user_data = entries[i].name;
+			item->item.user_data = g_strdup (entries[i].name);
 
 			l = g_slist_prepend(l, item);
 
 			index += 10;
-			g_hash_table_insert(have, entries[i].name, have);
+			g_hash_table_insert(have, (gpointer)entries[i].name, have);
 		}
 	}
 	g_hash_table_destroy(have);
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index a61c3f26f5..af8616a981 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -174,7 +174,7 @@ emfq_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt)
 static void
 emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags, gint is_html)
 {
-	const gchar *fmt, *html;
+	const gchar *html;
 	gchar *mhtml = NULL;
 
 	if (value == NULL)
@@ -189,11 +189,10 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *
 		html = value;
 
 	if (flags & EM_FORMAT_HEADER_BOLD)
-		fmt = "<b>%s</b>: %s<br>";
+		camel_stream_printf (stream, "<b>%s</b>: %s<br>", label, html);
 	else
-		fmt = "%s: %s<br>";
+		camel_stream_printf (stream, "%s: %s<br>", label, html);
 
-	camel_stream_printf (stream, fmt, label, html);
 	g_free (mhtml);
 }
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 71d16e98f7..19e3f2671f 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -39,8 +39,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass);
 static void em_inline_filter_init (CamelObject *object);
 static void em_inline_filter_finalize (CamelObject *object);
 
-static void emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
-static void emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
+static void emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
+static void emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
 static void emif_reset(CamelMimeFilter *f);
 
 static CamelMimeFilterClass *parent_class = NULL;
@@ -337,21 +337,21 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 }
 
 static void
-emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
+emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
-	emif_scan(f, in, len, FALSE);
+	emif_scan(f, (gchar*)in, len, FALSE);
 
-	*out = in;
+	*out = (gchar*)in;
 	*outlen = len;
 	*outprespace = prespace;
 }
 
 static void
-emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
+emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
-	emif_scan(f, in, len, TRUE);
+	emif_scan(f, (gchar*)in, len, TRUE);
 
-	*out = in;
+	*out = (gchar*)in;
 	*outlen = len;
 	*outprespace = prespace;
 }
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index 65400027ff..f4097a1b3d 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -34,9 +34,9 @@
 static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass);
 static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass);
 
-static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+static void filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 			   gchar **out, gsize *outlen, gsize *outprespace);
-static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
@@ -83,7 +83,7 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass)
 }
 
 static void
-strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 		 gchar **out, gsize *outlen, gsize *outprespace, gint flush)
 {
 	EMStripSigFilter *stripsig = (EMStripSigFilter *) filter;
@@ -126,20 +126,20 @@ strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
 	else if (!start)
 		inptr = inend;
 
-	*out = in;
+	*out = (gchar*)in;
 	*outlen = inptr - in;
 	*outprespace = prespace;
 }
 
 static void
-filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 	       gchar **out, gsize *outlen, gsize *outprespace)
 {
 	strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE);
 }
 
 static void
-filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 		 gchar **out, gsize *outlen, gsize *outprespace)
 {
 	strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE);