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

[Matthew Barnes <mbarnes src gnome org>]

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

    Fix compiler warnings.

 composer/e-composer-private.c    |    2 +-
 composer/e-msg-composer.c        |    9 +++------
 e-util/e-color-combo.c           |    4 ++--
 e-util/e-editor-dialog.c         |    2 +-
 e-util/e-editor-find-dialog.c    |    4 ++--
 e-util/e-editor-replace-dialog.c |    2 +-
 mail/em-composer-utils.c         |    4 +---
 7 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 0b32a47..2e3ae3f 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -217,7 +217,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 
 	priv->focus_tracker = focus_tracker;
 
-	container = gtk_vbox_new (FALSE, 0);
+	container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_set_vexpand (container, FALSE);
 	gtk_widget_show (container);
 	e_editor_window_pack_above (E_EDITOR_WINDOW (composer), container);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 7e5358f..4919b37 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/e-util/e-color-combo.c b/e-util/e-color-combo.c
index 5c870ad..ebc3565 100644
--- a/e-util/e-color-combo.c
+++ b/e-util/e-color-combo.c
@@ -672,7 +672,7 @@ e_color_combo_init (EColorCombo *combo)
 	combo->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		combo, E_TYPE_COLOR_COMBO, EColorComboPrivate);
 
-	layout = gtk_hbox_new (FALSE, 0);
+	layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_container_add (GTK_CONTAINER (combo), layout);
 
 	/* Build the combo button. */
@@ -683,7 +683,7 @@ e_color_combo_init (EColorCombo *combo)
 		G_CALLBACK (color_combo_draw_frame_cb), combo);
 	combo->priv->color_frame = widget;
 
-	widget = gtk_vseparator_new ();
+	widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
 	gtk_box_pack_start (GTK_BOX (layout), widget, FALSE, TRUE, 0);
 
 	widget = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
diff --git a/e-util/e-editor-dialog.c b/e-util/e-editor-dialog.c
index 22a303e..368385f 100644
--- a/e-util/e-editor-dialog.c
+++ b/e-util/e-editor-dialog.c
@@ -157,7 +157,7 @@ e_editor_dialog_init (EEditorDialog *dialog)
 	dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		dialog, E_TYPE_EDITOR_DIALOG, EEditorDialogPrivate);
 
-	main_layout = GTK_BOX (gtk_vbox_new (FALSE, 5));
+	main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
 	gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
 
diff --git a/e-util/e-editor-find-dialog.c b/e-util/e-editor-find-dialog.c
index 3499652..be22721 100644
--- a/e-util/e-editor-find-dialog.c
+++ b/e-util/e-editor-find-dialog.c
@@ -151,7 +151,7 @@ e_editor_find_dialog_init (EEditorFindDialog *dialog)
 		widget, "key-release-event",
 		G_CALLBACK (entry_key_release_event), dialog);
 
-	box = GTK_BOX (gtk_hbox_new (FALSE, 5));
+	box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5));
 	gtk_grid_attach (main_layout, GTK_WIDGET (box), 0, 1, 1, 1);
 
 	widget = gtk_check_button_new_with_mnemonic (N_("Search _backwards"));
@@ -175,7 +175,7 @@ e_editor_find_dialog_init (EEditorFindDialog *dialog)
 		widget, "toggled",
 		G_CALLBACK (reset_dialog), dialog);
 
-	box = GTK_BOX (gtk_hbox_new (FALSE, 5));
+	box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5));
 	gtk_grid_attach (main_layout, GTK_WIDGET (box), 0, 2, 1, 1);
 
 	widget = gtk_label_new ("");
diff --git a/e-util/e-editor-replace-dialog.c b/e-util/e-editor-replace-dialog.c
index 0b09f21..c396b17 100644
--- a/e-util/e-editor-replace-dialog.c
+++ b/e-util/e-editor-replace-dialog.c
@@ -214,7 +214,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
 	gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
 	gtk_grid_attach (main_layout, widget, 0, 1, 1, 1);
 
-	layout = gtk_hbox_new (FALSE, 5);
+	layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
 	gtk_grid_attach (main_layout, layout, 1, 2, 2, 1);
 
 	widget = gtk_check_button_new_with_mnemonic (_("Search _backwards"));
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;