[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/06/02 16:14:07

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonBlocking.ml 

Log message:
        patch #5987

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1272&r2=1.1273
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonBlocking.ml?cvsroot=mldonkey&r1=1.5&r2=1.6

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1272
retrieving revision 1.1273
diff -u -b -r1.1272 -r1.1273
--- distrib/ChangeLog   2 Jun 2007 14:51:44 -0000       1.1272
+++ distrib/ChangeLog   2 Jun 2007 16:14:07 -0000       1.1273
@@ -15,6 +15,7 @@
 =========
 
 2007/06/02
+5987: GeoIP: Small cosmetical fix for loading GeoIP.dat (pango)
 5986: Fix GC problem in bz2 code (pango)
 
 2007/06/01

Index: src/daemon/common/commonBlocking.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonBlocking.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/daemon/common/commonBlocking.ml 31 May 2007 19:24:57 -0000      1.5
+++ src/daemon/common/commonBlocking.ml 2 Jun 2007 16:14:07 -0000       1.6
@@ -76,7 +76,8 @@
   update_bans ()
 
 let set_geoip_dat filename =
-  Geoip.init (Geoip.unpack filename);
+  if filename <> "" then Geoip.init (Geoip.unpack filename)
+  else Geoip.close ();
   update_bans ()
 
 let set_ip_blocking_countries cl =