linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2621
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2011-10-01 16:59:18 +0200
message:
  help update wrt GeoIP
modified:
  help/links.html
  help/settings_appearance.html
  help/window_main.html
  win32/MainWindow.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'help/links.html'
--- help/links.html	2011-09-23 11:47:15 +0000
+++ help/links.html	2011-10-01 14:59:18 +0000
@@ -18,14 +18,6 @@
       <td><untranslated><a href="http://dcplusplus.sourceforge.net/download/"; target="_blank" class="external">http://dcplusplus.sourceforge.net/download/</a></untranslated></td>
     </tr>
     <tr>
-      <td id="geoip">GeoIP database update (IPv6)</td>
-      <td><untranslated><a href="http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz"; target="_blank" class="external">http://geolite.maxmind.com/download/ ...</a></untranslated></td>
-    </tr>
-    <tr>
-      <td id="geoip">GeoIP database update (IPv4)</td>
-      <td><untranslated><a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"; target="_blank" class="external">http://geolite.maxmind.com/download/ ...</a></untranslated></td>
-    </tr>
-    <tr>
       <td>Frequently asked questions</td>
       <td><untranslated><a href="http://dcplusplus.sourceforge.net/faq/"; target="_blank" class="external">http://dcplusplus.sourceforge.net/faq/</a></untranslated></td>
     </tr>

=== modified file 'help/settings_appearance.html'
--- help/settings_appearance.html	2011-09-30 12:13:00 +0000
+++ help/settings_appearance.html	2011-10-01 14:59:18 +0000
@@ -48,10 +48,9 @@
 on this option slows browsing file lists a bit.</i></dd>
   <dt id="guessip">Guess user country from IP</dt>
   <dd cshelp="IDH_SETTINGS_APPEARANCE_GET_USER_COUNTRY">
-  When selected, country codes for connected users appear in the
-  <a href="window_connections.html">Connections</a> window. This function uses the
-  <a href="links.html#geoip">GeoIP</a> databases provided by
-  <a href="http://www.maxmind.com"; target="_blank" class="external">MaxMind</a>.
+  When selected, DC++ displays user country information when available. DC++ uses
+  <a href="http://www.maxmind.com/app/geolitecountry"; target="_blank" class="external">MaxMind's GeoIP</a>
+  databases in order to do so.
   </dd>
 </dl>
 <h2>Miscellaneous</h2>

=== modified file 'help/window_main.html'
--- help/window_main.html	2011-09-23 11:47:15 +0000
+++ help/window_main.html	2011-10-01 14:59:18 +0000
@@ -48,6 +48,12 @@
 			</dd>
 			<dt><img src="Settings.ico" width="16" height="16" alt="Settings"/> Settings</dt>
 			<dd>Opens the Settings panel.</dd>
+			<dt>GeoIP database update</dt>
+			<dd>Starts downloading the latest GeoIP databases (provided they aren't already being
+			downloaded) then handles saving them at the right place.<br/>
+			Note that this operation is automatically run every 16 days.<br/>
+			<a href="http://www.maxmind.com/app/geolitecountry"; target="_blank" class="external">MaxMind's GeoIP</a>
+			databases are used by DC++ to get information about user countries.</dd>
 			<dt><img src="Exit.ico" width="16" height="16" alt="Exit"/> Exit</dt>
 			<dd>Closes DC++.</dd>
 		</dl>
@@ -185,20 +191,6 @@
 			<dd>Opens the DC++ blog in your web browser.</dd>
 			<dt>Community news</dt>
 			<dd>Opens ADCPortal in your web browser.</dd>
-			<dt>GeoIP database update (IPv6)</dt>
-			<dd>Opens a web page where the latest GeoIP database for
-			<placeholder>IPv6</placeholder> addresses can be obtained. The file is called
-			<placeholder>GeoIPv6.dat.gz</placeholder>; it should be saved to the DC++ settings
-			directory, where the previous file should reside. This database is used to determine
-			the country of connected users. The database is frequently updated; the newer your
-			GeoIP files are, the more accurate the country information you will see.</dd>
-			<dt>GeoIP database update (IPv4)</dt>
-			<dd>Opens a web page where the latest GeoIP database for
-			<placeholder>IPv4</placeholder> addresses can be obtained. The file is called
-			<placeholder>GeoIP.dat.gz</placeholder>; it should be saved to the DC++ settings
-			directory, where the previous file should reside. This database is used to determine
-			the country of connected users. The database is frequently updated; the newer your
-			GeoIP files are, the more accurate the country information you will see.</dd>
 			</dl>
 
 			</dd>

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2011-10-01 14:33:43 +0000
+++ win32/MainWindow.cpp	2011-10-01 14:59:18 +0000
@@ -1226,9 +1226,11 @@
 			if(xml.findChild("Downloads")) {
 				links.downloads = Text::toT(xml.getChildData());
 			}
+			xml.resetCurrentChild();
 			if(xml.findChild("GeoIPv6")) {
 				links.geoip6 = Text::toT(xml.getChildData());
 			}
+			xml.resetCurrentChild();
 			if(xml.findChild("GeoIPv4")) {
 				links.geoip4 = Text::toT(xml.getChildData());
 			}