summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-06-20 14:12:15 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-06-20 14:12:15 +0000
commit2406a5b256da7b0f23bd35ad391266987221d3a5 (patch)
tree59b1916d8806a48fe13782b9795763a9bc46a018
parent59862b0901065f61bc61b3929d3e8ee47f1a6a39 (diff)
downloadgdk-pixbuf-2406a5b256da7b0f23bd35ad391266987221d3a5.tar.gz
Better fix.
2006-06-20 Matthias Clasen <mclasen@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_set_column_drag_info): Better fix.
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--gtk/gtktreeview.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 651c0d797..3cb6e41e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-06-20 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtktreeview.c (gtk_tree_view_set_column_drag_info): Better
+ fix.
+
* gtk/gtk.symbols:
* gtk/gtkprintsettings.h:
* gtk/gtkprintsettings.c: Remove unused print-to-file setting.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 651c0d797..3cb6e41e7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
2006-06-20 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtktreeview.c (gtk_tree_view_set_column_drag_info): Better
+ fix.
+
* gtk/gtk.symbols:
* gtk/gtkprintsettings.h:
* gtk/gtkprintsettings.c: Remove unused print-to-file setting.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4307f9c7d..dd0eddbb6 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9028,7 +9028,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView *tree_view,
/* We know there are always 2 slots possbile, as you can always return column. */
/* If that's all there is, return */
- if (g_list_length (tree_view->priv->column_drag_info) < 2 ||
+ if (tree_view->priv->column_drag_info->next == NULL ||
(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->next->data)->left_column == column))