summaryrefslogtreecommitdiff
path: root/debian/patches/fix_spin_button_pagesize.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/fix_spin_button_pagesize.patch')
-rw-r--r--debian/patches/fix_spin_button_pagesize.patch42
1 files changed, 10 insertions, 32 deletions
diff --git a/debian/patches/fix_spin_button_pagesize.patch b/debian/patches/fix_spin_button_pagesize.patch
index 9b981eb..ba0b5de 100644
--- a/debian/patches/fix_spin_button_pagesize.patch
+++ b/debian/patches/fix_spin_button_pagesize.patch
@@ -4,11 +4,11 @@ Description: Fix spin buttons usage for newer versions of GTK+ 2.0
Author: Julien BLACHE <jblache@debian.org>
Forwarded: no
-Index: xsane-0.997/src/xsane-back-gtk.c
+Index: xsane-0.998/src/xsane-back-gtk.c
===================================================================
---- xsane-0.997.orig/src/xsane-back-gtk.c 2010-05-31 19:35:46.406976445 +0200
-+++ xsane-0.997/src/xsane-back-gtk.c 2010-05-31 19:36:33.583975801 +0200
-@@ -2031,6 +2031,7 @@
+--- xsane-0.998.orig/src/xsane-back-gtk.c 2011-02-04 19:50:46.000000000 +0100
++++ xsane-0.998/src/xsane-back-gtk.c 2011-02-04 19:54:55.581016002 +0100
+@@ -2028,6 +2028,7 @@
digits = 5;
}
#endif
@@ -16,7 +16,7 @@ Index: xsane-0.997/src/xsane-back-gtk.c
spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
if (preferences.show_range_mode & 3) /* slider also visible */
-@@ -2133,6 +2134,7 @@
+@@ -2129,6 +2130,7 @@
digits = 5;
}
#endif
@@ -24,11 +24,11 @@ Index: xsane-0.997/src/xsane-back-gtk.c
spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
if (preferences.show_range_mode & 3) /* sliders are visible */
-Index: xsane-0.997/src/xsane-front-gtk.c
+Index: xsane-0.998/src/xsane-front-gtk.c
===================================================================
---- xsane-0.997.orig/src/xsane-front-gtk.c 2010-05-31 19:35:46.421976568 +0200
-+++ xsane-0.997/src/xsane-front-gtk.c 2010-05-31 19:36:33.584975905 +0200
-@@ -1166,6 +1166,7 @@
+--- xsane-0.998.orig/src/xsane-front-gtk.c 2011-02-04 19:50:46.000000000 +0100
++++ xsane-0.998/src/xsane-front-gtk.c 2011-02-04 19:54:55.581016002 +0100
+@@ -1163,6 +1163,7 @@
/* spinbutton */
if (preferences.show_range_mode & 4)
{
@@ -36,7 +36,7 @@ Index: xsane-0.997/src/xsane-front-gtk.c
spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
if (preferences.show_range_mode & 3) /* slider also visible */
{
-@@ -1261,6 +1262,7 @@
+@@ -1255,6 +1256,7 @@
/* spinbutton */
if (preferences.show_range_mode & 4)
{
@@ -44,25 +44,3 @@ Index: xsane-0.997/src/xsane-front-gtk.c
spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
gtk_widget_set_size_request(spinbutton, 60, -1);
xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, desc);
-Index: xsane-0.997/src/xsane.c
-===================================================================
---- xsane-0.997.orig/src/xsane.c 2010-05-31 19:35:46.438976828 +0200
-+++ xsane-0.997/src/xsane.c 2010-05-31 19:36:33.591976211 +0200
-@@ -1218,7 +1218,7 @@
- gtk_widget_show(pixmapwidget);
-
- /* adf pages maximum */
-- adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 1);
-+ adjustment = gtk_adjustment_new(preferences.adf_pages_max, 1, 9999, 1, 10, 0);
- xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
- gtk_widget_set_size_request(xsane_spinbutton, 55, -1);
- gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);
-@@ -1317,7 +1317,7 @@
-
-
- /* number of copies */
-- adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 1);
-+ adjustment = gtk_adjustment_new(xsane.copy_number, 1, 99, 1, 10, 0);
- xsane_spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 0, 0);
- gtk_widget_set_size_request(xsane_spinbutton, 40, -1);
- gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(xsane_spinbutton), FALSE);