Kill the global EMailShellBackend variable. Yay!

2 files changed, 0 insertions, 15 deletions

diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 6ea6284755..76aeb0daaa 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -79,11 +79,6 @@ struct _EMailShellBackendPrivate {
 static gpointer parent_class;
 static GType mail_shell_backend_type;
 
-/* XXX So many things need the shell backend that it's
- *     just easier for now to make it globally available.
- *     We should fix this, though. */
-EMailShellBackend *global_mail_shell_backend = NULL;
-
 extern gint camel_application_is_exiting;
 
 static void
@@ -583,9 +578,6 @@ mail_shell_backend_constructed (GObject *object)
 
 	e_attachment_handler_mail_get_type ();
 
-	/* XXX This never gets unreffed. */
-	global_mail_shell_backend = g_object_ref (shell_backend);
-
 	g_signal_connect (
 		shell, "notify::online",
 		G_CALLBACK (mail_shell_backend_notify_online_cb),
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 4bc1a36706..73ef10e75b 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -63,13 +63,6 @@ struct _EMailShellBackendClass {
 	EShellBackendClass parent_class;
 };
 
-/* Globally available shell backend.
- *
- * XXX I don't like having this globally available but passing it around
- *     to all the various utilities that need to access the backend's data
- *     directory is too much of a pain for now. */
-extern EMailShellBackend *global_mail_shell_backend;
-
 GType		e_mail_shell_backend_get_type	(void);
 void		e_mail_shell_backend_register_type
 					(GTypeModule *type_module);