diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-10-24 16:08:57 +0200 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2013-10-28 20:44:23 +0000 |
| commit | 54e04d97b5f96c0012b9bc3e2e0b25afe5243c88 (patch) | |
| tree | 2806c81fc93ac4658f88433b5451feb087c7c60c /tests | |
| parent | bf001be3ab3ce943eae8f5973ec3b80ad57e2619 (diff) | |
| download | cheese-54e04d97b5f96c0012b9bc3e2e0b25afe5243c88.tar.gz | |
Remove gdk_threads* calls
And bump the GDK and GTK+ required version to 3.6.
https://bugzilla.gnome.org/show_bug.cgi?id=710821
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cheese-test-camera.c | 4 | ||||
| -rw-r--r-- | tests/cheese-test-chooser.c | 2 | ||||
| -rw-r--r-- | tests/cheese-test-widget.c | 1 | ||||
| -rw-r--r-- | tests/test-libcheese-gtk.c | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/tests/cheese-test-camera.c b/tests/cheese-test-camera.c index 92e8dc4e..7faa73d4 100644 --- a/tests/cheese-test-camera.c +++ b/tests/cheese-test-camera.c @@ -37,8 +37,6 @@ main (int argc, char **argv) ClutterActor *stage; ClutterActor *texture; - gdk_threads_init (); - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -64,9 +62,7 @@ main (int argc, char **argv) gtk_widget_show (screen); clutter_actor_show (texture); - gdk_threads_enter (); camera = cheese_camera_new (CLUTTER_TEXTURE (texture), NULL, 640, 480); - gdk_threads_leave (); cheese_camera_setup (camera, NULL, NULL); diff --git a/tests/cheese-test-chooser.c b/tests/cheese-test-chooser.c index 9e79ae85..de86c035 100644 --- a/tests/cheese-test-chooser.c +++ b/tests/cheese-test-chooser.c @@ -30,8 +30,6 @@ main (int argc, char **argv) { GtkWidget *window; - gdk_threads_init (); - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); diff --git a/tests/cheese-test-widget.c b/tests/cheese-test-widget.c index 89e67535..eed0bd19 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; - gdk_threads_init (); gst_init (&argc, &argv); bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALEDIR); diff --git a/tests/test-libcheese-gtk.c b/tests/test-libcheese-gtk.c index bad7bf13..5f7c580d 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[]) { - gdk_threads_init (); gtk_test_init (&argc, &argv, NULL); if (!cheese_gtk_init (&argc, &argv)) return EXIT_FAILURE; |