GNOME.org
 

[gupnp-tools] Drop deprecated g_thread_init call

commit 3e520334531546126e2fdbd03ca7580eb5e31dc4
Author: Jens Georg <mail jensge org>
Date:   Mon Oct 8 16:08:40 2012 +0200

    Drop deprecated g_thread_init call

 configure.ac                  |    6 ++++--
 src/av-cp/Makefile.am         |    2 --
 src/av-cp/main.c              |    3 ---
 src/discover/Makefile.am      |    1 -
 src/network-light/Makefile.am |    2 --
 src/network-light/main.c      |    3 ---
 src/universal-cp/Makefile.am  |    3 +--
 src/universal-cp/main.c       |    3 ---
 src/upload/Makefile.am        |    2 --
 src/upload/main.c             |    3 +--
 10 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d96ce4c..018ab9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,13 +23,13 @@ AC_FUNC_MMAP
 LT_PREREQ([2.2])
 LT_INIT([])
 
+GLIB_REQUIRED=2.24
 GSSDP_REQUIRED=0.10
 GUPNP_REQUIRED=0.13
 SOUP_REQUIRED=2.4
 GUPNP_AV_REQUIRED=0.5.5
 GTK_REQUIRED=3.0.0
 GTHREAD_REQUIRED=2.12
-GIO_REQUIRED=2.12
 ICON_THEME_REQUIRED=2.20
 GTKSOURCEVIEW_REQUIRED=3.0.0
 LIBXML_REQUIRED=2.24
@@ -53,7 +53,9 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= LIBXML_REQUIRED)
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED)
 PKG_CHECK_MODULES(GNOME_ICON_THEME, gnome-icon-theme >= $ICON_THEME_REQUIRED)
-PKG_CHECK_MODULES(GIO, gobject-2.0 >= $GIO_REQUIRED gio-2.0 >= $GIO_REQUIRED)
+PKG_CHECK_MODULES(GIO, glib-2.0 >= $GLIB_REQUIRED
+                       gobject-2.0 >= $GLIB_REQUIRED
+                       gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-3.0 >= GTKSOURCEVIEW_REQUIRED,
                   AC_DEFINE([HAVE_GTK_SOURCEVIEW], [1], [Use GtkSourceView])
                   AC_SUBST([TEXT_VIEW],[GtkSourceView]),
diff --git a/src/av-cp/Makefile.am b/src/av-cp/Makefile.am
index 483d007..3ebfbd5 100644
--- a/src/av-cp/Makefile.am
+++ b/src/av-cp/Makefile.am
@@ -7,7 +7,6 @@ endif
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBGUPNP_AV_CFLAGS) \
 	    $(GTK_CFLAGS) \
-	    $(GTHREAD_CFLAGS) \
 	    $(GTKSOURCEVIEW_CFLAGS) \
 	    -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"' \
 	    -I$(top_srcdir)/src/common
@@ -32,7 +31,6 @@ gupnp_av_cp_LDADD = ../common/libutil.a \
 		    $(LIBGUPNP_LIBS) \
 		    $(LIBGUPNP_AV_LIBS) \
 		    $(GTK_LIBS) \
-		    $(GTHREAD_LIBS) \
 		    $(GTKSOURCEVIEW_LIBS)
 gupnp_av_cp_LDFLAGS = -export-dynamic
 
diff --git a/src/av-cp/main.c b/src/av-cp/main.c
index cc2f886..67c458c 100644
--- a/src/av-cp/main.c
+++ b/src/av-cp/main.c
@@ -139,9 +139,6 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
-        /* First thing initialze the thread system */
-        g_thread_init (NULL);
-
         if (!init_ui (&argc, &argv)) {
            return -2;
         }
diff --git a/src/discover/Makefile.am b/src/discover/Makefile.am
index 9c500a6..48da3b5 100644
--- a/src/discover/Makefile.am
+++ b/src/discover/Makefile.am
@@ -1,5 +1,4 @@
 AM_CFLAGS = $(LIBGSSDP_CFLAGS)    \
-	    $(GTHREAD_CFLAGS)     \
 	    $(GIO_CFLAGS)         \
 	    -I$(top_srcdir)
 
diff --git a/src/network-light/Makefile.am b/src/network-light/Makefile.am
index afc64f4..8acf4a6 100644
--- a/src/network-light/Makefile.am
+++ b/src/network-light/Makefile.am
@@ -6,7 +6,6 @@ endif
 
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(GTK_CFLAGS) \
-	    $(GTHREAD_CFLAGS) \
 	    $(UUID_CFLAGS) \
 	    -I$(top_srcdir) \
 	    -DDATA_DIR='"$(shareddir)"' \
@@ -26,7 +25,6 @@ gupnp_network_light_LDADD = ../common/libutil.a \
 			    $(LIBGSSDP_LIBS) \
 			    $(LIBGUPNP_LIBS) \
 			    $(GTK_LIBS) \
-			    $(GTHREAD_LIBS) \
 			    $(UUID_LIBS)
 
 gupnp_network_light_LDFLAGS = -export-dynamic
diff --git a/src/network-light/main.c b/src/network-light/main.c
index 185ed26..b99cf54 100644
--- a/src/network-light/main.c
+++ b/src/network-light/main.c
@@ -72,9 +72,6 @@ main (int argc, char **argv)
         light_status = FALSE;
         light_load_level = 100;
 
-        /* First thing initialze the thread system */
-        g_thread_init (NULL);
-
         if (!init_ui (&argc, &argv)) {
                 return -1;
         }
diff --git a/src/universal-cp/Makefile.am b/src/universal-cp/Makefile.am
index 7397e7b..e81d3d8 100644
--- a/src/universal-cp/Makefile.am
+++ b/src/universal-cp/Makefile.am
@@ -4,7 +4,7 @@ else
 shareddir = $(datadir)/gupnp-tools
 endif
 
-AM_CFLAGS = $(GTK_CFLAGS) $(LIBGUPNP_CFLAGS) $(GTHREAD_CFLAGS) \
+AM_CFLAGS = $(GTK_CFLAGS) $(LIBGUPNP_CFLAGS) \
 	    -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"' \
 	    -I$(top_srcdir)/src/common
 
@@ -27,7 +27,6 @@ gupnp_universal_cp_LDADD = ../common/libutil.a \
 			   $(LIBGSSDP_LIBS) \
 			   $(LIBSOUP_LIBS) \
 			   $(LIBXML_LIBS) \
-			   $(GTHREAD_LIBS) \
 			   $(LIBGUPNP_LIBS)
 
 gupnp_universal_cp_LDFLAGS = -export-dynamic
diff --git a/src/universal-cp/main.c b/src/universal-cp/main.c
index 289846b..20edb63 100644
--- a/src/universal-cp/main.c
+++ b/src/universal-cp/main.c
@@ -105,9 +105,6 @@ gint
 main (gint   argc,
       gchar *argv[])
 {
-        /* First thing initialize the thread system */
-        g_thread_init (NULL);
-
         if (!init_ui (&argc, &argv)) {
            return -2;
         }
diff --git a/src/upload/Makefile.am b/src/upload/Makefile.am
index b45478e..56861fc 100644
--- a/src/upload/Makefile.am
+++ b/src/upload/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = $(LIBGUPNP_CFLAGS)    \
 	    $(LIBGUPNP_AV_CFLAGS) \
-	    $(GTHREAD_CFLAGS)     \
 	    $(GIO_CFLAGS)         \
 	    -I$(top_srcdir)       \
 	    -I$(top_srcdir)/src/common
@@ -21,7 +20,6 @@ gupnp_upload_SOURCES = main.c \
 gupnp_upload_LDADD = $(LIBGUPNP_LIBS)    \
 		     $(LIBGSSDP_LIBS)    \
 		     $(LIBGUPNP_AV_LIBS) \
-	    	     $(GTHREAD_LIBS)     \
 	    	     $(GIO_LIBS)
 
 gupnp_upload_LDFLAGS = -export-dynamic
diff --git a/src/upload/main.c b/src/upload/main.c
index 792c864..6381c79 100644
--- a/src/upload/main.c
+++ b/src/upload/main.c
@@ -136,8 +136,7 @@ main (gint   argc,
         error = NULL;
         GOptionContext *context;
 
-        /* First thing initialize the thread system */
-        g_thread_init (NULL);
+        g_type_init ();
 
         context = g_option_context_new ("- Upload file to UPnP MediaServer");
         g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]