diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-10-27 03:28:35 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-27 03:28:35 +0800 |
| commit | 6a13d1a9ee828d4a5364d89b566415a3467f4fcc (patch) | |
| tree | 3c9d92bf5330df8a8d923ef3b18b03a4e568149c | |
| parent | 2b7bb054f06797c93e0b82dd78e1a2c0b6ad9659 (diff) | |
| download | gsoc2013-evolution-6a13d1a9ee828d4a5364d89b566415a3467f4fcc.tar.gz gsoc2013-evolution-6a13d1a9ee828d4a5364d89b566415a3467f4fcc.tar.zst gsoc2013-evolution-6a13d1a9ee828d4a5364d89b566415a3467f4fcc.zip | |
Remove g_thread_init() calls.
g_type_init() already calls it, and has for several GLib releases.
| -rw-r--r-- | capplet/anjal-settings-main.c | 5 | ||||
| -rw-r--r-- | capplet/settings/mail-guess-servers.c | 4 | ||||
| -rw-r--r-- | 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 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-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); diff --git a/shell/main.c b/shell/main.c index 5b76a2ed0b..4599b410cd 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")) { |