diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-10-24 15:42:48 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-10-24 15:42:48 +0800 |
| commit | 8c67e84f9bf1803108f7a004513e37c6ef22d41f (patch) | |
| tree | 374f77fcc0214a5c8b91524029c3a66817b8c0f6 /shell | |
| parent | 0c061ed9844615e96dca3bcd590eee0f06621c83 (diff) | |
| download | gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.tar gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.tar.gz gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.tar.bz2 gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.tar.lz gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.tar.xz gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.tar.zst gsoc2013-evolution-8c67e84f9bf1803108f7a004513e37c6ef22d41f.zip | |
Call g_thread_init() conditionally
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/main.c b/shell/main.c index bb056e3ded..5b76a2ed0b 100644 --- a/shell/main.c +++ b/shell/main.c @@ -492,8 +492,10 @@ 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")) { |