[Python-apps-commits] r14354 - in packages/sabnzbdplus/trunk/debian/patches (1 file)

[jcfp-guest at users.alioth.debian.org]

    Date: Saturday, August 26, 2017 @ 10:05:28
  Author: jcfp-guest
Revision: 14354

mod patch 09 to match upstream changes in wizard

Modified:
  packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff

Modified: packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff
===================================================================
--- packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2017-08-26 10:04:04 UTC (rev 14353)
+++ packages/sabnzbdplus/trunk/debian/patches/09_remove_external_resources.diff	2017-08-26 10:05:28 UTC (rev 14354)
@@ -8,18 +8,18 @@
                      </div>
                      <div class="col-md-5">
                          <div class="clearfix"></div>
--                        <iframe style="float: right; width: 315px; height: 315px;" frameborder="0" src="https://resources.sabnzbd.org/wizard/ad/$language"></iframe>
+-                        <iframe style="float: right; width: 325px; height: 325px;" frameborder="0" src="https://sabnzbd.org/wizard#$language"></iframe>
 +                        <div style="float: right; width: 300px; padding: 5px; border: 1px dotted #000; background-color: #F5F5F5; font-size: 14px; font-family: sans-serif;">
 +                            <b>Help</b>
 +                            <br/>In order to download from Usenet you will require access to a provider. Your ISP may provide you with access, however a premium provider is recommended.<br/>
-+                            <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://resources.sabnzbd.org/wizard/ad/$language" target="_blank">sabnzbd.org</a>.<br/>
++                            <br/>Don't have a Usenet provider? A recommendation (and affiliate link) from the developers of SABnzbd may be found at <a href="https://sabnzbd.org/wizard#$language" target="_blank">sabnzbd.org</a>.<br/>
 +                        </div>
                      </div>
                  </div>
                  <input type="hidden" name="session" value="$session" />
 --- a/sabnzbd/__init__.py
 +++ b/sabnzbd/__init__.py
-@@ -1166,6 +1166,8 @@
+@@ -1161,6 +1161,8 @@
          logging.debug("Test IPv6: Disabling IPv6, because it looks like it's not available. Reason: %s", sys.exc_info()[0] )
          return False
  
@@ -40,17 +40,6 @@
      # Because of dual IPv4/IPv6 clients, finding the public ipv4 needs special attention,
      # meaning forcing IPv4 connections, and not allowing IPv6 connections
      try:
---- a/sabnzbd/notifier.py
-+++ b/sabnzbd/notifier.py
-@@ -95,7 +95,7 @@
-             fp.close()
-         else:
-             # Due to a bug in GNTP, need this work-around for Linux/Unix
--            icon = 'http://sabnzbdplus.sourceforge.net/version/sabnzbd.ico'
-+            icon = '/usr/share/sabnzbdplus/icons/sabnzbd.ico'
-     else:
-         icon = None
-     return icon
 --- a/interfaces/Glitter/templates/include_overlays.tmpl
 +++ b/interfaces/Glitter/templates/include_overlays.tmpl
 @@ -96,7 +96,12 @@