diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-05 16:54:27 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-05 16:54:27 +0000 |
| commit | b665a90f50f09435aef5bc3b5b9da710e4558690 (patch) | |
| tree | 3053606dcddc1b15f73e7af1fb2507afbf20f052 /plugins/TabSRMM/src/chat/services.cpp | |
| parent | 6c01981a8452577f3751298c7cdbe59b3ae81d51 (diff) | |
various menu items quirks, simplifications & optimization
git-svn-id: http://svn.miranda-ng.org/main/trunk@4319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/chat/services.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/chat/services.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp index c3a1ada839..bcd2cc9452 100644 --- a/plugins/TabSRMM/src/chat/services.cpp +++ b/plugins/TabSRMM/src/chat/services.cpp @@ -40,7 +40,8 @@ CRITICAL_SECTION cs; HANDLE hSendEvent;
HANDLE hBuildMenuEvent;
-HANDLE hJoinMenuItem, hLeaveMenuItem;
+
+HGENMENU hJoinMenuItem, hLeaveMenuItem;
static HANDLE
hServiceRegister = NULL,
@@ -458,8 +459,8 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT else lstrcpyn(newcontactname, _T("_U_"), SIZEOF(newcontactname));
char *szProto = GetContactProto(newData.hContact);
- WORD wStatus = szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord((HANDLE) newData.hContact, szProto, "Status", ID_STATUS_OFFLINE);
- char *szStatus = (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto == NULL ? ID_STATUS_OFFLINE : DBGetContactSettingWord((HANDLE)newData.hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);
+ WORD wStatus = szProto == NULL ? ID_STATUS_OFFLINE : db_get_w((HANDLE) newData.hContact, szProto, "Status", ID_STATUS_OFFLINE);
+ char *szStatus = (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w((HANDLE)newData.hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);
newData.item.pszText = newcontactname;
newData.item.mask = TCIF_TEXT | TCIF_IMAGE | TCIF_PARAM;
|