callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(gtk_tree_view_set_column_drag_info): Don't crash if the

Browse Source 
column_drop_func says always no.  (#344850, Christian Weiske)
This commit is contained in:
Matthias Clasen
2006-06-20 03:28:36 +00:00
parent a5aaf6b8a5
commit 103bba09e4
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* gtk/gtktreeview.c (gtk_tree_view_set_grid_lines): Don't leak * gtk/gtktreeview.c (gtk_tree_view_set_grid_lines): Don't leak
dash_list. dash_list.
(gtk_tree_view_set_column_drag_info): Don't crash if the
column_drop_func says always no. (#344850, Christian Weiske)
Make transparent tray icons work. (#320034, based on a Make transparent tray icons work. (#320034, based on a
patch by Dan Winship) patch by Dan Winship)

2
ChangeLog.pre-2-10
View File

@ -2,6 +2,8 @@
* gtk/gtktreeview.c (gtk_tree_view_set_grid_lines): Don't leak * gtk/gtktreeview.c (gtk_tree_view_set_grid_lines): Don't leak
dash_list. dash_list.
(gtk_tree_view_set_column_drag_info): Don't crash if the
column_drop_func says always no. (#344850, Christian Weiske)
Make transparent tray icons work. (#320034, based on a Make transparent tray icons work. (#320034, based on a
patch by Dan Winship) patch by Dan Winship)

5
gtk/gtktreeview.c
View File

@ -9028,9 +9028,10 @@ gtk_tree_view_set_column_drag_info (GtkTreeView *tree_view,
/* We know there are always 2 slots possbile, as you can always return column. */ /* We know there are always 2 slots possbile, as you can always return column. */
/* If that's all there is, return */ /* If that's all there is, return */
if (tree_view->priv->column_drag_info->next->next == NULL && if (g_list_length (tree_view->priv->column_drag_info) < 2 ||
(tree_view->priv->column_drag_info->next->next == NULL &&
((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column && ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column &&
((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column) ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column))
{ {
for (tmp_list = tree_view->priv->column_drag_info; tmp_list; tmp_list = tmp_list->next) for (tmp_list = tree_view->priv->column_drag_info; tmp_list; tmp_list = tmp_list->next)
g_free (tmp_list->data); g_free (tmp_list->data);