diff options
| author | Vincent Untz <vuntz@gnome.org> | 2007-05-28 11:12:44 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2007-05-28 11:12:44 +0000 |
| commit | e93745c2d583c1898dda977e42b791d23ac8ce17 (patch) | |
| tree | ac92483dad3d4a05931d7053e15450c4f6b8914a | |
| parent | af5fd1dca9753dcdb9e41e31fc7364ac714bad29 (diff) | |
| download | libwnck-e93745c2d583c1898dda977e42b791d23ac8ce17.tar.gz | |
Backport from HEAD.
2007-05-28 Vincent Untz <vuntz@gnome.org>
Backport from HEAD.
* libwnck/pager.c: (wnck_pager_drag_data_received): return instead of
dumbly continuing in this function when we know that the drag doesn't
work
Should fix bug #415675
svn path=/branches/gnome-2-18/; revision=1262
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libwnck/pager.c | 10 |
2 files changed, 17 insertions, 2 deletions
@@ -2,6 +2,15 @@ Backport from HEAD. + * libwnck/pager.c: (wnck_pager_drag_data_received): return instead of + dumbly continuing in this function when we know that the drag doesn't + work + Should fix bug #415675 + +2007-05-28 Vincent Untz <vuntz@gnome.org> + + Backport from HEAD. + * libwnck/window-action-menu.c: (window_weak_notify): destroy the menu when the window is getting finalized (set_data): kill diff --git a/libwnck/pager.c b/libwnck/pager.c index 1a63070..addf00c 100644 --- a/libwnck/pager.c +++ b/libwnck/pager.c @@ -1331,12 +1331,18 @@ wnck_pager_drag_data_received (GtkWidget *widget, if ((selection_data->length != sizeof (gulong)) || (selection_data->format != 8)) - gtk_drag_finish (context, FALSE, FALSE, time); + { + gtk_drag_finish (context, FALSE, FALSE, time); + return; + } i = workspace_at_point (pager, x, y, NULL, NULL); space = wnck_screen_get_workspace (pager->priv->screen, i); if (!space) - gtk_drag_finish (context, FALSE, FALSE, time); + { + gtk_drag_finish (context, FALSE, FALSE, time); + return; + } xid = *((gulong *)selection_data->data); |