[evolution/webkit-composer-rebased: 80/105] Remove more dead code

[Matthew Barnes <mbarnes src gnome org>]

commit cf6da6fc1e71b3435d2566d9d016dadafb6633db
Author: Dan VrÃtil <dvratil redhat com>
Date:   Tue Sep 11 11:15:43 2012 +0200

    Remove more dead code

 composer/e-composer-private.c |   65 -----------------------------------------
 composer/e-msg-composer.c     |   51 --------------------------------
 2 files changed, 0 insertions(+), 116 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 6bcd0fa..279da2c 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -60,50 +60,6 @@ composer_setup_charset_menu (EMsgComposer *composer)
 	gtk_ui_manager_ensure_update (ui_manager);
 }
 
-/* FIXME WEBKIT We don't need to control this anymore....
-static void
-msg_composer_url_requested_cb (GtkHTML *html,
-                               const gchar *uri,
-                               GtkHTMLStream *stream,
-                               EMsgComposer *composer)
-{
-	GByteArray *array;
-	GHashTable *hash_table;
-	CamelDataWrapper *wrapper;
-	CamelStream *camel_stream;
-	CamelMimePart *mime_part;
-
-	hash_table = composer->priv->inline_images_by_url;
-	mime_part = g_hash_table_lookup (hash_table, uri);
-
-	if (mime_part == NULL) {
-		hash_table = composer->priv->inline_images;
-		mime_part = g_hash_table_lookup (hash_table, uri);
-	}
-
-	// If this is not an inline image request,
-	// allow the signal emission to continue. 
-	if (mime_part == NULL)
-		return;
-
-	array = g_byte_array_new ();
-	camel_stream = camel_stream_mem_new_with_byte_array (array);
-	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
-	camel_data_wrapper_decode_to_stream_sync (
-		wrapper, camel_stream, NULL, NULL);
-
-	gtk_html_write (html, stream, (gchar *) array->data, array->len);
-
-	gtk_html_end (html, stream, GTK_HTML_STREAM_OK);
-
-	g_object_unref (camel_stream);
-
-	// gtk_html_end() destroys the GtkHTMLStream, so we need to
-	// stop the signal emission so nothing else tries to use it.
-	g_signal_stop_emission_by_name (html, "url-requested");
-}
-*/
-
 static void
 composer_update_gallery_visibility (EMsgComposer *composer)
 {
@@ -422,11 +378,6 @@ e_composer_private_constructed (EMsgComposer *composer)
 	/* Initial sync */
 	composer_update_gallery_visibility (composer);
 
-	/* XXX What is this for? */
-	/* FIXME WEBKIT Yes, what is this for?
-	g_object_set_data (G_OBJECT (composer), "vbox", editor->vbox);
-	*/
-
 	/* Bind headers to their corresponding actions. */
 
 	for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) {
@@ -466,22 +417,6 @@ e_composer_private_constructed (EMsgComposer *composer)
 			G_BINDING_BIDIRECTIONAL |
 			G_BINDING_SYNC_CREATE);
 	}
-
-	/* Install a handler for inline images. */
-
-	/* XXX We no longer use GtkhtmlEditor::uri-requested because it
-	 *     conflicts with EWebView's url_requested() method, which
-	 *     unconditionally launches an async operation.  I changed
-	 *     GtkHTML::url-requested to be a G_SIGNAL_RUN_LAST so that
-	 *     our handler runs first.  If we can handle the request
-	 *     we'll stop the signal emission to prevent EWebView from
-	 *     launching an async operation.  Messy, but works until we
-	 *     switch to WebKit.  --mbarnes */
-	/* FIXME WEBKIT So...we don't need this anymore, right?
-	g_signal_connect (
-		web_view, "url-requested",
-		G_CALLBACK (msg_composer_url_requested_cb), composer);
-	*/
 }
 
 void
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 94c0e7f..8b5a261 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2212,30 +2212,6 @@ msg_composer_key_press_event (GtkWidget *widget,
 		key_press_event (widget, event);
 }
 
-static void
-msg_composer_cut_clipboard (EMsgComposer *composer)
-{
-	/* Do nothing.  EFocusTracker handles this. */
-}
-
-static void
-msg_composer_copy_clipboard (EMsgComposer *composer)
-{
-	/* Do nothing.  EFocusTracker handles this. */
-}
-
-static void
-msg_composer_paste_clipboard (EMsgComposer *composer)
-{
-	/* Do nothing.  EFocusTracker handles this. */
-}
-
-static void
-msg_composer_select_all (EMsgComposer *composer)
-{
-	/* Do nothing.  EFocusTracker handles this. */
-}
-
 /* FIXME WEBKIT We can effectively hack around this by DOM manipulation
  * when inserting signature, right?..or when is this usefull ?? */
 static void
@@ -2345,33 +2321,6 @@ msg_composer_image_uri (EMsgComposer *composer,
 	return g_strconcat ("cid:", cid, NULL);
 }
 
-/* FIXME WEBKIT We don't need this, do we? */
-static void
-msg_composer_object_deleted (EMsgComposer *composer)
-{
-	/*
-	const gchar *data;
-
-	if (!gtkhtml_editor_is_paragraph_empty (editor))
-		return;
-
-	data = gtkhtml_editor_get_paragraph_data (editor, "orig");
-	if (data != NULL && *data == '1') {
-		gtkhtml_editor_set_paragraph_data (editor, "orig", "0");
-		gtkhtml_editor_run_command (editor, "indent-zero");
-		gtkhtml_editor_run_command (editor, "style-normal");
-		gtkhtml_editor_run_command (editor, "text-default-color");
-		gtkhtml_editor_run_command (editor, "italic-off");
-		gtkhtml_editor_run_command (editor, "insert-paragraph");
-		gtkhtml_editor_run_command (editor, "delete-back");
-	}
-
-	data = gtkhtml_editor_get_paragraph_data (editor, "signature");
-	if (data != NULL && *data == '1')
-		gtkhtml_editor_set_paragraph_data (editor, "signature", "0");
-	*/
-}
-
 static gboolean
 msg_composer_presend (EMsgComposer *composer)
 {