From 8ee854063da5f3daea60dbb2292a9ae8ba2e707a Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 26 Nov 2012 15:32:31 -0500
Subject: Drop calls to g_thread_init() in tests

Our dependency on Gtk 3.4 already gives us an indirect dependency on a
GLib that no longer requires these calls.

We got away with this for a while due to gstreamer's public dependency
on libgthread, but as of bug 689043 gstreamer no longer does this so we
now get link errors.

https://bugzilla.gnome.org/show_bug.cgi?id=689117
---
 tests/cheese-test-camera.c  | 1 -
 tests/cheese-test-chooser.c | 1 -
 tests/cheese-test-widget.c  | 1 -
 tests/test-libcheese-gtk.c  | 1 -
 tests/test-libcheese.c      | 1 -
 5 files changed, 5 deletions(-)

(limited to 'tests')

diff --git a/tests/cheese-test-camera.c b/tests/cheese-test-camera.c
index eb1c6a42..d5d2002e 100644
--- a/tests/cheese-test-camera.c
+++ b/tests/cheese-test-camera.c
@@ -37,7 +37,6 @@ main (int argc, char **argv)
   ClutterActor *stage;
   ClutterActor *texture;
 
-  g_thread_init (NULL);
   gdk_threads_init ();
 
   bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR);
diff --git a/tests/cheese-test-chooser.c b/tests/cheese-test-chooser.c
index 6e61758c..9e79ae85 100644
--- a/tests/cheese-test-chooser.c
+++ b/tests/cheese-test-chooser.c
@@ -30,7 +30,6 @@ main (int argc, char **argv)
 {
   GtkWidget *window;
 
-  g_thread_init (NULL);
   gdk_threads_init ();
 
   bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR);
diff --git a/tests/cheese-test-widget.c b/tests/cheese-test-widget.c
index ca396fc5..89e67535 100644
--- a/tests/cheese-test-widget.c
+++ b/tests/cheese-test-widget.c
@@ -23,7 +23,6 @@ main (int argc, char **argv)
   GtkWidget *window;
   GtkWidget *camera;
 
-  g_thread_init (NULL);
   gdk_threads_init ();
   gst_init (&argc, &argv);
 
diff --git a/tests/test-libcheese-gtk.c b/tests/test-libcheese-gtk.c
index a90d2768..ee17fa05 100644
--- a/tests/test-libcheese-gtk.c
+++ b/tests/test-libcheese-gtk.c
@@ -98,7 +98,6 @@ static void widget (void)
 
 int main (int argc, gchar *argv[])
 {
-    g_thread_init (NULL);
     gdk_threads_init ();
     gtk_test_init (&argc, &argv, NULL);
     if (!cheese_gtk_init (&argc, &argv))
diff --git a/tests/test-libcheese.c b/tests/test-libcheese.c
index c428ac03..eee214ee 100644
--- a/tests/test-libcheese.c
+++ b/tests/test-libcheese.c
@@ -206,7 +206,6 @@ videoformat_create (void)
 int
 main(int argc, gchar *argv[])
 {
-    g_thread_init (NULL);
     g_type_init ();
 
     g_test_init (&argc, &argv, NULL);
-- 
cgit v1.2.1