diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-20 17:00:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-20 17:00:14 +0000 |
| commit | 30ab6ceb71842f003f649b3d62b89af010cf40d1 (patch) | |
| tree | b1dae7a6d545cdf622a165ba4c576d3a41d71221 /protocols/JabberG/jabber_menu.cpp | |
| parent | 65461e7b4edb683cc09086fdaf49e0c2ef918bd4 (diff) | |
- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;
- obsolete structure SKINSOUNDDESC removed
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_menu.cpp')
| -rw-r--r-- | protocols/JabberG/jabber_menu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/jabber_menu.cpp index e544102dec..b489a793d8 100644 --- a/protocols/JabberG/jabber_menu.cpp +++ b/protocols/JabberG/jabber_menu.cpp @@ -459,7 +459,7 @@ int CJabberProto::OnPrebuildContactMenu( WPARAM wParam, LPARAM ) int nMenuResourceItemsNew = m_nMenuResourceItems;
if ( m_nMenuResourceItems < item->resourceCount ) {
- m_phMenuResourceItems = (HANDLE *)mir_realloc( m_phMenuResourceItems, item->resourceCount * sizeof(HANDLE) );
+ m_phMenuResourceItems = (HANDLE *)mir_realloc( m_phMenuResourceItems, item->resourceCount * sizeof(HANDLE));
nMenuResourceItemsNew = item->resourceCount;
}
@@ -553,11 +553,11 @@ INT_PTR __cdecl CJabberProto::OnMenuRosterAdd( WPARAM wParam, LPARAM ) if ( ListGetItemPtr( LIST_ROSTER, roomID ) == NULL ) {
TCHAR *nick = 0;
TCHAR *group = 0;
- if ( !DBGetContactSettingTString( ( HANDLE ) wParam, "CList", "Group", &dbv ) ) {
+ if ( !DBGetContactSettingTString( ( HANDLE ) wParam, "CList", "Group", &dbv )) {
group = mir_tstrdup(dbv.ptszVal);
JFreeVariant( &dbv );
}
- if ( !JGetStringT( ( HANDLE ) wParam, "Nick", &dbv ) ) {
+ if ( !JGetStringT( ( HANDLE ) wParam, "Nick", &dbv )) {
nick = mir_tstrdup(dbv.ptszVal);
JFreeVariant( &dbv );
}
@@ -572,7 +572,7 @@ INT_PTR __cdecl CJabberProto::OnMenuRosterAdd( WPARAM wParam, LPARAM ) ZeroMemory( item, sizeof( JABBER_LIST_ITEM ));
item->jid = mir_tstrdup(roomID);
item->name = mir_tstrdup(nick);
- if ( !JGetStringT( ( HANDLE ) wParam, "MyNick", &dbv ) ) {
+ if ( !JGetStringT( ( HANDLE ) wParam, "MyNick", &dbv )) {
item->nick = mir_tstrdup(dbv.ptszVal);
JFreeVariant( &dbv );
}
@@ -675,7 +675,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd( WPARAM wParam, LPARAM ) JFreeVariant( &dbv );
if ( ListGetItemPtr( LIST_BOOKMARK, roomID ) == NULL ) {
TCHAR *nick = 0;
- if ( !JGetStringT( ( HANDLE ) wParam, "Nick", &dbv ) ) {
+ if ( !JGetStringT( ( HANDLE ) wParam, "Nick", &dbv )) {
nick = mir_tstrdup(dbv.ptszVal);
JFreeVariant( &dbv );
}
@@ -686,7 +686,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd( WPARAM wParam, LPARAM ) item->jid = mir_tstrdup(roomID);
item->name = ( TCHAR* )JCallService( MS_CLIST_GETCONTACTDISPLAYNAME, wParam, GCDNF_TCHAR );
item->type = _T("conference");
- if ( !JGetStringT(( HANDLE ) wParam, "MyNick", &dbv ) ) {
+ if ( !JGetStringT(( HANDLE ) wParam, "MyNick", &dbv )) {
item->nick = mir_tstrdup(dbv.ptszVal);
JFreeVariant( &dbv );
}
|