From ad1581d50cdab9c56cdad61331f760a23f81b9de Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 24 Nov 2011 12:29:35 -0500
Subject: Remove e_shell_get_gconf_client().

No longer needed.
---
 doc/reference/shell/eshell-sections.txt |  1 -
 shell/e-shell.c                         | 24 ------------------------
 shell/e-shell.h                         |  1 -
 3 files changed, 26 deletions(-)

diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 562af01fc9..49aa192863 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -9,7 +9,6 @@ e_shell_get_canonical_name
 e_shell_get_backend_by_name
 e_shell_get_backend_by_scheme
 e_shell_get_shell_settings
-e_shell_get_gconf_client
 e_shell_create_shell_window
 e_shell_handle_uris
 e_shell_submit_alert
diff --git a/shell/e-shell.c b/shell/e-shell.c
index cc1591337f..82b62424fb 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -53,7 +53,6 @@
 struct _EShellPrivate {
 	GQueue alerts;
 	EShellSettings *settings;
-	GConfClient *gconf_client;
 	GActionGroup *action_group;
 	GtkWidget *preferences_window;
 
@@ -721,11 +720,6 @@ shell_dispose (GObject *object)
 		priv->settings = NULL;
 	}
 
-	if (priv->gconf_client != NULL) {
-		g_object_unref (priv->gconf_client);
-		priv->gconf_client = NULL;
-	}
-
 	if (priv->action_group != NULL) {
 		g_object_unref (priv->action_group);
 		priv->action_group = NULL;
@@ -1174,7 +1168,6 @@ e_shell_init (EShell *shell)
 	g_queue_init (&shell->priv->alerts);
 
 	shell->priv->settings = g_object_new (E_TYPE_SHELL_SETTINGS, NULL);
-	shell->priv->gconf_client = gconf_client_get_default ();
 	shell->priv->preferences_window = e_preferences_window_new (shell);
 	shell->priv->backends_by_name = backends_by_name;
 	shell->priv->backends_by_scheme = backends_by_scheme;
@@ -1389,23 +1382,6 @@ e_shell_get_shell_settings (EShell *shell)
 	return shell->priv->settings;
 }
 
-/**
- * e_shell_get_gconf_client:
- * @shell: an #EShell
- *
- * Returns the default #GConfClient.  This function is purely for
- * convenience.  The @shell owns the reference so you don't have to.
- *
- * Returns: the default #GConfClient
- **/
-GConfClient *
-e_shell_get_gconf_client (EShell *shell)
-{
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->gconf_client;
-}
-
 /**
  * e_shell_create_shell_window:
  * @shell: an #EShell
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 5110dd4a9c..a8def6fe3b 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -119,7 +119,6 @@ EShellBackend *	e_shell_get_backend_by_name	(EShell *shell,
 EShellBackend *	e_shell_get_backend_by_scheme	(EShell *shell,
 						 const gchar *scheme);
 EShellSettings *e_shell_get_shell_settings	(EShell *shell);
-GConfClient *	e_shell_get_gconf_client	(EShell *shell);
 GtkWidget *	e_shell_create_shell_window	(EShell *shell,
 						 const gchar *view_name);
 guint		e_shell_handle_uris		(EShell *shell,
-- 
cgit v1.2.3