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 /capplet/anjal-settings-main.c | |
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 'capplet/anjal-settings-main.c')
-rw-r--r-- | capplet/anjal-settings-main.c | 5 |
1 files changed, 0 insertions, 5 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 (); |