diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 11:13:37 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 11:13:37 +0000 |
| commit | 721aea0764451e985d575236205808bbef298244 (patch) | |
| tree | 3a1c566c364e5fc2fff86b87d494497e7de6f93d /plugins/Chat/manager.c | |
| parent | 1784cdf49b8196219563795cf3b11b7c4c2a6746 (diff) | |
one more "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Chat/manager.c')
| -rw-r--r-- | plugins/Chat/manager.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/plugins/Chat/manager.c b/plugins/Chat/manager.c index f9b9461dea..9968086245 100644 --- a/plugins/Chat/manager.c +++ b/plugins/Chat/manager.c @@ -145,11 +145,9 @@ int SM_RemoveSession( const TCHAR* pszID, const char* pszModule) mir_free( pTemp->ptszName );
mir_free( pTemp->ptszStatusbarText );
mir_free( pTemp->ptszTopic );
- #if defined( _UNICODE )
- mir_free( pTemp->pszID );
- mir_free( pTemp->pszName );
- #endif
-
+ mir_free( pTemp->pszID );
+ mir_free( pTemp->pszName );
+
// delete commands
pCurComm = pTemp->lpCommands;
while (pCurComm != NULL)
@@ -787,11 +785,9 @@ BOOL SM_RemoveAll (void) mir_free( m_WndList->ptszName );
mir_free( m_WndList->ptszStatusbarText );
mir_free( m_WndList->ptszTopic );
- #if defined( _UNICODE )
- mir_free( m_WndList->pszID );
- mir_free( m_WndList->pszName );
- #endif
-
+ mir_free( m_WndList->pszID );
+ mir_free( m_WndList->pszName );
+
while (m_WndList->lpCommands != NULL) {
COMMAND_INFO *pNext = m_WndList->lpCommands->next;
mir_free(m_WndList->lpCommands->lpCommand);
@@ -941,11 +937,7 @@ char* SM_GetUsers(SESSION_INFO* si) if ( pLen + nameLen + 2 > alloced )
p = mir_realloc( p, alloced += 4096 );
- #if !defined( _UNICODE )
- lstrcpy( p + pLen, utemp->pszUID );
- #else
- WideCharToMultiByte( CP_ACP, 0, utemp->pszUID, -1, p + pLen, nameLen+1, 0, 0 );
- #endif
+ WideCharToMultiByte( CP_ACP, 0, utemp->pszUID, -1, p + pLen, nameLen+1, 0, 0 );
lstrcpyA( p + pLen + nameLen, " " );
utemp = utemp->next;
}
|