diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-28 11:05:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-28 11:05:10 +0000 |
| commit | 90c2f2a24e911c832e11fcc6443afd24efdd4cc9 (patch) | |
| tree | 719972a0755925073ab6aeb7aa24e92eed5b1427 /protocols/JabberG/src/jabber.h | |
| parent | f302909f341c5bf61bcb432d73443df6c3ba44c9 (diff) | |
- fix for name conflict in proto helpers;
- switch to constants defined in m_nudge.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@5504 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber.h')
| -rw-r--r-- | protocols/JabberG/src/jabber.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index b91a720edd..4c3108726d 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -102,6 +102,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_modernopt.h>
#include <m_popup.h>
#include <m_proto_listeningto.h>
+#include <m_nudge.h>
#include <m_skin_eng.h>
#include "../../plugins/zlib/src/zlib.h"
@@ -259,10 +260,6 @@ enum { // Services and Events
#define JS_PARSE_XMPP_URI "/ParseXmppURI"
-// XEP-0224 support (Attention/Nudge)
-#define JS_SEND_NUDGE "/SendNudge"
-#define JE_NUDGE "/Nudge"
-
// Called when contact changes custom status and extra icon is set to clist_mw
//wParam = hContact // contact changing status
//lParam = hIcon // HANDLE to clist extra icon set as custom status
|