[sound-juicer] all: Fix GThread API changes in GLib 2.32
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sound-juicer] all: Fix GThread API changes in GLib 2.32
- Date: Sat, 16 Jun 2012 11:29:24 +0000 (UTC)
commit 7a716d0b14766596d8cdf019cf03ed2d315cd79f
Author: Bastien Nocera <hadess hadess net>
Date: Thu May 24 15:59:44 2012 +0100
all: Fix GThread API changes in GLib 2.32
https://bugzilla.gnome.org/show_bug.cgi?id=676748
configure.in | 2 +-
libjuicer/sj-metadata-getter.c | 12 +-----------
src/sj-main.c | 2 --
tests/mb-test.c | 1 -
4 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2b42787..762f2de 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
GNOME_DOC_INIT
# Find GLib and GObject
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.18 gthread-2.0 gobject-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32 gthread-2.0 gobject-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
diff --git a/libjuicer/sj-metadata-getter.c b/libjuicer/sj-metadata-getter.c
index 6037b22..ac700fc 100644
--- a/libjuicer/sj-metadata-getter.c
+++ b/libjuicer/sj-metadata-getter.c
@@ -231,18 +231,8 @@ lookup_cd (SjMetadataGetter *mdg)
gboolean
sj_metadata_getter_list_albums (SjMetadataGetter *mdg, GError **error)
{
- GThread *thread;
-
g_object_ref (mdg);
- thread = g_thread_create ((GThreadFunc)lookup_cd, mdg, TRUE, error);
- if (thread == NULL) {
- g_set_error (error,
- SJ_ERROR, SJ_ERROR_INTERNAL_ERROR,
- _("Could not create CD lookup thread"));
- g_object_unref (mdg);
- return FALSE;
- }
-
+ g_thread_new ("sj-list-albums", (GThreadFunc)lookup_cd, mdg);
return TRUE;
}
diff --git a/src/sj-main.c b/src/sj-main.c
index 8e54e58..c0b1d95 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -1649,8 +1649,6 @@ int main (int argc, char **argv)
{ NULL }
};
- if (!g_thread_supported ()) g_thread_init (NULL);
-
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/tests/mb-test.c b/tests/mb-test.c
index 1e63049..dc3031d 100644
--- a/tests/mb-test.c
+++ b/tests/mb-test.c
@@ -98,7 +98,6 @@ int main (int argc, char** argv)
BraseroMediumMonitor *monitor;
g_type_init ();
- g_thread_init (NULL);
gconf_client = gconf_client_get_default ();
if (gconf_client == NULL) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]