aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail/e-mail-shell-backend.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-10-23 08:49:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-10-26 00:51:12 +0800
commit19cee3614902c50d3aafc3c7eb83fa2a4b85196c (patch)
treedf110d17b148e16c8fd604903fcada4125c4266c /modules/mail/e-mail-shell-backend.c
parentad6059bc0d63ab8503fe631dd3583c6ef8816b54 (diff)
downloadgsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.tar
gsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.tar.gz
gsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.tar.bz2
gsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.tar.lz
gsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.tar.xz
gsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.tar.zst
gsoc2013-evolution-19cee3614902c50d3aafc3c7eb83fa2a4b85196c.zip
Use EProxyPreferences in EPreferencesWindow.
Replaces EMNetworkPrefs.
Diffstat (limited to 'modules/mail/e-mail-shell-backend.c')
-rw-r--r--modules/mail/e-mail-shell-backend.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 4c4a1447c5..1ec00a3f55 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -58,7 +58,6 @@
#include "em-account-prefs.h"
#include "em-composer-prefs.h"
#include "em-mailer-prefs.h"
-#include "em-network-prefs.h"
#define E_MAIL_SHELL_BACKEND_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -508,6 +507,18 @@ mail_shell_backend_changes_committed_cb (EMailConfigWindow *window,
g_object_unref (service);
}
+static GtkWidget *
+mail_shell_backend_create_proxy_page (EPreferencesWindow *window)
+{
+ EShell *shell;
+ ESourceRegistry *registry;
+
+ shell = e_preferences_window_get_shell (window);
+ registry = e_shell_get_registry (shell);
+
+ return e_proxy_preferences_new (registry);
+}
+
static void
mail_shell_backend_constructed (GObject *object)
{
@@ -571,13 +582,14 @@ mail_shell_backend_constructed (GObject *object)
em_composer_prefs_new,
400);
+ /* This page is encapsulated by EProxyPreferences. */
e_preferences_window_add_page (
E_PREFERENCES_WINDOW (preferences_window),
"system-network-proxy",
"preferences-system-network-proxy",
_("Network Preferences"),
NULL,
- em_network_prefs_new,
+ mail_shell_backend_create_proxy_page,
500);
mail_session = e_mail_backend_get_session (E_MAIL_BACKEND (object));