From 92ffa09c929bd8b0882de61d8b41972fd81e8cb9 Mon Sep 17 00:00:00 2001 From: Javier Date: Sun, 25 Jan 2015 20:08:57 +0100 Subject: workaround xembed dnd proxy messing up same_widget detection --- libmdock/mdock-widget.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libmdock/mdock-widget.c b/libmdock/mdock-widget.c index d1b831d..3ba14fa 100644 --- a/libmdock/mdock-widget.c +++ b/libmdock/mdock-widget.c @@ -74,7 +74,7 @@ enum { }; static const GtkTargetEntry drag_types[] = { - "application/x-mdock-item", GTK_TARGET_SAME_WIDGET, DRAG_TYPE_ITEM, + "application/x-mdock-item", 0, DRAG_TYPE_ITEM, "text/uri-list", 0, DRAG_TYPE_URILIST }; @@ -260,19 +260,19 @@ static gboolean handle_item_button_release(MDockWidget *self, GdkEventButton *ev return TRUE; } -static void handle_item_drag_begin(MDockWidget *self, GdkDragContext *dc, MDockItem *item) +static void handle_item_drag_begin(MDockWidget *self, GdkDragContext *context, MDockItem *item) { - gtk_drag_set_icon_pixbuf(dc, mdock_item_get_icon_pixbuf(item), 0, 0); + gtk_drag_set_icon_pixbuf(context, mdock_item_get_icon_pixbuf(item), 0, 0); self->priv->primary_button_down = FALSE; self->priv->current_pointed_item = NULL; } -static void handle_item_drag_end(MDockWidget *self, GdkDragContext *dc, MDockItem *item) +static void handle_item_drag_end(MDockWidget *self, GdkDragContext *context, MDockItem *item) { // Nothing to do. } -static void handle_item_drag_data_get(MDockWidget *self, GdkDragContext *dc, +static void handle_item_drag_data_get(MDockWidget *self, GdkDragContext *context, GtkSelectionData *selection_data, guint target_type, guint timestamp, MDockItem *item) { GSequenceIter *iter = g_object_get_qdata(G_OBJECT(item), mdock_widget_item_iter_quark()); @@ -293,7 +293,7 @@ static void handle_item_drag_data_get(MDockWidget *self, GdkDragContext *dc, } } -static void handle_item_drag_data_delete(MDockWidget *self, GdkDragContext *dc, MDockItem *item) +static void handle_item_drag_data_delete(MDockWidget *self, GdkDragContext *context, MDockItem *item) { // Ignored, as this only happens when moving an applet item. } -- cgit v1.2.3