From 46af99b44e1d2f4fc3315753bcc46f78476de823 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 28 Oct 2012 12:02:37 +0200 Subject: [general] Use GSourceFunc instead of GtkFunction http://git.gnome.org/browse/nautilus/commit/?id=a5caa0e98c844a23656cafaa9b6f985dada7bc51 --- libcaja-private/caja-dnd.c | 2 +- libcaja-private/caja-dnd.h | 2 +- libcaja-private/caja-icon-container.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c index 5943f041..792b3e79 100644 --- a/libcaja-private/caja-dnd.c +++ b/libcaja-private/caja-dnd.c @@ -1040,7 +1040,7 @@ caja_drag_autoscroll_calculate_delta (GtkWidget *widget, float *x_scroll_delta, void caja_drag_autoscroll_start (CajaDragInfo *drag_info, GtkWidget *widget, - GtkFunction callback, + GSourceFunc callback, gpointer user_data) { if (caja_drag_autoscroll_in_scroll_region (widget)) diff --git a/libcaja-private/caja-dnd.h b/libcaja-private/caja-dnd.h index b9a74382..85330a02 100644 --- a/libcaja-private/caja-dnd.h +++ b/libcaja-private/caja-dnd.h @@ -188,7 +188,7 @@ void caja_drag_autoscroll_calculate_delta (GtkWidget *widget, float *y_scroll_delta); void caja_drag_autoscroll_start (CajaDragInfo *drag_info, GtkWidget *widget, - GtkFunction callback, + GSourceFunc callback, gpointer user_data); void caja_drag_autoscroll_stop (CajaDragInfo *drag_info); diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 5b65e2a2..fcb3ab46 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -4964,7 +4964,7 @@ continue_stretching (CajaIconContainer *container, if (container->details->stretch_idle_id == 0) { - container->details->stretch_idle_id = g_idle_add ((GtkFunction) update_stretch_at_idle, container); + container->details->stretch_idle_id = g_idle_add ((GSourceFunc) update_stretch_at_idle, container); } } -- cgit v1.2.1