aboutsummaryrefslogtreecommitdiffstats
path: root/capplet
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-28 17:38:03 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-28 17:38:03 +0800
commitb3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89 (patch)
tree7190b4353c533028b4a0c27d241d96e883a280ad /capplet
parent9744056c5e69227abdcdd55c4bffb674b29bd765 (diff)
parent8f5493140c4da6e81e2c14e77833bfbb56c619f8 (diff)
downloadgsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar
gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.gz
gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.bz2
gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.lz
gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.xz
gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.tar.zst
gsoc2013-evolution-b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'capplet')
-rw-r--r--capplet/anjal-settings-main.c5
-rw-r--r--capplet/settings/mail-capplet-shell.c2
-rw-r--r--capplet/settings/mail-guess-servers.c4
3 files changed, 2 insertions, 9 deletions
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 91e36904c7..7efddcffbf 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -167,11 +167,6 @@ main (gint argc,
if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
g_error ("%s", error->message);
- #if !GLIB_CHECK_VERSION(2,31,0)
- if (!g_thread_get_initialized ())
- g_thread_init (NULL);
- #endif
-
e_passwords_init ();
categories_icon_theme_hack ();
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) {
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);