summaryrefslogtreecommitdiff
path: root/src/xsane-back-gtk.c
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2010-05-29 12:49:57 +0200
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:54 +0000
commit98aa79889a1cc8be7284b431372dc11b26c65e4e (patch)
tree00326799a359e1d3504df8b07f4b020255c607c9 /src/xsane-back-gtk.c
parent05f0966f64f56ad3348ce8569324ee6c3e692aa8 (diff)
parented1d7afab34d41b155ac701ee9db87c3f057b99b (diff)
Imported Debian patch 0.997-1debian/0.997-1
Diffstat (limited to 'src/xsane-back-gtk.c')
-rw-r--r--src/xsane-back-gtk.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xsane-back-gtk.c b/src/xsane-back-gtk.c
index d74300e..671b02d 100644
--- a/src/xsane-back-gtk.c
+++ b/src/xsane-back-gtk.c
@@ -709,6 +709,7 @@ gint xsane_back_gtk_decision(gchar *title, gchar **xpm_d, gchar *message, gchar
gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 10);
gtk_widget_show(pixmapwidget);
gdk_drawable_unref(pixmap);
+ gdk_drawable_unref(mask);
}
/* the message */
@@ -2002,7 +2003,8 @@ void xsane_back_gtk_range_new(GtkWidget *parent, const char *name, gfloat val,
label = gtk_label_new((char *) name);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
- elem->data = gtk_adjustment_new(val, min, max, quant, quant*10, (max-min) * 1e-30);
+ elem->data = gtk_adjustment_new(val, min, max, quant, quant*10, 0);
+ //elem->data = gtk_adjustment_new(val, min, max, quant, quant*10, (max-min) * 1e-30);
/* 1e-30 => hscrollbar has an unwanted side effect: the maximum is not the maximum */
/* of the given range, it is reduced by the page_size, so it has to be very small */
@@ -2121,7 +2123,8 @@ void xsane_back_gtk_value_new(GtkWidget *parent, const char *name, gfloat val,
label = gtk_label_new((char *) name);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
- elem->data = gtk_adjustment_new(val, -1e29, 1e29, 1, 10, 1e-30);
+ elem->data = gtk_adjustment_new(val, -1e29, 1e29, 1, 10, 0);
+ //elem->data = gtk_adjustment_new(val, -1e29, 1e29, 1, 10, 1e-30);
/* spinbutton */
#ifndef HAVE_GTK2
@@ -2612,7 +2615,7 @@ void xsane_back_gtk_set_sensitivity(int sensitive)
continue;
}
- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
+ // if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
{
gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
}