[evolution] Remove g_thread_init() calls.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Remove g_thread_init() calls.
- Date: Wed, 26 Oct 2011 19:43:33 +0000 (UTC)
commit 6a13d1a9ee828d4a5364d89b566415a3467f4fcc
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Oct 26 15:28:35 2011 -0400
Remove g_thread_init() calls.
g_type_init() already calls it, and has for several GLib releases.
capplet/anjal-settings-main.c | 5 -----
capplet/settings/mail-guess-servers.c | 4 +---
shell/main.c | 4 ----
3 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 91e3690..7efddcf 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-guess-servers.c b/capplet/settings/mail-guess-servers.c
index 0b15271..8ab9670 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);
diff --git a/shell/main.c b/shell/main.c
index 5b76a2e..4599b41 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -492,10 +492,6 @@ main (gint argc,
textdomain (GETTEXT_PACKAGE);
g_type_init ();
- #if !GLIB_CHECK_VERSION(2,31,0)
- if (!g_thread_get_initialized ())
- g_thread_init (NULL);
- #endif
/* do not require Gtk+ for --force-shutdown */
if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]