diff options
| author | Robin Stocker <robin@nibor.org> | 2009-12-08 00:44:45 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2009-12-15 16:22:56 +0000 |
| commit | 14e7f8e172446cf90d1d7f5f228ba20d16f073de (patch) | |
| tree | 79601a0a6e914886edfa287d90699addf0191467 /src | |
| parent | c8baa5bdf6737a7e82025e99a83376f6ea174365 (diff) | |
| download | totem-14e7f8e172446cf90d1d7f5f228ba20d16f073de.tar.gz | |
Use gtk_drag_get_source_widget instead of storing window
Diffstat (limited to 'src')
| -rw-r--r-- | src/totem-object.c | 7 | ||||
| -rw-r--r-- | src/totem-private.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/totem-object.c b/src/totem-object.c index 2e4bd62a3..20fc37fa6 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -2284,10 +2284,13 @@ drop_video_cb (GtkWidget *widget, guint _time, Totem *totem) { + GtkWidget *source_widget; gboolean empty_pl; + source_widget = gtk_drag_get_source_widget (context); + /* Drop of video on itself */ - if (context->source_window == totem->video_drag_source_window && + if (source_widget && widget == source_widget && context->action == GDK_ACTION_MOVE) { gtk_drag_finish (context, FALSE, FALSE, _time); return; @@ -2401,8 +2404,6 @@ drag_video_cb (GtkWidget *widget, gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *) text, len); - totem->video_drag_source_window = context->source_window; - g_free (text); } diff --git a/src/totem-private.h b/src/totem-private.h index 43abc266c..9b849a83a 100644 --- a/src/totem-private.h +++ b/src/totem-private.h @@ -163,10 +163,6 @@ struct TotemObject { TotemOpenLocation *open_location; gboolean remember_position; gboolean disable_kbd_shortcuts; - - /* Stored source_window of GdkDragContext from a video drag, - * used to detect when the video is dropped on itself. */ - GdkWindow *video_drag_source_window; }; GtkWidget *totem_volume_create (void); |