[evolution/webkit-composer: 108/130] Fix compiler warnings.

[Matthew Barnes <mbarnes src gnome org>]

commit ca297946abcf0bf3219ecf72d59619096df921d7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jan 8 09:37:39 2013 -0500

    Fix compiler warnings.

 composer/e-msg-composer.c |    9 +++------
 mail/em-composer-utils.c  |    4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6579a39..65c888d 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1691,7 +1691,6 @@ msg_composer_paste_clipboard_targets_cb (GtkClipboard *clipboard,
 {
 	EEditor *editor;
 	EEditorWidget *editor_widget;
-	gboolean is_html;
 
 	editor = e_editor_window_get_editor (E_EDITOR_WINDOW (composer));
 	editor_widget = e_editor_get_editor_widget (editor);
@@ -2272,11 +2271,11 @@ msg_composer_key_press_event (GtkWidget *widget,
 
 /* FIXME WEBKIT We can effectively hack around this by DOM manipulation
  * when inserting signature, right?..or when is this usefull ?? */
+#if 0  /* WEBKIT-COMPOSER */
 static void
 msg_composer_command_before (EMsgComposer *composer,
                              const gchar *command)
 {
-	/*
 	EMsgComposer *composer;
 	const gchar *data;
 
@@ -2300,14 +2299,12 @@ msg_composer_command_before (EMsgComposer *composer,
 		gtkhtml_editor_run_command (editor, "text-default-color");
 		gtkhtml_editor_run_command (editor, "italic-off");
 	}
-	*/
 }
 
 static void
 msg_composer_command_after (EMsgComposer *composer,
                             const gchar *command)
 {
-	/*
 	EMsgComposer *composer;
 	const gchar *data;
 
@@ -2330,7 +2327,7 @@ msg_composer_command_after (EMsgComposer *composer,
 	if (data == NULL || *data != '1')
 		return;
 
-	// Clear the signature.
+	/* Clear the signature. */
 	if (gtkhtml_editor_is_paragraph_empty (editor))
 		gtkhtml_editor_set_paragraph_data (editor, "signature" ,"0");
 
@@ -2343,7 +2340,6 @@ msg_composer_command_after (EMsgComposer *composer,
 
 	gtkhtml_editor_run_command (editor, "text-default-color");
 	gtkhtml_editor_run_command (editor, "italic-off");
-	*/
 }
 
 static gchar *
@@ -2381,6 +2377,7 @@ msg_composer_image_uri (EMsgComposer *composer,
 
 	return g_strconcat ("cid:", cid, NULL);
 }
+#endif /* WEBKIT-COMPOSER */
 
 static gboolean
 msg_composer_presend (EMsgComposer *composer)
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 11af0a4..4ebfc72 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2820,7 +2820,7 @@ composer_set_body (EMsgComposer *composer,
 	CamelMimePart *part;
 	CamelSession *session;
 	GSettings *settings;
-	gboolean start_bottom, has_body_text = FALSE;
+	gboolean start_bottom;
 	guint32 validity_found = 0;
 
 	session = e_msg_composer_get_session (composer);
@@ -2846,7 +2846,6 @@ composer_set_body (EMsgComposer *composer,
 			parts_list, "<span id=\"-x-evolution-reply-citation\">",
 			start_bottom ? "</span><br>" : "</span>", &validity_found);
 		e_msg_composer_set_body_text (composer, text, TRUE);
-		has_body_text = text && *text;
 		g_free (text);
 		g_free (original);
 		emu_update_composers_security (composer, validity_found);
@@ -2862,7 +2861,6 @@ composer_set_body (EMsgComposer *composer,
 			start_bottom ? "</span><br>" : "</span>", &validity_found);
 		g_free (credits);
 		e_msg_composer_set_body_text (composer, text, TRUE);
-		has_body_text = text && *text;
 		g_free (text);
 		emu_update_composers_security (composer, validity_found);
 		break;