diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-11-02 18:59:02 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-11-02 18:59:02 +0000 |
| commit | 7945c8ce16b28888432c26ca4159f918cbb3010f (patch) | |
| tree | 7b963eb7af5edc093f8b43e7e723467f2b15dc7c /protocols/JabberG/src/jabber_bookmarks.cpp | |
| parent | d865fa125a572ebf0d6454cd14721b9b22c3edec (diff) | |
JabberNickFromJID usage moved to ptrT
git-svn-id: http://svn.miranda-ng.org/main/trunk@10904 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_bookmarks.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_bookmarks.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index 80d0eeeec4..ca922e5b24 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -343,11 +343,8 @@ void CJabberDlgBookmarks::OpenBookmark() if (item->nick && *item->nick)
m_proto->GroupchatJoinRoom(server, room, item->nick, item->password);
- else {
- TCHAR *nick = JabberNickFromJID(m_proto->m_szJabberJID);
- m_proto->GroupchatJoinRoom(server, room, nick, item->password);
- mir_free(nick);
- }
+ else
+ m_proto->GroupchatJoinRoom(server, room, ptrT(JabberNickFromJID(m_proto->m_szJabberJID)), item->password);
}
}
else CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)item->jid);
|