Imported Debian patch 0.996-4debian/0.996-4

1 files changed, 58 insertions, 0 deletions

diff --git a/debian/patches/deb_inhibit_clickthrough.patch b/debian/patches/deb_inhibit_clickthrough.patch
new file mode 100644
index 0000000..daf82ec
--- /dev/null
+++ b/debian/patches/deb_inhibit_clickthrough.patch
@@ -0,0 +1,58 @@
+Description: Inhibit XSane's click-through license
+ Finally give up and inhibit the license click-through.
+Author: Julien BLACHE <jblache@debian.org>
+Forwarded: not-needed
+
+Index: xsane-0.996/src/xsane.c
+===================================================================
+--- xsane-0.996.orig/src/xsane.c	2010-03-13 20:42:29.786742130 +0100
++++ xsane-0.996/src/xsane.c	2010-03-13 20:42:59.978765829 +0100
+@@ -1901,11 +1901,11 @@
+ /* ---------------------------------------------------------------------------------------------------------------------- */
+ 
+ static int xsane_pref_restore(void)
+-/* returns true if this is the first time this xsane version is called */
++/* Originally: returns true if this is the first time this xsane version is called */
+ {
+  char filename[PATH_MAX];
+  int fd;
+- int result = TRUE;
++ int result = FALSE;
+  int i;
+ 
+   DBG(DBG_proc, "xsane_pref_restore\n");
+@@ -1919,6 +1919,7 @@
+     preferences_restore(fd);
+     close(fd);
+ 
++#if 0
+     /* the version test only is done for the local xsane.rc file because each user */
+     /* shall accept (or not) the license for xsane */
+     if (preferences.xsane_version_str)
+@@ -1928,6 +1929,7 @@
+         result = FALSE; /* this version already has been started */
+       }
+     }
++#endif /* 0 */
+   }
+   else /* no local sane file, look for system file */
+   {
+@@ -5796,7 +5798,10 @@
+     xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */
+   }
+ 
++  xsane_pref_restore();
++  xsane_pref_save();
+ 
++#if 0 /* Original XSane code */
+   if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
+   {
+     if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
+@@ -5809,6 +5814,7 @@
+       xsane_pref_save();
+     }
+   }
++#endif /* Original XSane code */
+ 
+   xsane_pref_restore_media();
+