diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-24 17:30:20 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-24 17:30:20 +0800 |
| commit | bd149b27954af20cf3f860164486191b0e879e89 (patch) | |
| tree | 323c26ba15a7e15242c2749b391b5ffa59762fed /capplet | |
| parent | 3b32549c69267295a9a7b482e4a6ca2db9e6c73f (diff) | |
| parent | 8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff) | |
| download | gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.gz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.bz2 gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.lz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.xz gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.tar.zst gsoc2013-evolution-bd149b27954af20cf3f860164486191b0e879e89.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'capplet')
| -rw-r--r-- | capplet/anjal-settings-main.c | 2 | ||||
| -rw-r--r-- | capplet/settings/mail-guess-servers.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c index 99e0b4a282..91e36904c7 100644 --- a/capplet/anjal-settings-main.c +++ b/capplet/anjal-settings-main.c @@ -167,8 +167,10 @@ 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 0b144940e9..0b15271a88 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -343,7 +343,9 @@ 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); |