Merge branch 'master' of madf.dyndns.org:/var/git/stg

diff --git a/.gitignore b/.gitignore
index 5fc35256f8d4b6580798e2fa2c3c1efa6fd497a8..991874f06fcaf7e4ba0a4acf6ba760956605c991 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ projects/stargazer/var
 stglibs/smtp.lib
 stglibs/crypto.lib/blowfish.c
 Makefile.conf
+projects/convertor/convertor
+projects/rscriptd/rscriptd
+projects/sgconf/sgconf

diff --git a/projects/stargazer/user.cpp b/projects/stargazer/user.cpp
index 6e77f0a53de025a3208d8fa8ea06fcff9d511f98..38bab82c2a2f3e2b47306dd1f822adaf6690740e 100644 (file)
--- a/projects/stargazer/user.cpp
+++ b/projects/stargazer/user.cpp
@@ -123,8 +123,6 @@ currIP.AddAfterNotifier(&ipNotifier);
 
 lastScanMessages = 0;
 
-writeFreeMbTraffCost = settings->GetWriteFreeMbTraffCost();
-
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -206,8 +204,6 @@ currIP.AddAfterNotifier(&ipNotifier);
 
 lastScanMessages = 0;
 
-writeFreeMbTraffCost = settings->GetWriteFreeMbTraffCost();
-
 property.SetProperties(u.property);
 
 pthread_mutexattr_t attr;
@@ -770,7 +766,8 @@ sessionUpload[dir] += len;
 
 //Add detailed stat
 
-if (!writeFreeMbTraffCost && freeMb.ConstData() >= 0)
+if (!settings->GetWriteFreeMbTraffCost() &&
+     freeMb.ConstData() >= 0)
     cost = 0;
 
 #ifdef TRAFF_STAT_WITH_PORTS
@@ -860,7 +857,8 @@ sessionDownload[dir] += len;
 
 //Add detailed stat
 
-if (!writeFreeMbTraffCost && freeMb.ConstData() >= 0)
+if (!settings->GetWriteFreeMbTraffCost() &&
+     freeMb.ConstData() >= 0)
     cost = 0;
 
 #ifdef TRAFF_STAT_WITH_PORTS

diff --git a/projects/stargazer/user.h b/projects/stargazer/user.h
index 3472ba4b6334248bdcd4f65e3391ccb2953433b5..1c84ba1ca5e8b3c9b00f9baf22a3b1d0d131e7d4 100644 (file)
--- a/projects/stargazer/user.h
+++ b/projects/stargazer/user.h
@@ -248,8 +248,6 @@ private:
     time_t          lastWriteStat;           // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
     time_t          lastWriteDeatiledStat;   // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
 
-    bool            writeFreeMbTraffCost;
-
     // Properties
     USER_PROPERTY<double>         & cash;
     USER_PROPERTY<DIR_TRAFF>      & up;