xsane-0.996-no-eula.patch

   1 From 7018206ea45db2e8bdfeb67d33f3387c9678a407 Mon Sep 17 00:00:00 2001
   2 From: Nils Philippsen <nils@redhat.com>
   3 Date: Thu, 16 Aug 2012 11:19:16 +0200
   4 Subject: [PATCH] patch: no-eula
   5
   6 Squashed commit of the following:
   7
   8 commit d13f1ccfdf4c150cab91105e9b8542ecbb048a9b
   9 Author: Nils Philippsen <nils@redhat.com>
  10 Date:   Fri Nov 19 12:20:52 2010 +0100
  11
  12     don't show EULA, mention bugzilla in about dialog (#504344)
  13 ---
  14  src/xsane-text.h |  2 ++
  15  src/xsane.c      | 16 ++++++----------
  16  src/xsane.h      |  3 +++
  17  3 files changed, 11 insertions(+), 10 deletions(-)
  18
  19 diff --git a/src/xsane-text.h b/src/xsane-text.h
  20 index fc6bbeb..ee4a222 100644
  21 --- a/src/xsane-text.h
  22 +++ b/src/xsane-text.h
  23 @@ -230,6 +230,8 @@
  24                                            "This program is distributed in the hope that it will be useful, but\n" \
  25                                            "WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
  26                                            "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
  27 +#define TEXT_MODIFIED_BLURB             _("This package is modified from the original version.\n" \
  28 +                                          "Please contact your vendor or report problems at")
  29  #define TEXT_EMAIL_ADR                                 _("E-mail:")
  30  #define TEXT_HOMEPAGE                                  _("Homepage:")
  31  #define TEXT_FILE                                      _("File:")
  32 diff --git a/src/xsane.c b/src/xsane.c
  33 index 1c5d61d..8b24b0c 100644
  34 --- a/src/xsane.c
  35 +++ b/src/xsane.c
  36 @@ -3533,10 +3533,13 @@ static void xsane_about_dialog(GtkWidget *widget, gpointer data)
  37    snprintf(buf, sizeof(buf), "XSane %s %s\n"
  38                               "%s %s\n"
  39                               "\n"
  40 +                             "%s\n%s"
  41 +                             "\n\n"
  42                               "%s %s\n"
  43                               "%s %s\n",
  44                               TEXT_VERSION, XSANE_VERSION,
  45                               XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT,
  46 +                             TEXT_MODIFIED_BLURB, XSANE_BUGTRACKER_URL,
  47                               TEXT_HOMEPAGE, XSANE_HOMEPAGE,
  48                               TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
  49
  50 @@ -5733,6 +5736,7 @@ static int xsane_init(int argc, char **argv)
  51
  52          case 'v': /* --version */
  53            g_print("%s-%s %s %s\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
  54 +          g_print("\n%s\n%s\n\n", TEXT_MODIFIED_BLURB, XSANE_BUGTRACKER_URL);
  55            g_print("  %s %s\n", TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
  56            g_print("  %s %s\n", TEXT_PACKAGE, XSANE_PACKAGE_VERSION);
  57            g_print("  %s%d.%d.%d\n", TEXT_GTK_VERSION, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
  58 @@ -5859,17 +5863,9 @@ static int xsane_init(int argc, char **argv)
  59    }
  60
  61
  62 -  if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
  63 +  if (xsane_pref_restore()) /* restore preferences, returns TRUE if the version is different from the last run */
  64    {
  65 -    if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
  66 -    {
  67 -      DBG(DBG_info, "user did not accept eula, we abort\n");
  68 -      return 1; /* User did not accept eula */
  69 -    }
  70 -    else /* User did accept eula */
  71 -    {
  72 -      xsane_pref_save();
  73 -    }
  74 +    xsane_pref_save();
  75    }
  76
  77    xsane_pref_restore_media();
  78 diff --git a/src/xsane.h b/src/xsane.h
  79 index 3d8caaa..6c7568e 100644
  80 --- a/src/xsane.h
  81 +++ b/src/xsane.h
  82 @@ -98,6 +98,9 @@
  83  #define XSANE_EMAIL_ADR                "Oliver.Rauch@xsane.org"
  84  #define XSANE_HOMEPAGE         "http://www.xsane.org"
  85  #define XSANE_COPYRIGHT_TXT    XSANE_DATE " " XSANE_COPYRIGHT
  86 +#ifndef XSANE_BUGTRACKER_URL
  87 +#define XSANE_BUGTRACKER_URL             "(no bug tracker configured)"
  88 +#endif
  89
  90  /* ---------------------------------------------------------------------------------------------------------------------- */
  91
  92 --
  93 1.7.11.4
  94