unified project for Jabber protocol

git-svn-id: http://svn.miranda-ng.org/main/trunk@13258 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

56 files changed, 58 insertions, 55 deletions

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index ecd8cc77b3..ef3b25aac1 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "jabber_rc.h"

@@ -32,6 +32,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_folders.h"

 #include "m_toptoolbar.h"

 

+#pragma comment(lib, "Dnsapi.lib")

+#pragma comment(lib, "Secur32.lib")

+

 HINSTANCE hInst;

 

 int hLangpack;

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 1896805a56..d052278a92 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp
index 88487f68ba..fde3e1c0ba 100644
--- a/protocols/JabberG/src/jabber_agent.cpp
+++ b/protocols/JabberG/src/jabber_agent.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp
index f12d7f363c..0738e33233 100644
--- a/protocols/JabberG/src/jabber_api.cpp
+++ b/protocols/JabberG/src/jabber_api.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 // Jabber API functions

 INT_PTR __cdecl CJabberProto::JabberGetApi(WPARAM, LPARAM lParam)

diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp
index 91185d924a..8b23af83a5 100644
--- a/protocols/JabberG/src/jabber_archive.cpp
+++ b/protocols/JabberG/src/jabber_archive.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 0f28a49023..b6664bcb71 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index 0e86f62a08..40545f9203 100644
--- a/protocols/JabberG/src/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_byte.h"

 #include "jabber_caps.h"

diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index bb56c8271e..aaab23b6f8 100644
--- a/protocols/JabberG/src/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "version.h"

diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp
index 6941b9f55a..37fa7e3460 100644
--- a/protocols/JabberG/src/jabber_captcha.cpp
+++ b/protocols/JabberG/src/jabber_captcha.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 struct CAPTCHA_FORM_PARAMS

 {

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index f70003e9f8..e8ab75ca54 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index ccc4844a5e..2d9a44c235 100644
--- a/protocols/JabberG/src/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #define JCPF_IN    0x01UL

 #define JCPF_OUT   0x02UL

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index f9090db6e6..f4a7dbfad8 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_disco.h"

 

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 0fc4dfa70d..927fb6c405 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "jabber_disco.h"

diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp
index cfa0000bcc..0a45ead7b0 100644
--- a/protocols/JabberG/src/jabber_file.cpp
+++ b/protocols/JabberG/src/jabber_file.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_caps.h"

 

 #define JABBER_NETWORK_BUFFER_SIZE 2048

diff --git a/protocols/JabberG/src/jabber_filterlist.cpp b/protocols/JabberG/src/jabber_filterlist.cpp
index 68753e974a..b9161fae54 100644
--- a/protocols/JabberG/src/jabber_filterlist.cpp
+++ b/protocols/JabberG/src/jabber_filterlist.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // CCtrlFilterListView

diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp
index e56643ce38..7d1fc2de63 100644
--- a/protocols/JabberG/src/jabber_form.cpp
+++ b/protocols/JabberG/src/jabber_form.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_caps.h"

 

 static LRESULT CALLBACK JabberFormMultiLineWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 224bae3337..457b0bbde9 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_caps.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index ad917543bf..d138c4d4fc 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_byte.h"

 #include "jabber_ibb.h"

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 6eb131ddd9..db120aa0de 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp
index 2fadb2a018..78d952daf7 100644
--- a/protocols/JabberG/src/jabber_ibb.cpp
+++ b/protocols/JabberG/src/jabber_ibb.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_ibb.h"

 #include "jabber_caps.h"

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 10eb6b23dc..855afa5eeb 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #define IDI_ONLINE                      104

 #define IDI_OFFLINE                     105

diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp
index d1cff5c24a..9217a01871 100644
--- a/protocols/JabberG/src/jabber_iq.cpp
+++ b/protocols/JabberG/src/jabber_iq.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "jabber_privacy.h"

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 60460591a1..675b0cefbb 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_rc.h"

 #include "version.h"

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 977da1b1e0..0000b7b6d1 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index e4c7879ccd..24f77738ca 100644
--- a/protocols/JabberG/src/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

diff --git a/protocols/JabberG/src/jabber_libstr.cpp b/protocols/JabberG/src/jabber_libstr.cpp
index 3f7fe118b9..4949f2f2c0 100644
--- a/protocols/JabberG/src/jabber_libstr.cpp
+++ b/protocols/JabberG/src/jabber_libstr.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 int lstrcmp_null(const TCHAR *s1, const TCHAR *s2)

 {

diff --git a/protocols/JabberG/src/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp
index c615ca97dd..ff447fb832 100644
--- a/protocols/JabberG/src/jabber_list.cpp
+++ b/protocols/JabberG/src/jabber_list.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 

 void MenuUpdateSrmmIcon(JABBER_LIST_ITEM *item);

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 445335093e..d2923a76d1 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 #include "jabber_caps.h"

 #include "jabber_privacy.h"

diff --git a/protocols/JabberG/src/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp
index c4fd92f42e..aabdec3b57 100644
--- a/protocols/JabberG/src/jabber_message_handlers.cpp
+++ b/protocols/JabberG/src/jabber_message_handlers.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 BOOL CJabberProto::OnMessageError(HXML node, ThreadData*, CJabberMessageInfo* pInfo)

 {

diff --git a/protocols/JabberG/src/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp
index 2d466fd538..a1411bcac0 100644
--- a/protocols/JabberG/src/jabber_message_manager.cpp
+++ b/protocols/JabberG/src/jabber_message_manager.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 static int CompareItems(const CJabberMessagePermanentInfo *p1, const CJabberMessagePermanentInfo *p2)

 {

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index 976b275a9c..36156ae559 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index 8fc18bf3f5..c993dc746b 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index c36fd611c3..0ceeb12340 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_list.h"

 #include "jabber_caps.h"

 #include "jabber_opttree.h"

diff --git a/protocols/JabberG/src/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp
index 046800ef81..6395bdca3b 100644
--- a/protocols/JabberG/src/jabber_opttree.cpp
+++ b/protocols/JabberG/src/jabber_opttree.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_opttree.h"

 

 enum { IMG_GROUP, IMG_CHECK, IMG_NOCHECK, IMG_RCHECK, IMG_NORCHECK, IMG_GRPOPEN, IMG_GRPCLOSED };

diff --git a/protocols/JabberG/src/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp
index c6a7bec6ca..08248147a0 100644
--- a/protocols/JabberG/src/jabber_password.cpp
+++ b/protocols/JabberG/src/jabber_password.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_presence_manager.cpp b/protocols/JabberG/src/jabber_presence_manager.cpp
index 4fd64fff55..719dd8c82a 100644
--- a/protocols/JabberG/src/jabber_presence_manager.cpp
+++ b/protocols/JabberG/src/jabber_presence_manager.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 static int CompareItems(const CJabberPresencePermanentInfo *p1, const CJabberPresencePermanentInfo *p2)

 {

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index ffcf2945ef..f40f94429f 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_privacy.h"

 

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index fc6e0612b7..58e48abc36 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "jabber_disco.h"

diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index f1d6cca287..154db21e39 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_iq.h"

 #include "jabber_rc.h"

 

diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index f6029926a9..e2646e29ac 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "stdafx.h"
 #include <CommCtrl.h>
 #include "jabber_iq.h"
 #include "jabber_caps.h"
diff --git a/protocols/JabberG/src/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp
index 54f783b2bc..d840ddcd89 100644
--- a/protocols/JabberG/src/jabber_secur.cpp
+++ b/protocols/JabberG/src/jabber_secur.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_secur.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/JabberG/src/jabber_secur.h b/protocols/JabberG/src/jabber_secur.h
index c69e130ac6..30b5e42805 100644
--- a/protocols/JabberG/src/jabber_secur.h
+++ b/protocols/JabberG/src/jabber_secur.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 // basic class - provides interface for various Jabber auth

 

diff --git a/protocols/JabberG/src/jabber_send_manager.cpp b/protocols/JabberG/src/jabber_send_manager.cpp
index efe35c1849..af2767d88b 100644
--- a/protocols/JabberG/src/jabber_send_manager.cpp
+++ b/protocols/JabberG/src/jabber_send_manager.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 static int CompareItems(const CJabberSendPermanentInfo *p1, const CJabberSendPermanentInfo *p2)

 {

diff --git a/protocols/JabberG/src/jabber_std.cpp b/protocols/JabberG/src/jabber_std.cpp
index ecda372e98..84745e30d5 100644
--- a/protocols/JabberG/src/jabber_std.cpp
+++ b/protocols/JabberG/src/jabber_std.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index 19d6d8c154..f78b97abe9 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #include <fcntl.h>

 #include <io.h>

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 5440ad8122..0c5f428ff2 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #include <windns.h>   // requires Windows Platform SDK

 

diff --git a/protocols/JabberG/src/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp
index 1c3059e9d7..5a406e23a2 100644
--- a/protocols/JabberG/src/jabber_treelist.cpp
+++ b/protocols/JabberG/src/jabber_treelist.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #define TLIF_VISIBLE	0x01

 #define TLIF_EXPANDED	0x02

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 8f480a3075..fd26224e29 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "jabber.h"
+#include "stdafx.h"
 
 #include <fcntl.h>
 #include <io.h>
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 61522beadd..2c7da1dafe 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #include "jabber_caps.h"

 

diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index 40afc18c2a..2fd95e9f14 100644
--- a/protocols/JabberG/src/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <io.h>

diff --git a/protocols/JabberG/src/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp
index bb4d5a2d20..2abed513d4 100644
--- a/protocols/JabberG/src/jabber_ws.cpp
+++ b/protocols/JabberG/src/jabber_ws.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 BOOL CJabberProto::WsInit(void)

 {

diff --git a/protocols/JabberG/src/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp
index 9faed3e170..813a6c5cea 100644
--- a/protocols/JabberG/src/jabber_xml.cpp
+++ b/protocols/JabberG/src/jabber_xml.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 #define TAG_MAX_LEN 128

 #define ATTR_MAX_LEN 8192

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 2f128c7720..f110240a91 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 #include "jabber_caps.h"

 

 static CIconPool g_MoodIcons, g_ActivityIcons;

diff --git a/protocols/JabberG/src/jabber_zstream.cpp b/protocols/JabberG/src/jabber_zstream.cpp
index 722592c6bc..34645a16fb 100644
--- a/protocols/JabberG/src/jabber_zstream.cpp
+++ b/protocols/JabberG/src/jabber_zstream.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "jabber.h"

+#include "stdafx.h"

 

 BOOL ThreadData::zlibInit(void)

 {

diff --git a/protocols/JabberG/src/stdafx.cpp b/protocols/JabberG/src/stdafx.cxx
index b1263810b2..56d03a7660 100644
--- a/protocols/JabberG/src/stdafx.cpp
+++ b/protocols/JabberG/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "jabber.h"
\ No newline at end of file
+#include "stdafx.h"
\ No newline at end of file
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/stdafx.h
index 2c28b7e3aa..2c28b7e3aa 100644
--- a/protocols/JabberG/src/jabber.h
+++ b/protocols/JabberG/src/stdafx.h