From 97d992fe41e7eaafba3e5700861b0e098a8f6080 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 23 Feb 2013 20:01:17 +0000
Subject: useless variable m_szProtoName removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@3740 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Tlen/src/jabber_opt.cpp    | 2 +-
 protocols/Tlen/src/jabber_svc.cpp    | 6 +-----
 protocols/Tlen/src/jabber_thread.cpp | 4 ++--
 protocols/Tlen/src/tlen.cpp          | 6 +++---
 protocols/Tlen/src/tlen_muc.cpp      | 4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'protocols/Tlen/src')

diff --git a/protocols/Tlen/src/jabber_opt.cpp b/protocols/Tlen/src/jabber_opt.cpp
index 297ac34cae..6f71238db9 100644
--- a/protocols/Tlen/src/jabber_opt.cpp
+++ b/protocols/Tlen/src/jabber_opt.cpp
@@ -669,7 +669,7 @@ static INT_PTR CALLBACK TlenPopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 					} else {
 						delay=GetDlgItemInt(hwndDlg, IDC_DELAY, NULL, FALSE);
 					}
-					_snprintf(title, sizeof(title), Translate("%s mail"), proto->m_szProtoName);
+					_snprintf(title, sizeof(title), Translate("%s mail"), proto->m_szModuleName);
 					MailPopupPreview((DWORD) SendDlgItemMessage(hwndDlg,IDC_COLORBKG,CPM_GETCOLOUR,0,0),
 									(DWORD) SendDlgItemMessage(hwndDlg,IDC_COLORTXT,CPM_GETCOLOUR,0,0),
 									title,
diff --git a/protocols/Tlen/src/jabber_svc.cpp b/protocols/Tlen/src/jabber_svc.cpp
index b0a284c9e1..a064aeb591 100644
--- a/protocols/Tlen/src/jabber_svc.cpp
+++ b/protocols/Tlen/src/jabber_svc.cpp
@@ -60,7 +60,7 @@ DWORD_PTR __cdecl TlenProtocol::GetCaps(int type, HANDLE hContact)
 INT_PTR TlenGetName(void *ptr, LPARAM wParam, LPARAM lParam)
 {
 	TlenProtocol *proto = (TlenProtocol *)ptr;
-	strncpy((char *) lParam, proto->m_szProtoName, wParam);
+	strncpy((char*)lParam, proto->m_szModuleName, wParam);
 	return 0;
 }
 
@@ -1277,10 +1277,6 @@ TlenProtocol::TlenProtocol( const char* aProtoName, const TCHAR* aUserName )
 {
 	ProtoConstructor(this, aProtoName, aUserName);
 
-	m_szProtoName = mir_strdup(aProtoName);
-	_strlwr( m_szProtoName );
-	m_szProtoName[0] = toupper( m_szProtoName[0] );
-
 	TlenInitServicesVTbl(this);
 
 	InitializeCriticalSection(&modeMsgMutex);
diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/jabber_thread.cpp
index 6daf6ce0f3..36459ac744 100644
--- a/protocols/Tlen/src/jabber_thread.cpp
+++ b/protocols/Tlen/src/jabber_thread.cpp
@@ -983,7 +983,7 @@ static void TlenProcessW(XmlNode *node, ThreadData *info)
 	if ((f=JabberXmlGetAttrValue(node, "f")) != NULL) {
 
 		char webContactName[128];
-		sprintf(webContactName, Translate("%s Web Messages"), info->proto->m_szProtoName);
+		sprintf(webContactName, Translate("%s Web Messages"), info->proto->m_szModuleName);
 		if ((hContact=JabberHContactFromJID(info->proto, webContactName)) == NULL) {
 			hContact = JabberDBCreateContact(info->proto, webContactName, webContactName, TRUE);
 		}
@@ -1198,7 +1198,7 @@ static void TlenProcessN(XmlNode *node, ThreadData *info)
 		str = NULL;
 		strSize = 0;
 
-		JabberStringAppend(&str, &strSize, Translate("%s mail"), info->proto->m_szProtoName);
+		JabberStringAppend(&str, &strSize, Translate("%s mail"), info->proto->m_szModuleName);
 		popupTitle = JabberTextDecode(str);
 		mir_free(str);
 
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 523f4ea0f3..4b392137e0 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -295,11 +295,11 @@ int TlenOnModulesLoaded(void *ptr, WPARAM wParam, LPARAM lParam)
 	}
 	TlenMUCInit(proto);
 	sprintf(str, "%s", LPGEN("Incoming mail"));
-	SkinAddNewSoundEx("TlenMailNotify", proto->m_szProtoName, str);
+	SkinAddNewSoundEx("TlenMailNotify", proto->m_szModuleName, str);
 	sprintf(str, "%s", LPGEN("Alert"));
-	SkinAddNewSoundEx("TlenAlertNotify", proto->m_szProtoName, str);
+	SkinAddNewSoundEx("TlenAlertNotify", proto->m_szModuleName, str);
 	sprintf(str, "%s", LPGEN("Voice chat"));
-	SkinAddNewSoundEx("TlenVoiceNotify", proto->m_szProtoName, str);
+	SkinAddNewSoundEx("TlenVoiceNotify", proto->m_szModuleName, str);
 
 	HookEventObj_Ex(ME_USERINFO_INITIALISE, proto, TlenUserInfoInit);
 
diff --git a/protocols/Tlen/src/tlen_muc.cpp b/protocols/Tlen/src/tlen_muc.cpp
index 6990b7e9aa..d28c4ed37b 100644
--- a/protocols/Tlen/src/tlen_muc.cpp
+++ b/protocols/Tlen/src/tlen_muc.cpp
@@ -671,7 +671,7 @@ int TlenMUCCreateWindow(TlenProtocol *proto, const char *roomID, const char *roo
 	mucw.cbSize = sizeof(MUCCWINDOW);
 	mucw.iType = MUCC_WINDOW_CHATROOM;
 	mucw.pszModule = proto->m_szModuleName;
-	mucw.pszModuleName = proto->m_szProtoName;
+	mucw.pszModuleName = proto->m_szModuleName;
 	mucw.pszID = roomID;
 	mucw.pszName = roomName;
 	mucw.pszNick = nick;
@@ -1041,7 +1041,7 @@ INT_PTR TlenMUCMenuHandleChats(void *ptr, LPARAM wParam, LPARAM lParam)
 	mucw.cbSize = sizeof(MUCCWINDOW);
 	mucw.iType = MUCC_WINDOW_CHATLIST;
 	mucw.pszModule = proto->m_szModuleName;
-	mucw.pszModuleName = proto->m_szProtoName;
+	mucw.pszModuleName = proto->m_szModuleName;
 	CallService(MS_MUCC_NEW_WINDOW, 0, (LPARAM) &mucw);
 	return 0;
 }
-- 
cgit v1.2.3