fix for #616 and fix for missing status indication on avatar download

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3609 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 13 insertions, 6 deletions

diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index b7bb460fa..04f557a91 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -791,6 +791,13 @@ void KviIconManager::urlToCachedFileName(QString &szFName)
 	szFName.replace(")","_");
 	szFName.replace("?","_");
 	szFName.replace("___",".");
+	//cut filenames to 255 chars, trying to preserve file name/extension (bug #616)
+	if(szFName.size()>255)
+	{
+		QString ext = szFName.right(55);
+		szFName.truncate(200);
+		szFName.append(ext);
+	}
 }
 
 KviAvatar * KviIconManager::getAvatar(const QString &szLocalPath,const QString &szName)
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index f4d21fd7a..f3bacd9f4 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -148,7 +148,7 @@ KviAvatarDownloadDialog::~KviAvatarDownloadDialog()
 void KviAvatarDownloadDialog::startDownload()
 {
 	connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(downloadTerminated(bool)));
-	connect(m_pRequest,SIGNAL(status(const char *)),this,SLOT(downloadMessage(const char *)));
+	connect(m_pRequest,SIGNAL(status(const QString &)),this,SLOT(downloadMessage(const QString &)));
 
 	QString tmp = m_szUrl;
 	g_pIconManager->urlToCachedFileName(tmp);
@@ -175,14 +175,14 @@ void KviAvatarDownloadDialog::cancelClicked()
 	reject();
 }
 
-void KviAvatarDownloadDialog::downloadMessage(const char * message)
+void KviAvatarDownloadDialog::downloadMessage(const QString &szMsg)
 {
-	if(message)
+	if(!szMsg.isEmpty())
 	{
 		QString txt = "<center>";
-		txt += message;
+		txt += szMsg;
 		txt += "</center>";
-		m_pOutput->setText(message);
+		m_pOutput->setText(szMsg);
 	}
 }
 
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index e83bb635d..ae9b69a35 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -98,7 +98,7 @@ protected slots:
 	void startDownload();
 	void cancelClicked();
 	void downloadTerminated(bool bSuccess);
-	void downloadMessage(const char * msg);
+	void downloadMessage(const QString &szMsg);
 };