r16600 - in /desktop/unstable/gtk+2.0/debian: changelog patches/033_treeview_resizing.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Jul 21 13:22:16 UTC 2008
Author: joss
Date: Mon Jul 21 13:22:16 2008
New Revision: 16600
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16600
Log:
* 033_treeview_resizing.patch:
+ Fix crasher introduced by the patch. Closes: #491611.
+ Add references.
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=16600&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Mon Jul 21 13:22:16 2008
@@ -1,11 +1,14 @@
-gtk+2.0 (2.12.11-3) UNRELEASED; urgency=low
+gtk+2.0 (2.12.11-3) unstable; urgency=low
* 031_directfb_dead-keys.patch: patch from Jérémy Bobbio to fix dead
keys in the DirectFB backend. Closes: #394871.
* Now require DirectFB 0.9.26.
* 070_mandatory_relibtoolize: updated to match the dependency bump.
-
- -- Josselin Mouette <joss at debian.org> Sat, 19 Jul 2008 12:11:13 +0200
+ * 033_treeview_resizing.patch:
+ + Fix crasher introduced by the patch. Closes: #491611.
+ + Add references.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 21 Jul 2008 15:22:38 +0200
gtk+2.0 (2.12.11-2) unstable; urgency=low
Modified: desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/033_treeview_resizing.patch?rev=16600&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch Mon Jul 21 13:22:16 2008
@@ -1,8 +1,11 @@
+GNOME #316087.
+Debian #471073, #491611.
+
Index: gtk+-2.12.11/gtk/gtktreeview.c
===================================================================
--- gtk+-2.12.11.orig/gtk/gtktreeview.c 2008-07-01 15:42:39.000000000 +0200
-+++ gtk+-2.12.11/gtk/gtktreeview.c 2008-07-10 19:00:15.873743659 +0200
-@@ -1364,6 +1364,8 @@ gtk_tree_view_init (GtkTreeView *tree_vi
++++ gtk+-2.12.11/gtk/gtktreeview.c 2008-07-21 15:10:24.382008186 +0200
+@@ -1364,6 +1364,8 @@
tree_view->priv->tree_lines_enabled = FALSE;
tree_view->priv->tooltip_column = -1;
@@ -11,7 +14,7 @@
}
-@@ -1998,6 +2000,7 @@ gtk_tree_view_update_size (GtkTreeView *
+@@ -1998,6 +2000,7 @@
tree_view->priv->prev_width = tree_view->priv->width;
tree_view->priv->width = 0;
@@ -19,7 +22,7 @@
/* keep this in sync with size_allocate below */
for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
{
-@@ -2164,18 +2167,20 @@ gtk_tree_view_get_real_requested_width_f
+@@ -2164,18 +2167,20 @@
/* GtkWidget::size_allocate helper */
static void
@@ -42,7 +45,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2210,12 +2215,42 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2210,12 +2215,42 @@
number_of_expand_columns++;
}
@@ -86,7 +89,7 @@
for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next))
-@@ -2271,6 +2306,12 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2271,6 +2306,12 @@
column->width += extra;
}
@@ -99,7 +102,7 @@
g_object_notify (G_OBJECT (column), "width");
allocation.width = column->width;
-@@ -2288,6 +2329,14 @@ gtk_tree_view_size_allocate_columns (Gtk
+@@ -2288,6 +2329,15 @@
TREE_VIEW_DRAG_WIDTH, allocation.height);
}
@@ -109,12 +112,13 @@
+ * doesn't have one, the tree view can't fit.
+ */
+ tree_view->priv->width = width;
-+ *width_changed = TRUE;
++ if (width_changed)
++ *width_changed = TRUE;
+
if (column_changed)
gtk_widget_queue_draw (GTK_WIDGET (tree_view));
}
-@@ -2328,6 +2377,7 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2328,6 +2378,7 @@
gtk_widget_size_allocate (child->widget, &allocation);
}
@@ -122,7 +126,7 @@
tree_view->priv->hadjustment->page_size = allocation->width;
tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
-@@ -2336,28 +2386,30 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2336,28 +2387,30 @@
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
@@ -173,7 +177,7 @@
gtk_adjustment_changed (tree_view->priv->hadjustment);
-@@ -2397,8 +2449,6 @@ gtk_tree_view_size_allocate (GtkWidget
+@@ -2397,8 +2450,6 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -182,7 +186,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2842,7 +2892,7 @@ gtk_tree_view_button_press (GtkWidget
+@@ -2842,7 +2893,7 @@
gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@@ -191,7 +195,7 @@
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3554,6 +3604,8 @@ gtk_tree_view_motion_resize_column (GtkW
+@@ -3554,6 +3605,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -200,7 +204,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -5661,6 +5713,7 @@ validate_row (GtkTreeView *tree_view,
+@@ -5661,6 +5714,7 @@
_gtk_rbtree_node_set_height (tree, node, height);
}
_gtk_rbtree_node_mark_valid (tree, node);
@@ -208,7 +212,7 @@
return retval;
}
-@@ -11516,7 +11569,7 @@ gtk_tree_view_move_column_after (GtkTree
+@@ -11516,7 +11570,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -220,8 +224,8 @@
Index: gtk+-2.12.11/gtk/gtktreeviewcolumn.c
===================================================================
--- gtk+-2.12.11.orig/gtk/gtktreeviewcolumn.c 2008-07-01 15:42:39.000000000 +0200
-+++ gtk+-2.12.11/gtk/gtktreeviewcolumn.c 2008-07-10 19:00:15.873743659 +0200
-@@ -2141,6 +2141,7 @@ gtk_tree_view_column_set_expand (GtkTree
++++ gtk+-2.12.11/gtk/gtktreeviewcolumn.c 2008-07-21 14:58:07.660991687 +0200
+@@ -2141,6 +2141,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
{
@@ -232,8 +236,8 @@
Index: gtk+-2.12.11/gtk/gtktreeprivate.h
===================================================================
--- gtk+-2.12.11.orig/gtk/gtktreeprivate.h 2008-07-01 15:42:40.000000000 +0200
-+++ gtk+-2.12.11/gtk/gtktreeprivate.h 2008-07-10 19:00:15.877745215 +0200
-@@ -236,6 +236,8 @@ struct _GtkTreeViewPrivate
++++ gtk+-2.12.11/gtk/gtktreeprivate.h 2008-07-21 14:58:07.660991687 +0200
+@@ -236,6 +236,8 @@
guint in_grab : 1;
@@ -242,7 +246,7 @@
/* Auto expand/collapse timeout in hover mode */
guint auto_expand_timeout;
-@@ -268,6 +270,10 @@ struct _GtkTreeViewPrivate
+@@ -268,6 +270,10 @@
GdkGC *tree_line_gc;
gint tooltip_column;
More information about the pkg-gnome-commits
mailing list