openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision 678827f0e92022f1146dc85bef4ff5f3 , Show latest

Index: src/xsane.c
===================================================================
--- src/xsane.c.orig
+++ src/xsane.c
@@ -5815,19 +5815,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();
 
Index: src/xsane.h
===================================================================
--- src/xsane.h.orig
+++ src/xsane.h
@@ -93,9 +93,9 @@
 
 #define XSANE_VERSION		"0.998"
 #define XSANE_AUTHOR		"Oliver Rauch"
-#define XSANE_COPYRIGHT		"Oliver Rauch"
+#define XSANE_COPYRIGHT		"Oliver Rauch (modified by Novell, Inc.)"
 #define XSANE_DATE		"1998-2010"
-#define XSANE_EMAIL_ADR		"Oliver.Rauch@xsane.org"
+#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 678827f0e92022f1146dc85bef4ff5f3)

Places