Updating branch refs/heads/master to bb6b1ef03c05dfd7f8209e923c2e8ec5365ccaac (commit) from 0af8fc6e38a9641212035e9a08b1f0e5b2aa5746 (commit)
commit bb6b1ef03c05dfd7f8209e923c2e8ec5365ccaac Author: Nick Schermer <n...@xfce.org> Date: Mon Nov 8 21:53:56 2010 +0100 Fix crash in always group mode (bug #6792). plugins/tasklist/tasklist-widget.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c index cdf696d..72283ba 100644 --- a/plugins/tasklist/tasklist-widget.c +++ b/plugins/tasklist/tasklist-widget.c @@ -1586,6 +1586,7 @@ xfce_tasklist_update_icon_geometries (gpointer data) toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tasklist)); gtk_window_get_position (GTK_WINDOW (toplevel), &root_x, &root_y); + panel_return_val_if_fail (XFCE_IS_TASKLIST (tasklist), FALSE); for (li = tasklist->windows; li != NULL; li = li->next) { @@ -1603,7 +1604,7 @@ xfce_tasklist_update_icon_geometries (gpointer data) case CHILD_TYPE_GROUP: alloc = &child->button->allocation; - for (lp = child->windows; li != NULL; li = li->next) + for (lp = child->windows; lp != NULL; lp = lp->next) { child2 = lp->data; panel_return_val_if_fail (WNCK_IS_WINDOW (child2->window), FALSE); @@ -2382,7 +2383,6 @@ xfce_tasklist_button_activate (XfceTasklistChild *child, WnckWorkspace *workspace; panel_return_if_fail (XFCE_IS_TASKLIST (child->tasklist)); - panel_return_if_fail (child->type == CHILD_TYPE_WINDOW); panel_return_if_fail (WNCK_IS_WINDOW (child->window)); if (wnck_window_is_active (child->window)) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits