From 5a7f8a59a1e16a7c1da3e935ad3fac9666164050 Mon Sep 17 00:00:00 2001
From: mirabilos <tg@debian.org>
Date: Tue, 21 Apr 2020 14:14:20 +0200
Subject: [PATCH 1/2] document which CC licence exactly is shown
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(it’s a restricted one)

advances #100
---
 src/serverdlg.cpp    | 4 ++--
 src/serverdlgbase.ui | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 21151566..0fbdf8c5 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -58,8 +58,8 @@ CServerDlg::CServerDlg ( CServer*        pNServP,
 
     // CC licence dialog switch
     chbUseCCLicence->setWhatsThis ( tr ( "<b>Show Creative Commons Licence "
-        "Dialog:</b> If enabled, a Creative Commons Licence dialog is shown "
-        "each time a new user connects the server." ) );
+        "Dialog:</b> If enabled, a Creative Commons BY-NC-SA 4.0 Licence "
+        "dialog is shown each time a new user connects the server." ) );
 
     // Make My Server Public flag
     chbRegisterServer->setWhatsThis ( tr ( "<b>Make My Server Public:</b> If "
diff --git a/src/serverdlgbase.ui b/src/serverdlgbase.ui
index 03d5476d..61e069f4 100755
--- a/src/serverdlgbase.ui
+++ b/src/serverdlgbase.ui
@@ -56,7 +56,7 @@
    <item>
     <widget class="QCheckBox" name="chbUseCCLicence">
      <property name="text">
-      <string>Show Creative Commons Licence Dialog</string>
+      <string>Show Creative Commons BY-NC-SA 4.0 Licence Dialog</string>
      </property>
     </widget>
    </item>

From 47958ffef06dd23a7f4aa21cf8ce98c8fd193a3f Mon Sep 17 00:00:00 2001
From: mirabilos <tg@debian.org>
Date: Tue, 21 Apr 2020 14:14:55 +0200
Subject: [PATCH 2/2] do not default to the restrictive commons licence on GUI
 server

advances #100
---
 src/main.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ef99cd39..b3fa7ad9 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -560,10 +560,6 @@ int main ( int argc, char** argv )
                              eLicenceType );
             if ( bUseGUI )
             {
-                // special case for the GUI mode: we want the licence type to be
-                // creative commons per default (if not given in the settings file)
-                Server.SetLicenceType ( LT_CREATIVECOMMONS );
-
                 // load settings from init-file
                 CSettings Settings ( &Server, strIniFileName );
                 Settings.Load();