diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-02-23 19:57:58 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-02-23 19:57:58 +0300 |
| commit | dc597d70cef7202480eae6708e2142148e09356f (patch) | |
| tree | 459e171a2e8a5bb2def7d7aea67fb769aa224bb2 /protocols/JabberG/src | |
| parent | 349ff91be06644a8b611ecf6a39ce0ac1bcde86a (diff) | |
clipboard copy function is able now to copy in multiple formats at a time
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 10 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_disco.cpp | 6 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid_muc.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_userinfo.cpp | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 8e88a86346..b61953a9ca 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1125,16 +1125,16 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* break;
case IDM_CPY_NICK:
- Utils_ClipboardCopyU(him->m_szResourceName);
+ Utils_ClipboardCopy(MClipUtf8(him->m_szResourceName));
break;
case IDM_RJID_COPY:
case IDM_CPY_RJID:
- Utils_ClipboardCopyU(him->m_szRealJid);
+ Utils_ClipboardCopy(MClipUtf8(him->m_szRealJid));
break;
case IDM_CPY_INROOMJID:
- Utils_ClipboardCopyU(MakeJid(item->jid, him->m_szResourceName));
+ Utils_ClipboardCopy(MClipUtf8(MakeJid(item->jid, him->m_szResourceName)));
break;
case IDM_RJID_VCARD:
@@ -1299,11 +1299,11 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK *g break;
case IDM_CPY_RJID:
- Utils_ClipboardCopyU(item->jid);
+ Utils_ClipboardCopy(MClipUtf8(item->jid));
break;
case IDM_CPY_TOPIC:
- Utils_ClipboardCopyU(item->getTemp()->m_szStatusMessage);
+ Utils_ClipboardCopy(MClipUtf8(item->getTemp()->m_szStatusMessage));
break;
}
}
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index fbca7ba7e2..709ca45e72 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -1054,15 +1054,15 @@ public: break;
case SD_ACT_COPYJID:
- Utils_ClipboardCopyU(pNode->GetJid());
+ Utils_ClipboardCopy(MClipUtf8(pNode->GetJid()));
break;
case SD_ACT_COPYNODE:
- Utils_ClipboardCopyU(pNode->GetNode());
+ Utils_ClipboardCopy(MClipUtf8(pNode->GetNode()));
break;
case SD_ACT_COPYINFO:
- Utils_ClipboardCopyU(pNode->GetTooltipText());
+ Utils_ClipboardCopy(MClipUtf8(pNode->GetTooltipText()));
break;
case SD_ACT_FAVORITE:
diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp index 9b41da8414..ba0c9622aa 100644 --- a/protocols/JabberG/src/jabber_iqid_muc.cpp +++ b/protocols/JabberG/src/jabber_iqid_muc.cpp @@ -335,7 +335,7 @@ public: if (TrackPopupMenu(hMenu, TPM_RETURNCMD | TPM_BOTTOMALIGN, pos->pt.x, pos->pt.y, 0, m_hwnd, nullptr)) {
wchar_t buf[JABBER_MAX_JID_LEN];
m_list.GetItemText(pos->iCurr, 0, buf, _countof(buf));
- Utils_ClipboardCopy(buf);
+ Utils_ClipboardCopy(MClipUnicode(buf));
}
DestroyMenu(hMenu);
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index a6017785c0..25325165d2 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -483,7 +483,7 @@ public: if (nReturnCmd == 1) {
CMStringW buf;
GetNodeText(pos->hItem, buf);
- Utils_ClipboardCopy(buf);
+ Utils_ClipboardCopy(MClipUnicode(buf));
}
else if (nReturnCmd == 2) {
wchar_t szBuffer[1024];
@@ -494,9 +494,9 @@ public: tvi.pszText = szBuffer;
if (m_tree.GetItem(&tvi)) {
if (wchar_t *str = wcsstr(szBuffer, L": "))
- Utils_ClipboardCopy(str + 2);
+ Utils_ClipboardCopy(MClipUnicode(str + 2));
else
- Utils_ClipboardCopy(szBuffer);
+ Utils_ClipboardCopy(MClipUnicode(szBuffer));
}
}
DestroyMenu(hMenu);
|