summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2012-06-04 10:22:27 +0000
committerRobert Pösel <robyer@seznam.cz>2012-06-04 10:22:27 +0000
commit50a3b87e2da17eac026ec6e666b75df0aecaace8 (patch)
tree4c25e9c660b44a48be486568807720db43356fb5
parent4a486ff1b5204fe7ff4546aa4deac60ef65b7ee6 (diff)
Smileyadd sync.
git-svn-id: http://svn.miranda-ng.org/main/trunk@294 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/SmileyAdd/dlgboxsubclass.cpp2
-rw-r--r--plugins/SmileyAdd/docs/smileyadd_readme.txt8
-rw-r--r--plugins/SmileyAdd/general.cpp2
-rw-r--r--plugins/SmileyAdd/general.h1
-rw-r--r--plugins/SmileyAdd/main.cpp2
-rw-r--r--plugins/SmileyAdd/version.h6
6 files changed, 13 insertions, 8 deletions
diff --git a/plugins/SmileyAdd/dlgboxsubclass.cpp b/plugins/SmileyAdd/dlgboxsubclass.cpp
index 9e90dd3f81..1e00bb2cf6 100644
--- a/plugins/SmileyAdd/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/dlgboxsubclass.cpp
@@ -1,6 +1,6 @@
/*
Miranda SmileyAdd Plugin
-Copyright (C) 2005 - 2011 Boris Krasnovskiy All Rights Reserved
+Copyright (C) 2005 - 2012 Boris Krasnovskiy All Rights Reserved
Copyright (C) 2003 - 2004 Rein-Peter de Boer
This program is free software; you can redistribute it and/or
diff --git a/plugins/SmileyAdd/docs/smileyadd_readme.txt b/plugins/SmileyAdd/docs/smileyadd_readme.txt
index 27aa54ca61..7a151fe068 100644
--- a/plugins/SmileyAdd/docs/smileyadd_readme.txt
+++ b/plugins/SmileyAdd/docs/smileyadd_readme.txt
@@ -26,8 +26,8 @@ Emoticon Images: Angeli-Ka
Regular expression library: Jeff Stuart
Hashing algorithm: Austin Appleby
-Date: November, 2010
-Current version: 0.2.3.16
+Date: June, 2012
+Current version: 0.2.3.17
Licensing terms could be found below.
@@ -127,6 +127,10 @@ Thanks to:
ChangeLog
=========
+0.2.3.17
+---------
+ Added support for Omegle protocol
+
0.2.3.16
---------
Added WLM 2011 smileys
diff --git a/plugins/SmileyAdd/general.cpp b/plugins/SmileyAdd/general.cpp
index b4fdc07df3..03164e5c44 100644
--- a/plugins/SmileyAdd/general.cpp
+++ b/plugins/SmileyAdd/general.cpp
@@ -1,6 +1,6 @@
/*
Miranda SmileyAdd Plugin
-Copyright (C) 2005 - 2011 Boris Krasnovskiy All Rights Reserved
+Copyright (C) 2005 - 2012 Boris Krasnovskiy All Rights Reserved
Copyright (C) 2003 - 2004 Rein-Peter de Boer
This program is free software; you can redistribute it and/or
diff --git a/plugins/SmileyAdd/general.h b/plugins/SmileyAdd/general.h
index eedd1e1489..72bdc217ba 100644
--- a/plugins/SmileyAdd/general.h
+++ b/plugins/SmileyAdd/general.h
@@ -81,6 +81,7 @@ typedef Matcher _TMatcher;
#pragma warning( disable : 4100 )
#define MIRANDA_VER 0x0A00
#define NETLIB_NOLOGGING
+#define MIRANDA_CUSTOM_LP
#include <win2k.h>
#include <newpluginapi.h>
diff --git a/plugins/SmileyAdd/main.cpp b/plugins/SmileyAdd/main.cpp
index 8af68d3d8a..b38154d1db 100644
--- a/plugins/SmileyAdd/main.cpp
+++ b/plugins/SmileyAdd/main.cpp
@@ -59,7 +59,7 @@ static const PLUGININFOEX pluginInfoEx =
"Smiley support for Miranda Instant Messanger",
"Peacow, nightwish, bid, borkra",
"borkra@miranda-im.org",
- "Copyright© 2004 - 2011 Boris Krasnovskiy, portions by Rein-Peter de Boer",
+ "Copyright© 2004 - 2012 Boris Krasnovskiy, portions by Rein-Peter de Boer",
"http://code.google.com/p/mirandaimplugins/downloads/list",
// "http://addons.miranda-im.org/index.php?action=display&id=2152",
#if defined(UNICODE) | defined(_UNICODE)
diff --git a/plugins/SmileyAdd/version.h b/plugins/SmileyAdd/version.h
index c6960ff94c..104839a3a2 100644
--- a/plugins/SmileyAdd/version.h
+++ b/plugins/SmileyAdd/version.h
@@ -1,3 +1,3 @@
-#define __FILEVERSION_STRING 0,2,3,16
-#define __VERSION_STRING "0.2.3.16"
-#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 2, 3, 16)
+#define __FILEVERSION_STRING 0,2,3,17
+#define __VERSION_STRING "0.2.3.17"
+#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 2, 3, 17)