diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-28 17:38:03 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-28 17:38:03 +0800 |
| commit | b3b35231e2ce675202ef9f1a7ccefdc3ab0e0e89 (patch) | |
| tree | 7190b4353c533028b4a0c27d241d96e883a280ad /shell | |
| parent | 9744056c5e69227abdcdd55c4bffb674b29bd765 (diff) | |
| parent | 8f5493140c4da6e81e2c14e77833bfbb56c619f8 (diff) | |
| download | gsoc2013-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 'shell')
| -rw-r--r-- | shell/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/shell/main.c b/shell/main.c index fe12559748..0b042d4d40 100644 --- a/shell/main.c +++ b/shell/main.c @@ -482,10 +482,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")) { |