Coversations XMPP client detect by FingerprintNG

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

5 files changed, 54 insertions, 50 deletions

diff --git a/plugins/FingerprintNG/iconpacks/res/Jabber/Conversations.ico b/plugins/FingerprintNG/iconpacks/res/Jabber/Conversations.ico
new file mode 100644
index 0000000000..5c97b3d838
--- /dev/null
+++ b/plugins/FingerprintNG/iconpacks/res/Jabber/Conversations.ico
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 0be1cf283c..d398bf0661 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -209,6 +209,7 @@ IDI_COLIBRY             ICON                    "Jabber\\Colibry.ico"
 IDI_COLLOQUY            ICON                    "Jabber\\Colloquy.ico"

 IDI_COMMUNIGATE         ICON                    "Jabber\\CommuniGate Pro.ico"

 IDI_CONFERENCE          ICON                    "Jabber\\Gmail_Conference_Bot.ico"

+IDI_CONVERSATIONS       ICON                    "Jabber\\Conversations.ico"

 IDI_CROOM               ICON                    "Jabber\\CRoom.ico"

 IDI_CROSSTALK           ICON                    "Jabber\\Crosstalk.ico"

 IDI_CUDUMAR             ICON                    "Jabber\\Cudumar.ico"

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 4fc1ab5335..b0914b57dc 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -241,6 +241,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{ "client_Colloquy", _T("Colloquy*"), _T("Colloquy"), IDI_COLLOQUY, JABBER_CASE, TRUE },

 	{ "client_CommuniGate", _T("*CommuniGate*"), _T("CommuniGate Pro"), IDI_COMMUNIGATE, JABBER_CASE, TRUE },

 	{ "client_Conference", _T("Conference*"), _T("Conference Bot (GMail)"), IDI_CONFERENCE, JABBER_CASE, TRUE },

+	{ "client_Conversations", _T("*conversions.siacs.eu*"), _T("Conversations"), IDI_CONVERSATIONS, JABBER_CASE, TRUE },

 	{ "client_Crosstalk", _T("*Cross*talk*"), _T("Crosstalk"), IDI_CROSSTALK, JABBER_CASE, TRUE },

 	{ "client_Cudumar", _T("*Cudumar*"), _T("Cudumar"), IDI_CUDUMAR, JABBER_CASE, TRUE },

 	{ "client_CyclopsChat", _T("*Cyclops*"), _T("Cyclops Chat"), IDI_CYCLOPS_CHAT, JABBER_CASE, TRUE },

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index b9d1e65e23..b66b6e5629 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -143,56 +143,57 @@
 #define IDI_CBIRC                       305

 #define IDI_CHATZILLA                   306

 #define IDI_CONVERSATION                307

-#define IDI_DIRC                        308

-#define IDI_EGGDROP                     309

-#define IDI_EGGDROP_RACBOT              310

-#define IDI_EMULE                       311

-#define IDI_EMULE_MORPHXT               312

-#define IDI_EMULE_NEO                   313

-#define IDI_EMULE_PLUS                  314

-#define IDI_EMULE_XTREME                315

-#define IDI_FCHAT                       316

-#define IDI_GDPCHAT                     317

-#define IDI_GOPOWERTOOLS                318

-#define IDI_HYDRA_IRC                   319

-#define IDI_ICECHAT                     320

-#define IDI_IRC_UNKNOWN                 321

-#define IDI_IRCLE                       322

-#define IDI_IRCXPRO                     323

-#define IDI_JIRCII                      324

-#define IDI_JMIRC                       325

-#define IDI_KLIENT                      326

-#define IDI_KONVERSATION                327

-#define IDI_KSIRC                       328

-#define IDI_KVIRC                       329

-#define IDI_MIRC                        330

-#define IDI_MP3_SCRIPT                  331

-#define IDI_NEORATRION                  332

-#define IDI_NETTALK                     333

-#define IDI_NONAME_SCRIPT               334

-#define IDI_OPERA                       335

-#define IDI_PIORUN                      336

-#define IDI_PIRC                        337

-#define IDI_PIRCH                       338

-#define IDI_PJIRC                       339

-#define IDI_PROCHAT                     340

-#define IDI_PSYBNC                      341

-#define IDI_SAVIRC                      342

-#define IDI_SMART_IRC                   343

-#define IDI_SNAK                        344

-#define IDI_SYSRESET                    345

-#define IDI_VIRCAIRC                    346

-#define IDI_VISIONIRC                   347

-#define IDI_VISUALIRC                   348

-#define IDI_VORTECIRC                   349

-#define IDI_WEECHAT                     350

-#define IDI_WLIRC                       351

-#define IDI_WMIRC                       352

-#define IDI_XCHATAQUA                   353

-#define IDI_XBITCH                      354

-#define IDI_XCHAT                       355

-#define IDI_XIRC                        356

-#define IDI_XIRCON                      357

+#define IDI_CONVERSATIONS               308

+#define IDI_DIRC                        309

+#define IDI_EGGDROP                     310

+#define IDI_EGGDROP_RACBOT              311

+#define IDI_EMULE                       312

+#define IDI_EMULE_MORPHXT               313

+#define IDI_EMULE_NEO                   314

+#define IDI_EMULE_PLUS                  315

+#define IDI_EMULE_XTREME                316

+#define IDI_FCHAT                       317

+#define IDI_GDPCHAT                     318

+#define IDI_GOPOWERTOOLS                319

+#define IDI_HYDRA_IRC                   320

+#define IDI_ICECHAT                     321

+#define IDI_IRC_UNKNOWN                 322

+#define IDI_IRCLE                       323

+#define IDI_IRCXPRO                     324

+#define IDI_JIRCII                      325

+#define IDI_JMIRC                       326

+#define IDI_KLIENT                      327

+#define IDI_KONVERSATION                328

+#define IDI_KSIRC                       329

+#define IDI_KVIRC                       330

+#define IDI_MIRC                        331

+#define IDI_MP3_SCRIPT                  332

+#define IDI_NEORATRION                  333

+#define IDI_NETTALK                     334

+#define IDI_NONAME_SCRIPT               335

+#define IDI_OPERA                       336

+#define IDI_PIORUN                      337

+#define IDI_PIRC                        338

+#define IDI_PIRCH                       339

+#define IDI_PJIRC                       340

+#define IDI_PROCHAT                     341

+#define IDI_PSYBNC                      342

+#define IDI_SAVIRC                      343

+#define IDI_SMART_IRC                   344

+#define IDI_SNAK                        345

+#define IDI_SYSRESET                    346

+#define IDI_VIRCAIRC                    347

+#define IDI_VISIONIRC                   348

+#define IDI_VISUALIRC                   349

+#define IDI_VORTECIRC                   350

+#define IDI_WEECHAT                     351

+#define IDI_WLIRC                       352

+#define IDI_WMIRC                       353

+#define IDI_XCHATAQUA                   354

+#define IDI_XBITCH                      355

+#define IDI_XCHAT                       356

+#define IDI_XIRC                        357

+#define IDI_XIRCON                      358

 #define IDI_ZSIRC                       359

 #define IDI_POCKET_IRC                  360

 #define IDI_IROFFER_DINOEX              361

diff --git a/plugins/MobileState/src/clients.h b/plugins/MobileState/src/clients.h
index 15d3ecfa69..b75770ec0c 100644
--- a/plugins/MobileState/src/clients.h
+++ b/plugins/MobileState/src/clients.h
@@ -24,6 +24,7 @@ static const TCHAR *clients[] = {
 	_T("mobile"),

 	_T("pda"),

 	_T("gtalk"),

+	_T("conversations"),

 	_T("jabiru"),

 	_T("jtalk"),

 	_T("jasmine"),