From 2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 Oct 2011 12:31:33 -0400 Subject: e-mail-store.c: Take EMailSession instead of EMailBackend. My apologies for flip-flopping the API again. e-mail-store.c functions used to take an EMailSession, then I changed it to take an EMailBackend in preparation for my account-mgmt branch. Having rethought some API decisions on the branch, however, the first flip-flop proved to be unnecessary. And now Srini needs the API to use EMailSession for his mail-factory branch, so I'm flip-flopping again. --- capplet/settings/mail-capplet-shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capplet/settings') diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index 6567da02ac..2bf464c7c0 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -278,7 +278,7 @@ mail_capplet_shell_construct (MailCappletShell *shell, mail_config_init (session); mail_msg_init (); custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL); - e_mail_store_init (shell->priv->backend, custom_dir); + e_mail_store_init (session, custom_dir); g_free (custom_dir); if (just_druid) { -- cgit v1.2.3 From 6a13d1a9ee828d4a5364d89b566415a3467f4fcc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 Oct 2011 15:28:35 -0400 Subject: Remove g_thread_init() calls. g_type_init() already calls it, and has for several GLib releases. --- capplet/settings/mail-guess-servers.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'capplet/settings') diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 0b15271a88..8ab9670e8c 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -343,9 +343,7 @@ main (gint argc, gchar **argv) { EmailProvider *provider; - #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); - #endif + g_type_init (); provider = g_new0 (EmailProvider, 1); -- cgit v1.2.3