From 970662db34ff0a718cd5e39c1fa268beb51e1f64 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 4 Jun 2010 07:05:46 -0400 Subject: More GTK3 preparation. This uses the new gtk_assistant_commit() I had added to GTK+ for our EImportAssistant progress page. --- widgets/misc/e-image-chooser.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'widgets/misc/e-image-chooser.c') diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 5defe2090d..e4474135f8 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -29,6 +29,7 @@ #include "e-image-chooser.h" #include "e-util/e-util.h" #include "e-util/e-icon-factory.h" +#include "e-util/gtk-compat.h" #define E_IMAGE_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ @@ -166,11 +167,12 @@ image_drag_motion_cb (GtkWidget *widget, EImageChooser *chooser) { GtkFrame *frame; - GList *p; + GList *targets, *p; frame = GTK_FRAME (chooser->priv->frame); + targets = gdk_drag_context_list_targets (context); - for (p = context->targets; p != NULL; p = p->next) { + for (p = targets; p != NULL; p = p->next) { gchar *possible_type; possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data)); @@ -210,16 +212,17 @@ image_drag_drop_cb (GtkWidget *widget, EImageChooser *chooser) { GtkFrame *frame; - GList *p; + GList *targets, *p; frame = GTK_FRAME (chooser->priv->frame); + targets = gdk_drag_context_list_targets (context); - if (context->targets == NULL) { + if (targets == NULL) { gtk_frame_set_shadow_type (frame, GTK_SHADOW_NONE); return FALSE; } - for (p = context->targets; p != NULL; p = p->next) { + for (p = targets; p != NULL; p = p->next) { gchar *possible_type; possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data)); -- cgit v1.2.3