diff options
| author | George Hazan <ghazan@miranda.im> | 2020-02-19 20:47:51 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-02-19 20:47:51 +0300 |
| commit | 8e52135f5e61099bb24e6d02ecc9b3a34d5a0848 (patch) | |
| tree | 7f8ddce854dfb89fd007770caf9ad1add320c05e /protocols | |
| parent | 74d73e1537585bfc4c33892b9ec47dc523af1ce4 (diff) | |
Jabber: useless button removed
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/res/jabber.rc | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_groupchat.cpp | 9 | ||||
| -rw-r--r-- | protocols/JabberG/src/resource.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc index f8718e1194..3c0930ad1a 100644 --- a/protocols/JabberG/res/jabber.rc +++ b/protocols/JabberG/res/jabber.rc @@ -426,7 +426,7 @@ BEGIN CONTROL "",IDC_FRAME2,"Static",SS_ETCHEDHORZ,0,119,215,1
LTEXT "Nickname:",IDC_STATIC,7,125,52,12,SS_CENTERIMAGE
EDITTEXT IDC_NICK,62,125,147,12,ES_AUTOHSCROLL
- DEFPUSHBUTTON "&Accept",IDC_ACCEPT,104,142,50,14
+ DEFPUSHBUTTON "&Accept",IDOK,104,142,50,14
PUSHBUTTON "Cancel",IDCANCEL,159,142,50,14
END
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 033d56213c..d8abeec340 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -1122,16 +1122,13 @@ void CJabberProto::GroupchatProcessMessage(const TiXmlElement *node) class CGroupchatInviteAcceptDlg : public CJabberDlgBase
{
typedef CJabberDlgBase CSuper;
- CCtrlButton m_accept;
CMStringA m_roomJid, m_from, m_reason, m_password;
public:
CGroupchatInviteAcceptDlg(CJabberProto *ppro, const char *roomJid, const char *from, const char *reason, const char *password) :
CSuper(ppro, IDD_GROUPCHAT_INVITE_ACCEPT),
- m_roomJid(roomJid), m_from(from), m_reason(reason), m_password(password),
- m_accept(this, IDC_ACCEPT)
+ m_roomJid(roomJid), m_from(from), m_reason(reason), m_password(password)
{
- m_accept.OnClick = Callback(this, &CGroupchatInviteAcceptDlg::OnCommand_Accept);
}
bool OnInitDialog() override
@@ -1152,12 +1149,12 @@ public: return true;
}
- void OnCommand_Accept(CCtrlButton*)
+ bool OnApply() override
{
wchar_t text[128];
GetDlgItemText(m_hwnd, IDC_NICK, text, _countof(text));
m_proto->AcceptGroupchatInvite(m_roomJid, T2Utf(text), m_password);
- EndDialog(m_hwnd, 0);
+ return true;
}
};
diff --git a/protocols/JabberG/src/resource.h b/protocols/JabberG/src/resource.h index e6e77f4784..c9a3df960e 100644 --- a/protocols/JabberG/src/resource.h +++ b/protocols/JabberG/src/resource.h @@ -180,7 +180,6 @@ #define IDC_ADDJID 1174
#define IDC_INVITE 1175
#define IDC_BTN_ADVANCED 1175
-#define IDC_ACCEPT 1176
#define IDC_BTN_SIMPLE 1176
#define IDC_FROM 1177
#define IDC_USE_TLS 1180
|