r28279 - in /desktop/unstable/gtk+3.0/debian: changelog compat libgtk-3-bin.preinst patches/043_notebook_scroll.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 4 20:51:18 UTC 2011
Author: joss
Date: Sat Jun 4 20:51:17 2011
New Revision: 28279
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28279
Log:
* 043_notebook_scroll.patch: new patch. Reintroduce tab scrolling in
GtkNotebook, but this time only when Alt is pressed, as recommended
by upstream.
* Drop debhelper 8 requirement so that it can build.
* libgtk-3-bin.preinst: only remove libgtk3.0-bin diversions if they
already exist.
Added:
desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch
Modified:
desktop/unstable/gtk+3.0/debian/changelog
desktop/unstable/gtk+3.0/debian/compat
desktop/unstable/gtk+3.0/debian/libgtk-3-bin.preinst
desktop/unstable/gtk+3.0/debian/patches/series
Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=28279&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Sat Jun 4 20:51:17 2011
@@ -1,4 +1,4 @@
-gtk+3.0 (3.0.10-1) UNRELEASED; urgency=low
+gtk+3.0 (3.0.10-1) unstable; urgency=low
[ Josselin Mouette ]
* libgtk-3-0.postrm.in: fix badly written test.
@@ -18,7 +18,15 @@
* Update package descriptions.
* Drop debian/gruik2devhelp.awk and Build-Depends on gawk, obsolete.
- -- Michael Biebl <biebl at debian.org> Sat, 04 Jun 2011 01:44:27 +0200
+ [ Josselin Mouette ]
+ * 043_notebook_scroll.patch: new patch. Reintroduce tab scrolling in
+ GtkNotebook, but this time only when Alt is pressed, as recommended
+ by upstream.
+ * Drop debhelper 8 requirement so that it can build.
+ * libgtk-3-bin.preinst: only remove libgtk3.0-bin diversions if they
+ already exist.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 04 Jun 2011 22:51:06 +0200
gtk+3.0 (3.0.8-1) unstable; urgency=low
Modified: desktop/unstable/gtk+3.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/compat?rev=28279&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/compat [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/compat [utf-8] Sat Jun 4 20:51:17 2011
@@ -1,1 +1,1 @@
-8
+7
Modified: desktop/unstable/gtk+3.0/debian/libgtk-3-bin.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/libgtk-3-bin.preinst?rev=28279&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/libgtk-3-bin.preinst [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/libgtk-3-bin.preinst [utf-8] Sat Jun 4 20:51:17 2011
@@ -2,12 +2,14 @@
set -e
if [ "$1" = install ] || [ "$1" = upgrade ] ; then
- dpkg-divert --remove --package libgtk3.0-bin --rename \
- --divert /usr/sbin/update-icon-caches.gtk2 \
- /usr/sbin/update-icon-caches
- dpkg-divert --remove --package libgtk3.0-bin --rename \
- --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \
- /usr/share/man/man8/update-icon-caches.8.gz
+ if dpkg-divert --listpackage /usr/sbin/update-icon-caches | grep -q libgtk3.0-bin; then
+ dpkg-divert --remove --package libgtk3.0-bin --rename \
+ --divert /usr/sbin/update-icon-caches.gtk2 \
+ /usr/sbin/update-icon-caches
+ dpkg-divert --remove --package libgtk3.0-bin --rename \
+ --divert /usr/share/man/man8/update-icon-caches.gtk2.8.gz \
+ /usr/share/man/man8/update-icon-caches.8.gz
+ fi
dpkg-divert --add --package libgtk-3-bin --rename \
--divert /usr/sbin/update-icon-caches.gtk2 \
Added: desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/043_notebook_scroll.patch?rev=28279&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch (added)
+++ desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] Sat Jun 4 20:51:17 2011
@@ -1,0 +1,89 @@
+Reverts ad48f4d52bbac6139dd829fcc421ad16441f34d2
+Add back the feature but only with Alt
+See GNOME #630226 and #145244
+
+Index: gtk+-3.0.10/gtk/gtknotebook.c
+===================================================================
+--- gtk+-3.0.10.orig/gtk/gtknotebook.c 2011-06-04 20:43:14.790926584 +0200
++++ gtk+-3.0.10/gtk/gtknotebook.c 2011-06-04 20:56:04.230688193 +0200
+@@ -338,6 +338,8 @@ static void gtk_notebook_size_allocate
+ GtkAllocation *allocation);
+ static gint gtk_notebook_draw (GtkWidget *widget,
+ cairo_t *cr);
++static gboolean gtk_notebook_scroll (GtkWidget *widget,
++ GdkEventScroll *event);
+ static gint gtk_notebook_button_press (GtkWidget *widget,
+ GdkEventButton *event);
+ static gint gtk_notebook_button_release (GtkWidget *widget,
+@@ -639,6 +641,7 @@ gtk_notebook_class_init (GtkNotebookClas
+ widget_class->get_preferred_height = gtk_notebook_get_preferred_height;
+ widget_class->size_allocate = gtk_notebook_size_allocate;
+ widget_class->draw = gtk_notebook_draw;
++ widget_class->scroll_event = gtk_notebook_scroll;
+ widget_class->button_press_event = gtk_notebook_button_press;
+ widget_class->button_release_event = gtk_notebook_button_release;
+ widget_class->popup_menu = gtk_notebook_popup_menu;
+@@ -1857,7 +1860,8 @@ gtk_notebook_realize (GtkWidget *widget)
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
+- GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
++ GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK |
++ GDK_SCROLL_MASK);
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+ priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
+@@ -2712,6 +2716,53 @@ get_widget_coordinates (GtkWidget *widge
+ return FALSE;
+ }
+
++static gboolean
++gtk_notebook_scroll (GtkWidget *widget,
++ GdkEventScroll *event)
++{
++ GtkNotebook *notebook = GTK_NOTEBOOK (widget);
++ GtkNotebookPrivate *priv = notebook->priv;
++ GtkWidget *child, *event_widget;
++ gint i;
++
++ if (!priv->cur_page)
++ return FALSE;
++
++ /* only actually scroll when Mod1 is pressed */
++ if (!(event->state & GDK_MOD1_MASK))
++ return FALSE;
++
++ child = priv->cur_page->child;
++ event_widget = gtk_get_event_widget ((GdkEvent *)event);
++
++ /* ignore scroll events from the content of the page */
++ if (!event_widget || gtk_widget_is_ancestor (event_widget, child) || event_widget == child)
++ return FALSE;
++
++ /* nor from the action area */
++ for (i = 0; i < 2; i++)
++ {
++ if (event_widget == priv->action_widget[i] ||
++ (priv->action_widget[i] &&
++ gtk_widget_is_ancestor (event_widget, priv->action_widget[i])))
++ return FALSE;
++ }
++
++ switch (event->direction)
++ {
++ case GDK_SCROLL_RIGHT:
++ case GDK_SCROLL_DOWN:
++ gtk_notebook_next_page (notebook);
++ break;
++ case GDK_SCROLL_LEFT:
++ case GDK_SCROLL_UP:
++ gtk_notebook_prev_page (notebook);
++ break;
++ }
++
++ return TRUE;
++}
++
+ static GList*
+ get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
+ {
Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=28279&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Sat Jun 4 20:51:17 2011
@@ -5,4 +5,5 @@
022_disable-viqr-im-for-vi-locale.patch
041_ia32-libs.patch
042_treeview_single-focus.patch
+043_notebook_scroll.patch
060_ignore-random-icons.patch
More information about the pkg-gnome-commits
mailing list