From e07a05c550c1382031b7e57cf39765bb12165b85 Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Sat, 12 Feb 2000 20:36:48 +0000 Subject: Check the ethi is actually the one being dragged. Prevents crashes when 2000-02-12 Iain Holmes * e-table-header-item.c (ethi_drag_motion): Check the ethi is actually the one being dragged. Prevents crashes when trying to drag headeritems and there are multiple headeritems on the same canvas. (ethi_drag_end): Same. (ethi_drag_drop): Same. (ethi_drag_leave): Same. svn path=/trunk/; revision=1745 --- widgets/table/e-table-header-item.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'widgets/table/e-table-header-item.c') diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 039015b3ec..b025664385 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -315,6 +315,10 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context, gint x, gint y, guint time, ETableHeaderItem *ethi) { + /* Check if it's the correct ethi */ + if (ethi->drag_col == -1) + return; + gdk_drag_status (context, 0, time); if (GTK_WIDGET(canvas) == gtk_drag_get_source_widget(context)) { if ((x >= ethi->x1) && (x <= (ethi->x1 + ethi->width)) && @@ -343,6 +347,9 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context, static void ethi_drag_end (GtkWidget *canvas, GdkDragContext *context, ETableHeaderItem *ethi) { + if (ethi->drag_col == -1) + return; + if (canvas == gtk_drag_get_source_widget(context)) { if (context->action == 0) { ethi_request_redraw (ethi); @@ -363,6 +370,10 @@ ethi_drag_drop (GtkWidget *canvas, ETableHeaderItem *ethi) { gboolean successful = FALSE; + + if (ethi->drag_col == -1) + return; + if (GTK_WIDGET(canvas) == gtk_drag_get_source_widget(context)) { if ((x >= ethi->x1) && (x <= (ethi->x1 + ethi->width)) && (y >= ethi->y1) && (y <= (ethi->y1 + ethi->height))){ @@ -387,6 +398,9 @@ ethi_drag_drop (GtkWidget *canvas, static void ethi_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, ETableHeaderItem *ethi) { + if (ethi->drag_col == -1) + return; + if (widget == gtk_drag_get_source_widget(context)) { ethi_remove_drop_marker (ethi); ethi_add_destroy_marker (ethi); -- cgit