[gthumb] removed the us of GDK_THREADS_ENTER/LEAVE macros

[Paolo Bacchilega <paobac src gnome org>]

commit dc7852a156014b3c147896aa55dcf67f01a17731
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Nov 4 16:39:21 2012 +0100

    removed the us of GDK_THREADS_ENTER/LEAVE macros

 extensions/file_manager/callbacks.c |    6 +-----
 gthumb/gth-grid-view.c              |    6 +-----
 gthumb/gth-image-selector.c         |   10 +++-------
 3 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/extensions/file_manager/callbacks.c b/extensions/file_manager/callbacks.c
index 5502d0c..41eff44 100644
--- a/extensions/file_manager/callbacks.c
+++ b/extensions/file_manager/callbacks.c
@@ -486,8 +486,6 @@ drag_motion_autoscroll_cb (gpointer user_data)
 	double         max_value;
 	double         value;
 
-	GDK_THREADS_ENTER ();
-
 	data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY);
 
 	adj = gth_file_list_get_vadjustment (GTH_FILE_LIST (gth_browser_get_file_list (browser)));
@@ -497,8 +495,6 @@ drag_motion_autoscroll_cb (gpointer user_data)
 		value = max_value;
 	gtk_adjustment_set_value (adj, value);
 
-	GDK_THREADS_LEAVE();
-
 	return TRUE;
 }
 
@@ -549,7 +545,7 @@ gth_file_list_drag_motion (GtkWidget      *file_view,
 
 		if (data->scroll_diff != 0) {
 			if (data->scroll_event == 0)
-				data->scroll_event = g_timeout_add (SCROLL_TIMEOUT, drag_motion_autoscroll_cb, browser);
+				data->scroll_event = gdk_threads_add_timeout (SCROLL_TIMEOUT, drag_motion_autoscroll_cb, browser);
 		}
 		else if (data->scroll_event != 0) {
 			g_source_remove (data->scroll_event);
diff --git a/gthumb/gth-grid-view.c b/gthumb/gth-grid-view.c
index e63627f..7e10ff6 100644
--- a/gthumb/gth-grid-view.c
+++ b/gthumb/gth-grid-view.c
@@ -3031,8 +3031,6 @@ autoscroll_cb (gpointer user_data)
 	double       max_value;
 	double       value;
 
-	GDK_THREADS_ENTER ();
-
 	max_value = gtk_adjustment_get_upper (self->priv->vadjustment) - gtk_adjustment_get_page_size (self->priv->vadjustment);
 	value = gtk_adjustment_get_value (self->priv->vadjustment) + self->priv->autoscroll_y_delta;
 	if (value > max_value)
@@ -3042,8 +3040,6 @@ autoscroll_cb (gpointer user_data)
 	self->priv->event_last_y = self->priv->event_last_y + self->priv->autoscroll_y_delta;
 	_gth_grid_view_update_mouse_selection (self, self->priv->event_last_x, self->priv->event_last_y);
 
-	GDK_THREADS_LEAVE ();
-
 	return TRUE;
 }
 
@@ -3124,7 +3120,7 @@ gth_grid_view_motion_notify (GtkWidget      *widget,
 			self->priv->autoscroll_y_delta /= 2;
 
 			if (self->priv->scroll_timeout == 0)
-				self->priv->scroll_timeout = g_timeout_add (SCROLL_DELAY, autoscroll_cb, self);
+				self->priv->scroll_timeout = gdk_threads_add_timeout (SCROLL_DELAY, autoscroll_cb, self);
 		}
 		else if (self->priv->scroll_timeout != 0) {
 			g_source_remove (self->priv->scroll_timeout);
diff --git a/gthumb/gth-image-selector.c b/gthumb/gth-image-selector.c
index 3c4d7f0..b012f00 100644
--- a/gthumb/gth-image-selector.c
+++ b/gthumb/gth-image-selector.c
@@ -1409,8 +1409,6 @@ autoscroll_cb (gpointer data)
 	double            value;
 	double            max_value;
 
-	GDK_THREADS_ENTER ();
-
 	/* drag x */
 
 	value = gtk_adjustment_get_value (self->priv->viewer->hadj) + self->priv->x_value_diff;
@@ -1432,8 +1430,6 @@ autoscroll_cb (gpointer data)
 	update_mouse_selection (self);
 	gtk_widget_queue_draw (GTK_WIDGET (self->priv->viewer));
 
-	GDK_THREADS_LEAVE();
-
 	return TRUE;
 }
 
@@ -1526,9 +1522,9 @@ gth_image_selector_motion_notify (GthImageViewerTool *base,
 		self->priv->y_value_diff /= 2;
 
 		if (self->priv->timer_id == 0)
-			self->priv->timer_id = g_timeout_add (SCROLL_TIMEOUT,
-							      autoscroll_cb,
-							      self);
+			self->priv->timer_id = gdk_threads_add_timeout (SCROLL_TIMEOUT,
+									autoscroll_cb,
+									self);
 	}
 	else if (self->priv->timer_id != 0) {
 		g_source_remove (self->priv->timer_id);