2 files changed, 20 insertions, 59 deletions
diff --git a/Plugins/emoticons/sdk/m_customsmileys.h b/Plugins/emoticons/sdk/m_customsmileys.h
deleted file mode 100644
index afe99bd..0000000
--- a/Plugins/emoticons/sdk/m_customsmileys.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef __M_CUSTOMSMILEYS_H__
-# define __M_CUSTOMSMILEYS_H__
-
-
-#define CUSTOMSMILEY_STATE_RECEIVED		1
-#define CUSTOMSMILEY_STATE_DOWNLOADED	2
-#define CUSTOMSMILEY_UNICODE			0x100
-
-#ifdef UNICODE
-# define CUSTOMSMILEY_TCHAR CUSTOMSMILEY_UNICODE
-#else
-# define CUSTOMSMILEY_TCHAR 0
-#endif
-
-typedef struct
-{
-	int cbSize;
-	HANDLE hContact;
-	union {
-		const char *pszText;		// Valid only during the notification. Optional if CUSTOMSMILEY_STATE_DOWNLOADED
-		const TCHAR *ptszText;		// Valid only during the notification. Optional if CUSTOMSMILEY_STATE_DOWNLOADED
-		const WCHAR *pwszText;		// Valid only during the notification. Optional if CUSTOMSMILEY_STATE_DOWNLOADED
-	};
-	const char *pszFilename;		// Valid only during the notification
-	int flags;						// One of CUSTOMSMILEY_STATE_*
-	BOOL download;					// "Return" value. Someone have to change it to TRUE for it to be downloaded
-} CUSTOMSMILEY;
-
-
-// Fired when a custom smiley is received from a contact.
-// This can is fired 2 times: 
-// 1. When received the text, with flag CUSTOMSMILEY_STATE_RECEIVED. If someone hooks this message and
-// wants the custom smiley, it has to change the download field to TRUE
-// 2. If needed, when the image was downloaded, with flag CUSTOMSMILEY_STATE_DOWNLOADED
-// If the protocol receives the smiley text and image at the same time, it can fire it only once, with
-// flag (CUSTOMSMILEY_STATE_RECEIVED | CUSTOMSMILEY_STATE_DOWNLOADED)
-// 
-// wParam = 0
-// lParam = CUSTOMSMILEY *
-#define ME_CUSTOMSMILEY_RECEIVED "/CustomSmileyReceived"
-
-
-
-
-
-
-
-
-
-
-
-#endif __M_CUSTOMSMILEYS_H__
diff --git a/Plugins/emoticons/sdk/m_smileyadd.h b/Plugins/emoticons/sdk/m_smileyadd.h
index 18e2462..2de1b61 100644
--- a/Plugins/emoticons/sdk/m_smileyadd.h
+++ b/Plugins/emoticons/sdk/m_smileyadd.h
@@ -1,12 +1,12 @@
 /*
 Miranda SmileyAdd Plugin
-Plugin support header file
-Copyright (C) 2004-2007 Boris Krasnovskiy, portions by Rein-Peter de Boer
+Copyright (C) 2005-2008 Boris Krasnovskiy
+Copyright (C) 2003-2004 Rein-Peter de Boer
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+as published by the Free Software Foundation version 2
+of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,10 +14,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
+#include <richedit.h>
 
 #define SAFLRE_INSERTEMF  2     // insert smiley as EMF into RichEdit, otherwise bitmap inserted
                                 // this flag allows "true" transparency
@@ -180,3 +179,17 @@ typedef struct
 // {E03C71B2-6DEE-467e-A4F0-DD516745876A}
 #define MIID_SMILEY	{ 0xe03c71b2, 0x6dee, 0x467e, { 0xa4, 0xf0, 0xdd, 0x51, 0x67, 0x45, 0x87, 0x6a } }
 #endif
+
+
+typedef struct 
+{
+    unsigned cbSize;             // size of the structure
+	HANDLE hContact;
+	int type;					 // 0 - directory, 1 - file;
+    TCHAR* path;                  // smiley category name for reference
+} SMADD_CONT;
+
+//Loads all smileys for the contact
+//wParam = (WPARAM) 0; not used
+//lParam = (LPARAM) (SMADD_CONT*) &dir;  // pointer to directory to load smiley from
+#define MS_SMILEYADD_LOADCONTACTSMILEYS  "SmileyAdd/LoadContactSmileys"