diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-16 12:44:38 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-16 12:44:38 +0000 |
| commit | 907116c051e995a6a593743c7a6dfdece747c2c0 (patch) | |
| tree | 59d079cb818382ae09840da99e3be1b58abffff5 /src/core | |
| parent | bec34b3f632d179368f00b49e984ac576f14fad4 (diff) | |
code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@8133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdaway/awaymsg.cpp | 8 | ||||
| -rw-r--r-- | src/core/stdemail/email.cpp | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp index e52709a35f..bfdcc52ada 100644 --- a/src/core/stdaway/awaymsg.cpp +++ b/src/core/stdaway/awaymsg.cpp @@ -131,18 +131,18 @@ static INT_PTR GetMessageCommand(WPARAM wParam, LPARAM) return 0;
}
-static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM)
+static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM)
{
TCHAR str[128];
- char *szProto = GetContactProto(wParam);
+ char *szProto = GetContactProto(hContact);
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_HIDDEN | CMIF_TCHAR;
if (szProto != NULL) {
- int chatRoom = szProto ? db_get_b(wParam, szProto, "ChatRoom", 0) : 0;
+ int chatRoom = szProto ? db_get_b(hContact, szProto, "ChatRoom", 0) : 0;
if ( !chatRoom) {
- int status = db_get_w(wParam, szProto, "Status", ID_STATUS_OFFLINE);
+ int status = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
mir_sntprintf(str, SIZEOF(str), TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(status, 0));
mi.ptszName = str;
if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) {
diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 9cd254783d..23ae28da48 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.cpp @@ -32,12 +32,12 @@ void SendEmailThread(void *szUrl) return;
}
-static INT_PTR SendEMailCommand(WPARAM wParam, LPARAM lParam)
+static INT_PTR SendEMailCommand(WPARAM hContact, LPARAM lParam)
{
DBVARIANT dbv;
- char *szProto = GetContactProto(wParam);
- if (szProto == NULL || db_get_s(wParam, szProto, "e-mail", &dbv)) {
- if (db_get_s(wParam, "UserInfo", "Mye-mail0", &dbv)) {
+ char *szProto = GetContactProto(hContact);
+ if (szProto == NULL || db_get_s(hContact, szProto, "e-mail", &dbv)) {
+ if (db_get_s(hContact, "UserInfo", "Mye-mail0", &dbv)) {
MessageBox((HWND)lParam, TranslateT("User has not registered an e-mail address"), TranslateT("Send e-mail"), MB_OK);
return 1;
}
@@ -50,13 +50,13 @@ static INT_PTR SendEMailCommand(WPARAM wParam, LPARAM lParam) return 0;
}
-static int EMailPreBuildMenu(WPARAM wParam, LPARAM)
+static int EMailPreBuildMenu(WPARAM hContact, LPARAM)
{
bool bEnabled = true;
DBVARIANT dbv = { 0 };
- char *szProto = GetContactProto(wParam);
- if (szProto == NULL || db_get_s(wParam, szProto, "e-mail", &dbv))
- if (db_get_s(wParam, "UserInfo", "Mye-mail0", &dbv))
+ char *szProto = GetContactProto(hContact);
+ if (szProto == NULL || db_get_s(hContact, szProto, "e-mail", &dbv))
+ if (db_get_s(hContact, "UserInfo", "Mye-mail0", &dbv))
bEnabled = false;
Menu_ShowItem(hEMailMenuItem, bEnabled);
|