From: Maxim Mamontov <faust@gts.dp.ua>
Date: Wed, 9 Feb 2011 13:03:48 +0000 (+0200)
Subject: Merge branch 'master' of madf.dyndns.org:/var/git/stg
X-Git-Tag: 2.407-rc3~177
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/ae9b0cc33f5d93f5bf7c012dfd196115f930c5a5?hp=11d897be5d61ab7313c8cb2c7d9f7fe4183d4416

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

diff --git a/.gitignore b/.gitignore
index 5fc35256..991874f0 100644
--- 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 6e77f0a5..38bab82c 100644
--- 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 3472ba4b..1c84ba1c 100644
--- 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;