diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-05-17 15:38:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-05-17 15:38:59 +0000 |
| commit | 4d7fb80e18aa7b131bae7a0a55efb5d4a5097866 (patch) | |
| tree | 03007949bce748696d2f6120ab4cc116aea060be /plugins/Scriver/src/globals.cpp | |
| parent | 8d525f2f68c3c079f2888fdc911f0b5d7cfc8557 (diff) | |
Scriver:
- fix for toolbar icons;
- horror with buffers replaced with CMString;
- unused code removed;
git-svn-id: http://svn.miranda-ng.org/main/trunk@16839 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src/globals.cpp')
| -rw-r--r-- | plugins/Scriver/src/globals.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index 4de574d6f3..78259fb1ef 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -27,15 +27,18 @@ GlobalMessageData g_dat; int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam);
-static const char *buttonIcons[] = {"scriver_CLOSEX", "scriver_QUOTE", "scriver_SMILEY",
- "scriver_ADD", NULL, "scriver_USERDETAILS", "scriver_HISTORY",
- "scriver_SEND"};
+static const char *buttonIcons[] =
+{
+ "scriver_CLOSEX", "scriver_QUOTE", "scriver_ADD", NULL,
+ "scriver_USERDETAILS", "scriver_HISTORY", "scriver_SEND"
+};
-static const char *chatButtonIcons[] = {"scriver_CLOSEX",
- "chat_bold", "chat_italics", "chat_underline",
- "chat_fgcol", "chat_bkgcol",
- "chat_smiley", "chat_history",
- "chat_filter", "chat_settings", "chat_nicklist", "scriver_SEND"};
+static const char *chatButtonIcons[] =
+{
+ "scriver_CLOSEX", "chat_bold", "chat_italics", "chat_underline",
+ "chat_fgcol", "chat_bkgcol", "chat_history", "chat_filter",
+ "chat_settings", "chat_nicklist", "scriver_SEND"
+};
static IconItem iconList[] =
{
@@ -125,13 +128,14 @@ static int ackevent(WPARAM, LPARAM lParam) if (item != NULL && item->hwndErrorDlg == NULL) {
if (hwndSender != NULL) {
- ErrorWindowData *ewd = (ErrorWindowData *)mir_alloc(sizeof(ErrorWindowData));
- ewd->szName = GetNickname(item->hContact, item->proto);
+ SendMessage(hwndSender, DM_STOPMESSAGESENDING, 0, 0);
+
+ ErrorWindowData *ewd = (ErrorWindowData*)mir_alloc(sizeof(ErrorWindowData));
+ ewd->szName = mir_tstrdup(pcli->pfnGetContactDisplayName(item->hContact, 0));
ewd->szDescription = mir_a2t((char *)pAck->lParam);
ewd->szText = GetSendBufferMsg(item);
ewd->hwndParent = hwndSender;
ewd->queueItem = item;
- SendMessage(hwndSender, DM_STOPMESSAGESENDING, 0, 0);
SendMessage(hwndSender, DM_SHOWERRORMESSAGE, 0, (LPARAM)ewd);
}
else RemoveSendQueueItem(item);
|