r12486 - in /desktop/experimental/gtk+2.0/debian: changelog patches/033_treeview_resizing.patch patches/040_filechooser_single-click.patch patches/080_from_svn_fix_dangling_tooltip.patch patches/series
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sun Sep 16 16:27:46 UTC 2007
Author: lool
Date: Sun Sep 16 16:27:46 2007
New Revision: 12486
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12486
Log:
* Refresh patches 033_treeview_resizing and 040_filechooser_single-click to
apply cleanly.
* Drop patch 080_from_svn_fix_dangling_tooltip, merged upstream.
Removed:
desktop/experimental/gtk+2.0/debian/patches/080_from_svn_fix_dangling_tooltip.patch
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch
desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch
desktop/experimental/gtk+2.0/debian/patches/series
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=12486&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Sun Sep 16 16:27:46 2007
@@ -1,9 +1,15 @@
-gtk+2.0 (2.12.0-1) experimental; urgency=low
-
+gtk+2.0 (2.12.0-1) UNRELEASED; urgency=low
+
+ [ Alan Baghumian ]
* New upstream stable release
- Regenerated 070_mandatory-relibtoolize.patch
- -- Alan Baghumian <alan at technotux.org> Sun, 16 Sep 2007 18:49:52 +0330
+ [ Loic Minier ]
+ * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to
+ apply cleanly.
+ * Drop patch 080_from_svn_fix_dangling_tooltip, merged upstream.
+
+ -- Loic Minier <lool at dooz.org> Sun, 16 Sep 2007 18:27:11 +0200
gtk+2.0 (2.11.6-1) experimental; urgency=low
Modified: desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/033_treeview_resizing.patch?rev=12486&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch Sun Sep 16 16:27:46 2007
@@ -1,7 +1,5 @@
-Index: gtk+2.0-2.11.6/gtk/gtktreeviewcolumn.c
-===================================================================
---- gtk+2.0-2.11.6.orig/gtk/gtktreeviewcolumn.c 2007-07-20 22:12:28.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtktreeviewcolumn.c 2007-07-23 13:04:14.000000000 +0200
+--- gtk+2.0-2.12.0.orig/gtk/gtktreeviewcolumn.c 2007-09-13 22:35:40.000000000 +0200
++++ gtk+2.0-2.12.0/gtk/gtktreeviewcolumn.c 2007-09-16 18:24:32.000000000 +0200
@@ -2142,6 +2142,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
@@ -10,11 +8,9 @@
gtk_widget_queue_resize (tree_column->tree_view);
}
-Index: gtk+2.0-2.11.6/gtk/gtktreeview.c
-===================================================================
---- gtk+2.0-2.11.6.orig/gtk/gtktreeview.c 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtktreeview.c 2007-07-23 13:04:14.000000000 +0200
-@@ -2162,18 +2162,20 @@
+--- gtk+2.0-2.12.0.orig/gtk/gtktreeview.c 2007-09-14 00:43:35.000000000 +0200
++++ gtk+2.0-2.12.0/gtk/gtktreeview.c 2007-09-16 18:24:32.000000000 +0200
+@@ -2159,18 +2159,20 @@
/* GtkWidget::size_allocate helper */
static void
@@ -37,7 +33,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2208,12 +2210,38 @@
+@@ -2205,12 +2207,38 @@
number_of_expand_columns++;
}
@@ -77,7 +73,7 @@
for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next))
-@@ -2268,6 +2296,10 @@
+@@ -2265,6 +2293,10 @@
{
column->width += extra;
}
@@ -88,7 +84,7 @@
g_object_notify (G_OBJECT (column), "width");
-@@ -2302,13 +2334,13 @@
+@@ -2299,13 +2331,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@@ -105,7 +101,7 @@
tmp_list = tree_view->priv->children;
while (tmp_list)
-@@ -2395,7 +2427,7 @@
+@@ -2392,7 +2424,7 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -114,7 +110,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2806,7 +2838,7 @@
+@@ -2837,7 +2869,7 @@
gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@@ -123,7 +119,7 @@
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3515,6 +3547,8 @@
+@@ -3546,6 +3578,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -132,7 +128,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -11317,7 +11351,7 @@
+@@ -11472,7 +11506,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -141,10 +137,8 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
-Index: gtk+2.0-2.11.6/gtk/gtktreeprivate.h
-===================================================================
---- gtk+2.0-2.11.6.orig/gtk/gtktreeprivate.h 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtktreeprivate.h 2007-07-23 13:04:59.000000000 +0200
+--- gtk+2.0-2.12.0.orig/gtk/gtktreeprivate.h 2007-09-13 22:35:41.000000000 +0200
++++ gtk+2.0-2.12.0/gtk/gtktreeprivate.h 2007-09-16 18:24:32.000000000 +0200
@@ -265,6 +265,10 @@
gboolean tree_lines_enabled;
GdkGC *tree_line_gc;
Modified: desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/040_filechooser_single-click.patch?rev=12486&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch Sun Sep 16 16:27:46 2007
@@ -1,8 +1,8 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
---- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserdefault.c 2007-07-20 22:12:28.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserdefault.c 2007-07-23 22:01:15.000000000 +0200
+--- gtk+2.0-2.12.0.orig/gtk/gtkfilechooserdefault.c 2007-09-13 22:35:40.000000000 +0200
++++ gtk+2.0-2.12.0/gtk/gtkfilechooserdefault.c 2007-09-16 18:24:40.000000000 +0200
@@ -390,10 +390,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
@@ -14,7 +14,7 @@
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -3639,8 +3635,22 @@
+@@ -3657,8 +3653,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
@@ -37,7 +37,7 @@
}
static gboolean
-@@ -3920,9 +3930,6 @@
+@@ -3938,9 +3948,6 @@
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
@@ -47,7 +47,7 @@
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
-@@ -8601,25 +8608,6 @@
+@@ -8593,25 +8600,6 @@
gtk_file_path_free (path);
return retval;
}
@@ -73,7 +73,7 @@
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
-@@ -10471,25 +10459,6 @@
+@@ -10469,25 +10457,6 @@
}
}
Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=12486&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series Sun Sep 16 16:27:46 2007
@@ -14,4 +14,3 @@
040_filechooser_single-click.patch
041_ia32-libs.patch
070_mandatory-relibtoolize.patch
-080_from_svn_fix_dangling_tooltip.patch
More information about the pkg-gnome-commits
mailing list