EComposerHeaderTable: Remove "shell" property.

No longer needed.

Removed functions:

  e_composer_header_table_get_shell()

3 files changed, 4 insertions, 62 deletions

diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 77106609c4..9db77ce891 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -23,8 +23,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <shell/e-shell.h>
-
 #include "e-msg-composer.h"
 #include "e-composer-private.h"
 #include "e-composer-from-header.h"
@@ -53,7 +51,6 @@ struct _EComposerHeaderTablePrivate {
 	GtkWidget *signature_combo_box;
 	ENameSelector *name_selector;
 	EClientCache *client_cache;
-	EShell *shell;
 };
 
 enum {
@@ -65,7 +62,6 @@ enum {
 	PROP_IDENTITY_UID,
 	PROP_POST_TO,
 	PROP_REPLY_TO,
-	PROP_SHELL,
 	PROP_SIGNATURE_COMBO_BOX,
 	PROP_SIGNATURE_UID,
 	PROP_SUBJECT
@@ -559,16 +555,6 @@ composer_header_table_set_client_cache (EComposerHeaderTable *table,
 }
 
 static void
-composer_header_table_set_shell (EComposerHeaderTable *table,
-                                 EShell *shell)
-{
-	g_return_if_fail (E_IS_SHELL (shell));
-	g_return_if_fail (table->priv->shell == NULL);
-
-	table->priv->shell = g_object_ref (shell);
-}
-
-static void
 composer_header_table_set_property (GObject *object,
                                     guint property_id,
                                     const GValue *value,
@@ -628,12 +614,6 @@ composer_header_table_set_property (GObject *object,
 				g_value_get_string (value));
 			return;
 
-		case PROP_SHELL:
-			composer_header_table_set_shell (
-				E_COMPOSER_HEADER_TABLE (object),
-				g_value_get_object (value));
-			return;
-
 		case PROP_SIGNATURE_UID:
 			e_composer_header_table_set_signature_uid (
 				E_COMPOSER_HEADER_TABLE (object),
@@ -713,13 +693,6 @@ composer_header_table_get_property (GObject *object,
 				E_COMPOSER_HEADER_TABLE (object)));
 			return;
 
-		case PROP_SHELL:
-			g_value_set_object (
-				value,
-				e_composer_header_table_get_shell (
-				E_COMPOSER_HEADER_TABLE (object)));
-			return;
-
 		case PROP_SIGNATURE_COMBO_BOX:
 			g_value_set_object (
 				value,
@@ -776,11 +749,6 @@ composer_header_table_dispose (GObject *object)
 		priv->client_cache = NULL;
 	}
 
-	if (priv->shell != NULL) {
-		g_object_unref (priv->shell);
-		priv->shell = NULL;
-	}
-
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (e_composer_header_table_parent_class)->dispose (object);
 }
@@ -1004,18 +972,6 @@ e_composer_header_table_class_init (EComposerHeaderTableClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_SHELL,
-		g_param_spec_object (
-			"shell",
-			NULL,
-			NULL,
-			E_TYPE_SHELL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY |
-			G_PARAM_STATIC_STRINGS));
-
-	g_object_class_install_property (
-		object_class,
 		PROP_SIGNATURE_COMBO_BOX,
 		g_param_spec_string (
 			"signature-combo-box",
@@ -1079,23 +1035,13 @@ e_composer_header_table_init (EComposerHeaderTable *table)
 }
 
 GtkWidget *
-e_composer_header_table_new (EShell *shell,
-                             EClientCache *client_cache)
+e_composer_header_table_new (EClientCache *client_cache)
 {
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 	g_return_val_if_fail (E_IS_CLIENT_CACHE (client_cache), NULL);
 
 	return g_object_new (
 		E_TYPE_COMPOSER_HEADER_TABLE,
-		"shell", shell, "client-cache", client_cache, NULL);
-}
-
-EShell *
-e_composer_header_table_get_shell (EComposerHeaderTable *table)
-{
-	g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
-
-	return table->priv->shell;
+		"client-cache", client_cache, NULL);
 }
 
 EClientCache *
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 5ccc77e6a1..d48512d3e8 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -20,7 +20,6 @@
 
 #include <libebook/libebook.h>
 
-#include <shell/e-shell.h>
 #include <composer/e-composer-header.h>
 
 /* Standard GObject macros */
@@ -70,10 +69,7 @@ struct _EComposerHeaderTableClass {
 };
 
 GType		e_composer_header_table_get_type (void);
-GtkWidget *	e_composer_header_table_new	(EShell *shell,
-						 EClientCache *client_cache);
-EShell *	e_composer_header_table_get_shell
-						(EComposerHeaderTable *table);
+GtkWidget *	e_composer_header_table_new	(EClientCache *client_cache);
 EClientCache *	e_composer_header_table_ref_client_cache
 						(EComposerHeaderTable *table);
 EComposerHeader *
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 90ff2037c8..2914e13ffb 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -245,7 +245,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 
 	/* Construct the header table. */
 
-	widget = e_composer_header_table_new (shell, client_cache);
+	widget = e_composer_header_table_new (client_cache);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_box_reorder_child (GTK_BOX (container), widget, 2);