openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File no-eula.patch of Package xsane (Revision d22cbeee789ba673287a449efbd1cb0f)

Currently displaying revision d22cbeee789ba673287a449efbd1cb0f , Show latest

--- src/xsane.c.orig	2007-09-28 17:24:56.000000000 +0200
+++ src/xsane.c	2008-03-05 12:22:56.000000000 +0100
@@ -5795,19 +5795,7 @@ static int xsane_init(int argc, char **a
     xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */
   }
 
-
-  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 */
-    {
-      DBG(DBG_info, "user did not accept eula, we abort\n");
-      return 1; /* User did not accept eula */
-    }
-    else /* User did accept eula */
-    {
-      xsane_pref_save();
-    }
-  }
+  xsane_pref_restore(); /* restore preferences */
 
   xsane_pref_restore_media();
 
--- src/xsane.h.orig	2007-08-13 09:20:32.000000000 +0200
+++ src/xsane.h	2008-03-06 13:48:05.000000000 +0100
@@ -93,9 +93,9 @@
 
 #define XSANE_VERSION		"0.995"
 #define XSANE_AUTHOR		"Oliver Rauch"
-#define XSANE_COPYRIGHT		"Oliver Rauch"
-#define XSANE_DATE		"1998-2007"
-#define XSANE_EMAIL_ADR		"Oliver.Rauch@xsane.org"
+#define XSANE_COPYRIGHT		"Oliver Rauch (modified by Novell, Inc.)"
+#define XSANE_DATE		"1998-2008"
+#define XSANE_EMAIL_ADR		"Oliver.Rauch@xsane.org (bug reports: http://bugs.opensuse.org)"
 #define XSANE_HOMEPAGE		"http://www.xsane.org"
 #define XSANE_COPYRIGHT_TXT	XSANE_DATE " " XSANE_COPYRIGHT

Places

File no-eula.patch of Package xsane (Revision d22cbeee789ba673287a449efbd1cb0f)

Places