From 2e87aa81fc94f5d9564421e036adae7b48e7380a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 10 Mar 2013 09:53:12 -0400
Subject: Remove EMailShellSettings.

EShellSettings predates GSettings and is no longer necessary.

GSettings allows binding GObject properties to GSettings keys,
with optional mapping functions.  That fulfills the purpose of
EShellSettings.
---
 mail/e-http-request.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'mail/e-http-request.c')

diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index 0d6ccc26a1..14bfdda181 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -157,7 +157,7 @@ handle_http_request (GSimpleAsyncResult *res,
 	EMailImageLoadingPolicy image_policy;
 	gchar *uri_md5;
 	EShell *shell;
-	EShellSettings *shell_settings;
+	GSettings *settings;
 	const gchar *user_cache_dir;
 	CamelDataCache *cache;
 	CamelStream *cache_stream;
@@ -274,8 +274,9 @@ handle_http_request (GSimpleAsyncResult *res,
 		goto cleanup;
 	}
 
-	shell_settings = e_shell_get_shell_settings (shell);
-	image_policy =  e_shell_settings_get_int (shell_settings, "mail-image-loading-policy");
+	settings = g_settings_new ("org.gnome.evolution.mail");
+	image_policy = g_settings_get_enum (settings, "image-loading-policy");
+	g_object_unref (settings);
 
 	/* Item not found in cache, but image loading policy allows us to fetch
 	 * it from the interwebs */
-- 
cgit