Commit 1a5a7e01 authored by Joris Guisson's avatar Joris Guisson
Browse files

Merged 790301 from trunk (blocklist converting fix)

svn path=/branches/ktorrent/3.0/; revision=790303
parent 57074719
Changes in 3.0.2 :
- Make sure seed time cannot wrap around (159756)
- Fix broken convert of blocklists
Changes in 3.0.1 :
- Fix sessionTTL not being able to be bigger then 99
......
......@@ -106,7 +106,7 @@ namespace kt
QTextStream stream( &source );
int i = 0;
QRegExp rx( "[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}-[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}" );
QRegExp rx( "([0-9]{1,3}\\.){3}[0-9]{1,3}-([0-9]{1,3}\\.){3}[0-9]{1,3}" );
QRegExpValidator v( rx, 0 );
int poz = 0;
......@@ -117,7 +117,7 @@ namespace kt
dlg->progress(i,source_size);
++i;
QString ip_part = line.section( ':' , -1 );
QString ip_part = line.section( ':' , -1 ).trimmed();
if ( v.validate( ip_part, poz ) != QValidator::Acceptable )
continue;
else
......
......@@ -162,7 +162,7 @@ namespace kt
//now determine if it's ZIP or TXT file
KMimeType::Ptr ptr = KMimeType::findByPath(temp);
if (ptr->name() == "application/x-zip")
if (ptr->name() == "application/zip")
{
KJob* j2 = KIO::file_move(temp,kt::DataDir() + "level1.zip",-1,KIO::HideProgressInfo|KIO::Overwrite);
connect(j2,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment