From: APTX <marek321@gmail.com>
Date: Sat, 9 Jun 2012 17:11:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://aptx.org/var/git/localmylist
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=e7f90c84653ae35dd3f8624ec3212407116fa1b2;p=localmylist.git

Merge branch 'master' of ssh://aptx.org/var/git/localmylist

Conflicts:
	anioni/anioni.cpp
---

e7f90c84653ae35dd3f8624ec3212407116fa1b2
diff --cc anioni/anioni.cpp
index 2a9daab,117581c..7a704fd
--- a/anioni/anioni.cpp
+++ b/anioni/anioni.cpp
@@@ -13,49 -12,12 +13,49 @@@ AniOni::AniOni(int argc, char **argv) 
  	setServiceFlags(QtServiceBase::CanBeSuspended);
  }
  
 +void AniOni::handleUdpClientError()
 +{
 +	using namespace AniDBUdpClient;
 +
 +	qDebug() << "ERROR CODE" << Client::instance()->error();
 +	LocalMyList::instance()->database()->log(tr("UDP Client connection error: %1")
 +											 .arg(Client::instance()->errorString()), 3);
 +
 +	switch (Client::instance()->error())
 +	{
 +		case NoError:
 +		break;
 +
 +		case HostLookupError:
 +			Client::instance()->clearErrors();
 +			QTimer::singleShot(1000, Client::instance(), SLOT(connect()));
 +		break;
 +
 +		case BannedError:
 +		case ServerError:
 +		case ConnectionTimedOutError:
 +			Client::instance()->clearErrors();
 +			QTimer::singleShot(1000 * 60 * 40, Client::instance(), SLOT(connect()));
 +		break;
 +
 +		case BindError:
 +		case AuthenticationError:
 +		case ClientBannedError:
 +		case EncryptionError:
 +		case UnknownError:
 +		default:
 +			qWarning("Unrecoverable connection error");
 +			application()->exit(1);
 +			return;
 +		break;
 +	}
 +}
 +
  void AniOni::start()
  {
- #ifdef Q_OS_WIN
+ #if defined(Q_OS_WIN)
  	QSettings s(QDir::currentPath() + "/anioni.ini", QSettings::IniFormat);
- #elif Q_OS_UNIX
 -	qDebug() << "Reading" << s.fileName();
+ #elif defined(Q_OS_UNIX)
  	QSettings s("/etc/anioni/anioni.ini", QSettings::IniFormat);
  #else
  	QSettings s(QSettings::IniFormat, QSettings::SystemScope, "anioni", "anioni");