summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Peters <fpeters@src.gnome.org>2008-12-25 13:06:00 +0000
committerFrederic Peters <fpeters@src.gnome.org>2008-12-25 13:06:00 +0000
commitb66fbc036920cb962d95048d0c864d34600fb8b0 (patch)
treef722b63410cd8834cd2f756c4cac3563399afbdf
parent151ddc08ecfb58a56a7f035fdb9374763128a65c (diff)
downloadmetacity-b66fbc036920cb962d95048d0c864d34600fb8b0.tar.gz
metacity-b66fbc036920cb962d95048d0c864d34600fb8b0.tar.bz2
added call to g_thread_init(), as ORBit2 stopped doing it and Metacity is
* src/core/main.c: (main): added call to g_thread_init(), as ORBit2 stopped doing it and Metacity is using gconf; closes #565517. svn path=/trunk/; revision=4063
-rw-r--r--ChangeLog5
-rw-r--r--src/core/main.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cc8fb37..3411025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-25 Frederic Peters <fpeters@0d.be>
+
+ * src/core/main.c: (main): added call to g_thread_init(), as ORBit2
+ stopped doing it and Metacity is using gconf; closes #565517.
+
2008-12-24 Yanko Kaneti <yaneti@declera.com>
* src/metacity.schemas.in.in: add screenshot commands which had
diff --git a/src/core/main.c b/src/core/main.c
index 29a7d0c..19c2dd3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -375,6 +375,9 @@ main (int argc, char **argv)
"Pango", "GLib-GObject", "GThread"
};
guint i;
+
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
if (setlocale (LC_ALL, "") == NULL)
meta_warning ("Locale not understood by C library, internationalization will not work\n");