1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 04_inhibit_clickthrough.dpatch by <jblache@debian.org>
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: Finally give up and inhibit the license clickthrough.
8
diff -urNad xsane-0.995~/src/xsane.c xsane-0.995/src/xsane.c
9
--- xsane-0.995~/src/xsane.c 2007-09-28 17:24:56.000000000 +0200
10
+++ xsane-0.995/src/xsane.c 2008-04-11 18:56:55.120439147 +0200
11
@@ -1901,11 +1901,11 @@
12
/* ---------------------------------------------------------------------------------------------------------------------- */
14
static int xsane_pref_restore(void)
15
-/* returns true if this is the first time this xsane version is called */
16
+/* Originally: returns true if this is the first time this xsane version is called */
18
char filename[PATH_MAX];
24
DBG(DBG_proc, "xsane_pref_restore\n");
26
preferences_restore(fd);
30
/* the version test only is done for the local xsane.rc file because each user */
31
/* shall accept (or not) the license for xsane */
32
if (preferences.xsane_version_str)
34
result = FALSE; /* this version already has been started */
39
else /* no local sane file, look for system file */
41
@@ -5795,7 +5797,10 @@
42
xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */
45
+ xsane_pref_restore();
48
+#if 0 /* Original XSane code */
49
if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
51
if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
56
+#endif /* Original XSane code */
58
xsane_pref_restore_media();