[cheese] Remove gdk_threads* calls

[David King <davidk src gnome org>]

commit 54e04d97b5f96c0012b9bc3e2e0b25afe5243c88
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Oct 24 16:08:57 2013 +0200

    Remove gdk_threads* calls
    
    And bump the GDK and GTK+ required version to 3.6.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=710821

 configure.ac                      |    4 ++--
 libcheese/cheese-avatar-chooser.c |    4 ----
 libcheese/cheese-widget.c         |    6 ------
 tests/cheese-test-camera.c        |    4 ----
 tests/cheese-test-chooser.c       |    2 --
 tests/cheese-test-widget.c        |    1 -
 tests/test-libcheese-gtk.c        |    1 -
 7 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 377989a..fff5ad4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ IT_PROG_INTLTOOL([0.50.0])
 GLIB_REQUIRED="glib-2.0 >= 2.32.0"
 GOBJECT_REQUIRED="gobject-2.0 >= 2.28.0"
 GIO_REQUIRED="gio-2.0 >= 2.32.0"
-GTK_REQUIRED="gtk+-3.0 >= 3.4.4"
-GDK_REQUIRED="gdk-3.0 >= 3.3.6"
+GTK_REQUIRED="gtk+-3.0 >= 3.6.0"
+GDK_REQUIRED="gdk-3.0 >= 3.6.0"
 GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
 LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
 GSTREAMER_VERSION=0.11.0
diff --git a/libcheese/cheese-avatar-chooser.c b/libcheese/cheese-avatar-chooser.c
index 41cc4a8..d223c52 100644
--- a/libcheese/cheese-avatar-chooser.c
+++ b/libcheese/cheese-avatar-chooser.c
@@ -92,8 +92,6 @@ cheese_widget_photo_taken_cb (CheeseCamera        *camera,
   CheeseAvatarChooserPrivate *priv = chooser->priv;
   GtkAllocation               allocation;
 
-  gdk_threads_enter ();
-
   gtk_widget_get_allocation (priv->camera, &allocation);
   gtk_widget_set_size_request (priv->image, allocation.width, allocation.height);
 
@@ -104,8 +102,6 @@ cheese_widget_photo_taken_cb (CheeseCamera        *camera,
                                      TRUE);
   gtk_widget_set_sensitive (priv->take_button, TRUE);
 
-  gdk_threads_leave ();
-
   g_object_notify_by_pspec (G_OBJECT (chooser), properties[PROP_PIXBUF]);
 }
 
diff --git a/libcheese/cheese-widget.c b/libcheese/cheese-widget.c
index fb7b96e..e45e293 100644
--- a/libcheese/cheese-widget.c
+++ b/libcheese/cheese-widget.c
@@ -320,19 +320,15 @@ setup_camera (CheeseWidget *widget)
   g_settings_get (priv->settings, "saturation",   "d", &saturation);
   g_settings_get (priv->settings, "hue",          "d", &hue);
 
-  gdk_threads_enter ();
   priv->webcam = cheese_camera_new (CLUTTER_TEXTURE (priv->texture),
                                     webcam_device,
                                     x_resolution,
                                     y_resolution);
-  gdk_threads_leave ();
 
   g_free (webcam_device);
 
   cheese_camera_setup (priv->webcam, NULL, &priv->error);
 
-  gdk_threads_enter ();
-
   gtk_spinner_stop (GTK_SPINNER (priv->spinner));
 
   if (priv->error != NULL)
@@ -352,8 +348,6 @@ setup_camera (CheeseWidget *widget)
     cheese_camera_play (priv->webcam);
     gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), WEBCAM_PAGE);
   }
-
-  gdk_threads_leave ();
 }
 
 static void
diff --git a/tests/cheese-test-camera.c b/tests/cheese-test-camera.c
index 92e8dc4..7faa73d 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 9e79ae8..de86c03 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 89e6753..eed0bd1 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 bad7bf1..5f7c580 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;