changeset 2644:67082557b2c4 trunk

[svn] - glib-2.13.0 requires g_thread_init() to be called before all other GLib functions.
author yaz
date Sat, 24 Mar 2007 23:25:20 -0700
parents 74c0e73e0c33
children ee5854651a96
files ChangeLog src/audacious/build_stamp.c src/audacious/main.c
diffstat 3 files changed, 22 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 23 10:51:02 2007 -0700
+++ b/ChangeLog	Sat Mar 24 23:25:20 2007 -0700
@@ -1,3 +1,12 @@
+2007-03-23 17:51:02 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [4308]
+  - rename libgnuintl.h.in to libgnuintl.h
+  
+  trunk/src/intl/libgnuintl.h    |  309 +++++++++++++++++++++++++++++++++++++++++
+  trunk/src/intl/libgnuintl.h.in |  309 -----------------------------------------
+  2 files changed, 309 insertions(+), 309 deletions(-)
+
+
 2007-03-23 17:16:00 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [4306]
   - included gettext didn't compile. closes #866
--- a/src/audacious/build_stamp.c	Fri Mar 23 10:51:02 2007 -0700
+++ b/src/audacious/build_stamp.c	Sat Mar 24 23:25:20 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070323-4306";
+const gchar *svn_stamp = "20070323-4308";
--- a/src/audacious/main.c	Fri Mar 23 10:51:02 2007 -0700
+++ b/src/audacious/main.c	Sat Mar 24 23:25:20 2007 -0700
@@ -1035,6 +1035,18 @@
     GOptionContext *context;
     GError *error = NULL;
 
+    /* glib-2.13.0 requires g_thread_init() to be called before all
+       other GLib functions */
+    g_thread_init(NULL);
+    if (!g_thread_supported()) {
+        g_printerr(_("Sorry, threads isn't supported on your platform.\n\n"
+                     "If you're on a libc5 based linux system and installed Glib & GTK+ before you\n"
+                     "installed LinuxThreads you need to recompile Glib & GTK+.\n"));
+        exit(EXIT_FAILURE);
+    }
+
+    gdk_threads_init();
+
     /* Setup l10n early so we can print localized error messages */
     gtk_set_locale();
     bindtextdomain(PACKAGE_NAME, LOCALEDIR);
@@ -1058,16 +1070,6 @@
 
     g_set_application_name(_(application_name));
 
-    g_thread_init(NULL);
-    if (!g_thread_supported()) {
-        g_printerr(_("Sorry, threads isn't supported on your platform.\n\n"
-                     "If you're on a libc5 based linux system and installed Glib & GTK+ before you\n"
-                     "installed LinuxThreads you need to recompile Glib & GTK+.\n"));
-        exit(EXIT_FAILURE);
-    }
-
-    gdk_threads_init();
-
     cond_scan = g_cond_new();
     mutex_scan = g_mutex_new();