From 8bbf210610804623aa581f3a547fc782fed9c118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Sun, 19 May 2013 12:36:06 +0000 Subject: "PopUp" everywhere was replaced to "Popup" git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/crypt.h | 18 +++++------ plugins/SecureIM/src/crypt_dll.cpp | 4 +-- plugins/SecureIM/src/crypt_popups.cpp | 36 +++++++++++----------- plugins/SecureIM/src/popupOptions.cpp | 8 ++--- plugins/SecureIM/src/svcs_clist.cpp | 4 +-- plugins/SecureIM/src/svcs_proto.cpp | 58 +++++++++++++++++------------------ plugins/SecureIM/src/svcs_rsa.cpp | 10 +++--- 7 files changed, 69 insertions(+), 69 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index c3f79bcd6b..a2ec230e48 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -133,15 +133,15 @@ void ShowStatusIconNotify(HANDLE); // crypt_popups.cpp //static int CALLBACK PopupDlgProc(HWND,UINT,WPARAM,LPARAM); -void showPopUp(LPCSTR,HANDLE,HICON,UINT); -void showPopUpEC(HANDLE); -void showPopUpDCmsg(HANDLE,LPCSTR); -void showPopUpDC(HANDLE); -void showPopUpKS(HANDLE); -void showPopUpKRmsg(HANDLE,LPCSTR); -void showPopUpKR(HANDLE); -void showPopUpSM(HANDLE); -void showPopUpRM(HANDLE); +void showPopup(LPCSTR,HANDLE,HICON,UINT); +void showPopupEC(HANDLE); +void showPopupDCmsg(HANDLE,LPCSTR); +void showPopupDC(HANDLE); +void showPopupKS(HANDLE); +void showPopupKRmsg(HANDLE,LPCSTR); +void showPopupKR(HANDLE); +void showPopupSM(HANDLE); +void showPopupRM(HANDLE); // crypt_meta.cpp BOOL isProtoMetaContacts(HANDLE); diff --git a/plugins/SecureIM/src/crypt_dll.cpp b/plugins/SecureIM/src/crypt_dll.cpp index c98d6e8489..4b3c73c088 100644 --- a/plugins/SecureIM/src/crypt_dll.cpp +++ b/plugins/SecureIM/src/crypt_dll.cpp @@ -104,11 +104,11 @@ BOOL CalculateKeyX(pUinKey ptr,HANDLE hContact) { CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); // key exchange is finished - showPopUpEC(ptr->hContact); + showPopupEC(ptr->hContact); } else { // agree value problem - showPopUp(sim002,hContact,g_hPOP[POP_PU_DIS],0); + showPopup(sim002,hContact,g_hPOP[POP_PU_DIS],0); } return agr != 0; } diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp index 721dafd0b5..b584f5902d 100644 --- a/plugins/SecureIM/src/crypt_popups.cpp +++ b/plugins/SecureIM/src/crypt_popups.cpp @@ -1,6 +1,6 @@ #include "commonheaders.h" -void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) +void showPopup(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) { //type=0 key colors //type=1 session colors @@ -49,56 +49,56 @@ void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) ppd.colorBack = colorBack; ppd.colorText = colorText; ppd.iSeconds = timeout; - PUAddPopUpW(&ppd); + PUAddPopupW(&ppd); } -void showPopUpDCmsg(HANDLE hContact,LPCSTR msg) +void showPopupDCmsg(HANDLE hContact,LPCSTR msg) { if (db_get_b(0, MODULENAME, "dc", 1)) - showPopUp(msg, hContact, g_hPOP[POP_PU_DIS], 1); + showPopup(msg, hContact, g_hPOP[POP_PU_DIS], 1); } -void showPopUpDC(HANDLE hContact) +void showPopupDC(HANDLE hContact) { if (db_get_b(0, MODULENAME, "dc", 1)) - showPopUp(sim006, hContact, g_hPOP[POP_PU_DIS], 1); + showPopup(sim006, hContact, g_hPOP[POP_PU_DIS], 1); } -void showPopUpEC(HANDLE hContact) +void showPopupEC(HANDLE hContact) { if (db_get_b(0, MODULENAME, "ec", 1)) - showPopUp(sim001, hContact, g_hPOP[POP_PU_EST], 1); + showPopup(sim001, hContact, g_hPOP[POP_PU_EST], 1); } -void showPopUpKS(HANDLE hContact) +void showPopupKS(HANDLE hContact) { if (db_get_b(0, MODULENAME, "ks",1)) - showPopUp(sim007, hContact, g_hPOP[POP_PU_PRC], 0); + showPopup(sim007, hContact, g_hPOP[POP_PU_PRC], 0); } -void showPopUpKRmsg(HANDLE hContact,LPCSTR msg) +void showPopupKRmsg(HANDLE hContact,LPCSTR msg) { if (db_get_b(0, MODULENAME, "kr", 1)) - showPopUp(msg, hContact, g_hPOP[POP_PU_PRC], 0); + showPopup(msg, hContact, g_hPOP[POP_PU_PRC], 0); } -void showPopUpKR(HANDLE hContact) +void showPopupKR(HANDLE hContact) { if (db_get_b(0, MODULENAME, "kr", 1)) - showPopUp(sim008, hContact, g_hPOP[POP_PU_PRC], 0); + showPopup(sim008, hContact, g_hPOP[POP_PU_PRC], 0); } -void showPopUpSM(HANDLE hContact) +void showPopupSM(HANDLE hContact) { if (db_get_b(0, MODULENAME, "ss", 0)) - showPopUp(sim009, hContact, g_hPOP[POP_PU_MSS], 2); + showPopup(sim009, hContact, g_hPOP[POP_PU_MSS], 2); SkinPlaySound("OutgoingSecureMessage"); } -void showPopUpRM(HANDLE hContact) +void showPopupRM(HANDLE hContact) { if (db_get_b(0, MODULENAME, "sr", 0)) - showPopUp(sim010, hContact, g_hPOP[POP_PU_MSR], 2); + showPopup(sim010, hContact, g_hPOP[POP_PU_MSR], 2); SkinPlaySound("IncomingSecureMessage"); } diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index e25403582c..9195ed7cb7 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -81,9 +81,9 @@ INT_PTR CALLBACK PopOptionsDlgProc(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l switch (LOWORD(wParam)) { case IDC_PREV: //preview popups... - showPopUp(LPGEN("Key Popup"),NULL,g_hPOP[POP_PU_PRC],0); - showPopUp(LPGEN("Secure Popup"),NULL,g_hPOP[POP_PU_EST],1); - showPopUp(LPGEN("Message Popup"),NULL,g_hPOP[POP_PU_MSR],2); + showPopup(LPGEN("Key Popup"),NULL,g_hPOP[POP_PU_PRC],0); + showPopup(LPGEN("Secure Popup"),NULL,g_hPOP[POP_PU_EST],1); + showPopup(LPGEN("Message Popup"),NULL,g_hPOP[POP_PU_MSR],2); break; case IDC_EC: //set ec checkbox value @@ -166,7 +166,7 @@ int onRegisterPopOptions(WPARAM wParam, LPARAM) odp.hInstance = g_hInst; odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP); odp.pszTitle = (char*)MODULENAME; - odp.pszGroup = LPGEN("PopUps"); + odp.pszGroup = LPGEN("Popups"); odp.pfnDlgProc = PopOptionsDlgProc; Options_AddPage(wParam, &odp); } diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index 3524f78775..b2af53bb19 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -14,12 +14,12 @@ int __cdecl onContactSettingChanged(WPARAM wParam,LPARAM lParam) { if (stat == ID_STATUS_OFFLINE) { // go offline if (ptr->mode == MODE_NATIVE && cpp_keyx(ptr->cntx)) { // have active context cpp_delete_context(ptr->cntx); ptr->cntx=0; // reset context - showPopUpDC(hContact); // show popup "Disabled" + showPopupDC(hContact); // show popup "Disabled" ShowStatusIconNotify(hContact); // change icon in CL } else if (ptr->mode == MODE_RSAAES && exp->rsa_get_state(ptr->cntx) == 7) { deleteRSAcntx(ptr); - showPopUpDC(hContact); // show popup "Disabled" + showPopupDC(hContact); // show popup "Disabled" ShowStatusIconNotify(hContact); // change icon in CL } } diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index f1366e1521..633812e802 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -121,7 +121,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE; CallService(MS_PROTO_CHAINSEND, wParam, lParam); - showPopUp(sim003,pccsd->hContact,g_hPOP[POP_PU_DIS],0); + showPopup(sim003,pccsd->hContact,g_hPOP[POP_PU_DIS],0); } else { createRSAcntx(ptr); @@ -194,7 +194,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ppre->szMessage = szMsgUtf; // show decoded message - showPopUpRM(ptr->hContact); + showPopupRM(ptr->hContact); SAFE_FREE(ptr->msgSplitted); pccsd->wParam |= PREF_SIMNOMETA; return CallService(MS_PROTO_CHAINRECV, wParam, lParam); @@ -217,7 +217,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) createRSAcntx(ptr); loadRSAkey(ptr); if (exp->rsa_get_state(ptr->cntx) == 0 ) - showPopUpKR(ptr->hContact); + showPopupKR(ptr->hContact); { LPSTR szOldMsg = exp->rsa_recv(ptr->cntx,szEncMsg); @@ -229,7 +229,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ppre->szMessage = szNewMsg; // show decoded message - showPopUpRM(ptr->hContact); + showPopupRM(ptr->hContact); SAFE_FREE(ptr->msgSplitted); pccsd->wParam |= PREF_SIMNOMETA; return CallService(MS_PROTO_CHAINRECV, wParam, lParam); @@ -265,8 +265,8 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->lParam = (LPARAM)(char*)keyToSend; CallService(MS_PROTO_CHAINSEND, wParam, lParam); // send new key - showPopUp(sim005,NULL,g_hPOP[POP_PU_DIS],0); - showPopUpKS(ptr->hContact); + showPopup(sim005,NULL,g_hPOP[POP_PU_DIS],0); + showPopupKS(ptr->hContact); return 1; } break; @@ -302,8 +302,8 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) if (cpp_keyx(ptr->cntx)) { // decrypt sended back message and save message for future sending with a new secret key addMsg2Queue(ptr, pccsd->wParam, ptrA(decodeMsg(ptr,(LPARAM)pccsd,szEncMsg))); - showPopUpRM(ptr->hContact); - showPopUp(sim004,NULL,g_hPOP[POP_PU_DIS],0); + showPopupRM(ptr->hContact); + showPopup(sim004,NULL,g_hPOP[POP_PU_DIS],0); } return 1; // don't display it ... @@ -314,7 +314,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) // other user has disabled SecureIM with you cpp_delete_context(ptr->cntx); ptr->cntx=0; - showPopUpDC(ptr->hContact); + showPopupDC(ptr->hContact); ShowStatusIconNotify(ptr->hContact); waitForExchange(ptr,3); // дослать нешифрованно @@ -336,7 +336,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYR received"); // receive KeyB from user; - showPopUpKR(ptr->hContact); + showPopupKR(ptr->hContact); if (ptr->cntx && cpp_keyb(ptr->cntx)) { // reinit key exchange if an old key from user is found @@ -347,7 +347,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYR InitKeyB error"); // tell to the other side that we have the plugin disabled with him - showPopUp(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0); + showPopup(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0); ShowStatusIconNotify(ptr->hContact); waitForExchange(ptr,3); // дослать нешифрованно @@ -364,7 +364,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) loadRSAkey(ptr); exp->rsa_connect(ptr->cntx); - showPopUpKS(pccsd->hContact); + showPopupKS(pccsd->hContact); ShowStatusIconNotify(pccsd->hContact); return 1; } @@ -381,7 +381,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE; CallService(MS_PROTO_CHAINSEND, wParam, lParam); - showPopUpKS(ptr->hContact); + showPopupKS(ptr->hContact); waitForExchange(ptr); // запустим ожидание return 1; } @@ -396,7 +396,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE; CallService(MS_PROTO_CHAINSEND, wParam, lParam); - showPopUpKS(ptr->hContact); + showPopupKS(ptr->hContact); } break; @@ -404,14 +404,14 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYA received"); // receive KeyA from user; - showPopUpKR(ptr->hContact); + showPopupKR(ptr->hContact); cpp_reset_context(ptr->cntx); if (InitKeyB(ptr,szEncMsg) != CPP_ERROR_NONE) { Sent_NetLog("onRecvMsg: SiG_KEYA InitKeyB error"); // tell to the other side that we have the plugin disabled with him - showPopUp(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0); + showPopup(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0); ShowStatusIconNotify(ptr->hContact); waitForExchange(ptr,3); // дослать нешифрованно @@ -432,14 +432,14 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYB received"); // receive KeyB from user; - showPopUpKR(ptr->hContact); + showPopupKR(ptr->hContact); // clear all and send DISA if received KeyB, and not exist KeyA or error on InitKeyB if (!cpp_keya(ptr->cntx) || InitKeyB(ptr,szEncMsg) != CPP_ERROR_NONE) { Sent_NetLog("onRecvMsg: SiG_KEYB InitKeyB error"); // tell to the other side that we have the plugin disabled with him - showPopUp(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0); + showPopup(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0); ShowStatusIconNotify(ptr->hContact); cpp_reset_context(ptr->cntx); @@ -464,7 +464,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) // receive message if (cpp_keyx(ptr->cntx) && (ssig == SiG_ENON||ssig == SiG_ENOF)) { Sent_NetLog("onRecvMsg: message received"); - showPopUpRM(ptr->hContact); + showPopupRM(ptr->hContact); } Sent_NetLog("onRecvMsg: exit"); @@ -523,7 +523,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) // отправляем зашифрованное сообщение splitMessageSend(ptr,szNewMsg); - showPopUpSM(ptr->hContact); + showPopupSM(ptr->hContact); return returnNoError(pccsd->hContact); } @@ -560,7 +560,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) // шлем шифрованное в оффлайн exp->rsa_send(ptr->cntx, ptrA( miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam))); - showPopUpSM(ptr->hContact); + showPopupSM(ptr->hContact); return returnNoError(pccsd->hContact); } @@ -593,7 +593,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) if (ptr->cntx && exp->rsa_get_state(ptr->cntx) == 7) { exp->rsa_send(ptr->cntx, ptrA(miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam))); ShowStatusIconNotify(ptr->hContact); - showPopUpSM(ptr->hContact); + showPopupSM(ptr->hContact); return returnNoError(pccsd->hContact); } @@ -612,7 +612,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) createRSAcntx(ptr); loadRSAkey(ptr); exp->rsa_connect(ptr->cntx); - showPopUpKS(pccsd->hContact); + showPopupKS(pccsd->hContact); ShowStatusIconNotify(pccsd->hContact); return returnNoError(pccsd->hContact); } @@ -645,7 +645,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) ccsd.szProtoService = PSS_MESSAGE; CallService(MS_PROTO_CHAINSEND, wParam, (LPARAM)&ccsd); - showPopUpDC(pccsd->hContact); + showPopupDC(pccsd->hContact); ShowStatusIconNotify(pccsd->hContact); } return CallService(MS_PROTO_CHAINSEND, wParam, lParam); @@ -723,7 +723,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) pccsd->wParam |= PREF_METANODB; CallService(MS_PROTO_CHAINSEND, wParam, lParam); - showPopUpDC(pccsd->hContact); + showPopupDC(pccsd->hContact); ShowStatusIconNotify(pccsd->hContact); } return returnNoError(pccsd->hContact); @@ -746,7 +746,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE; int ret = CallService(MS_PROTO_CHAINSEND, wParam, lParam); - showPopUpSM(ptr->hContact); + showPopupSM(ptr->hContact); return ret; } @@ -768,7 +768,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE; CallService(MS_PROTO_CHAINSEND, wParam, lParam); - showPopUpKS(pccsd->hContact); + showPopupKS(pccsd->hContact); ShowStatusIconNotify(pccsd->hContact); waitForExchange(ptr); // запускаем ожидание @@ -807,7 +807,7 @@ INT_PTR __cdecl onSendFile(WPARAM wParam, LPARAM lParam) char buf[MAX_PATH]; sprintf(buf,"%s\n%s",Translate(sim011),file[i]); - showPopUp(buf,NULL,g_hPOP[POP_PU_MSS],2); + showPopup(buf,NULL,g_hPOP[POP_PU_MSS],2); if (ptr->mode == MODE_RSAAES) exp->rsa_encrypt_file(ptr->cntx,file[i],file_out); @@ -902,7 +902,7 @@ int __cdecl onProtoAck(WPARAM wParam,LPARAM lParam) } sprintf(buf,"%s\n%s",Translate(sim012),file_out); - showPopUp(buf,NULL,g_hPOP[POP_PU_MSR],2); + showPopup(buf,NULL,g_hPOP[POP_PU_MSR],2); if (ptr->mode == MODE_RSAAES ) exp->rsa_decrypt_file(ptr->cntx,ptr->lastFileRecv,file_out); diff --git a/plugins/SecureIM/src/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp index d065d0b397..a55a393875 100644 --- a/plugins/SecureIM/src/svcs_rsa.cpp +++ b/plugins/SecureIM/src/svcs_rsa.cpp @@ -52,7 +52,7 @@ int __cdecl rsa_check_pub(HANDLE context, PBYTE pub, int pubLen, PBYTE sig, int if (bAAK) { if (k ) mir_snprintf(msg,MSGSIZE,Translate(sim523),cnm,uin,sha,sha_old); else mir_snprintf(msg,MSGSIZE,Translate(sim521),cnm,uin,sha); - showPopUpKRmsg(ptr->hContact,msg); + showPopupKRmsg(ptr->hContact,msg); HistoryLog(ptr->hContact,msg); v = 1; #if defined(_DEBUG) || defined(NETLIB_LOG) @@ -94,7 +94,7 @@ void __cdecl rsa_notify(HANDLE context, int state) switch( state) { case 1: - showPopUpEC(ptr->hContact); + showPopupEC(ptr->hContact); ShowStatusIconNotify(ptr->hContact); waitForExchange(ptr,2); // досылаем сообщения из очереди return; @@ -125,7 +125,7 @@ void __cdecl rsa_notify(HANDLE context, int state) { char buf[1024]; sprintf(buf,sim510,-state); - showPopUpDCmsg(ptr->hContact,buf); + showPopupDCmsg(ptr->hContact,buf); ShowStatusIconNotify(ptr->hContact); if (ptr->cntx) deleteRSAcntx(ptr); waitForExchange(ptr,3); // досылаем нешифровано @@ -134,7 +134,7 @@ void __cdecl rsa_notify(HANDLE context, int state) case -3: // соединение разорвано вручную case -4: // соединение разорвано вручную другой стороной - showPopUpDC(ptr->hContact); + showPopupDC(ptr->hContact); ShowStatusIconNotify(ptr->hContact); if (ptr->cntx) deleteRSAcntx(ptr); waitForExchange(ptr,3); // досылаем нешифровано @@ -143,7 +143,7 @@ void __cdecl rsa_notify(HANDLE context, int state) default: return; } - showPopUpDCmsg(ptr->hContact,msg); + showPopupDCmsg(ptr->hContact,msg); ShowStatusIconNotify(ptr->hContact); if (ptr->cntx) deleteRSAcntx(ptr); waitForExchange(ptr,3); // досылаем нешифровано -- cgit v1.2.3