diff options
| author | Vincent Untz <vuntz@gnome.org> | 2007-04-29 15:38:27 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2007-04-29 15:38:27 +0000 |
| commit | e786509ed27a7704b6774b148fd3e942400b2899 (patch) | |
| tree | 56eec337445a7c66d58293eb6016114f65199806 | |
| parent | d14df88111428ce462697c166870a414d42d33fe (diff) | |
| download | libwnck-e786509ed27a7704b6774b148fd3e942400b2899.tar.gz | |
fix typo which broke the height of the icon (was the same as the width)
2007-04-29 Vincent Untz <vuntz@gnome.org>
* libwnck/pager.c: (wnck_update_drag_icon): fix typo which broke the
height of the icon (was the same as the width)
(wnck_drag_window_destroyed): don't reset to the default icon. This is
not what we should do. We should make the drag be impossible instead.
Side-effect is fix for bug #414967.
svn path=/trunk/; revision=1214
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libwnck/pager.c | 9 |
2 files changed, 10 insertions, 7 deletions
@@ -1,5 +1,13 @@ 2007-04-29 Vincent Untz <vuntz@gnome.org> + * libwnck/pager.c: (wnck_update_drag_icon): fix typo which broke the + height of the icon (was the same as the width) + (wnck_drag_window_destroyed): don't reset to the default icon. This is + not what we should do. We should make the drag be impossible instead. + Side-effect is fix for bug #414967. + +2007-04-29 Vincent Untz <vuntz@gnome.org> + * 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 diff --git a/libwnck/pager.c b/libwnck/pager.c index addf00c..ec57891 100644 --- a/libwnck/pager.c +++ b/libwnck/pager.c @@ -1372,7 +1372,7 @@ wnck_pager_drag_data_get (GtkWidget *widget, WnckPager *pager = WNCK_PAGER (widget); gulong xid; - if (pager->priv->drag_window == NULL) + if (pager->priv->drag_window == NULL) return; xid = wnck_window_get_xid (pager->priv->drag_window); @@ -1451,7 +1451,7 @@ wnck_update_drag_icon (WnckWindow *window, /* we need at least three pixels to draw the smallest window */ rect.width = MAX (rect.width, 3); - rect.height = MAX (rect.width, 3); + rect.height = MAX (rect.height, 3); pixmap = gdk_pixmap_new (GTK_WIDGET (widget)->window, rect.width, rect.height, -1); @@ -1472,11 +1472,6 @@ wnck_drag_window_destroyed (gpointer contextp, { wnck_drag_clean_up ((WnckWindow *) window, GDK_DRAG_CONTEXT (contextp), FALSE, TRUE); - /* FIXME: I'd like to have a "window is destroyed" indication, but no idea - * how best to do it. - * I didn't like setting GTK_STOCK_MISSING_IMAGE for example, because - * that indicates a missing image, not a missing window */ - gtk_drag_set_icon_default (contextp); } /* CAREFUL: This function is a bit brittle, because the pointers given may be |