6 files changed, 49 insertions, 5 deletions
diff --git a/Plugins/emoticons/Docs/emoticons_changelog.txt b/Plugins/emoticons/Docs/emoticons_changelog.txt
index 7fbe681..e4ce80a 100644
--- a/Plugins/emoticons/Docs/emoticons_changelog.txt
+++ b/Plugins/emoticons/Docs/emoticons_changelog.txt
@@ -2,6 +2,9 @@ Emoticons
 
 Changelog:
 
+. 0.0.1.5
+  + Added MySpace and AIM emoticons
+
 . 0.0.1.4
   * Fix for updater
 
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/messed.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/messed.png
new file mode 100644
index 0000000..4673196
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/messed.png
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/mohawk.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/mohawk.png
new file mode 100644
index 0000000..7053104
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/mohawk.png
diff --git a/Plugins/emoticons/data/Plugins/Emoticons/AIM.emo b/Plugins/emoticons/data/Plugins/Emoticons/AIM.emo
new file mode 100644
index 0000000..c2e7940
--- /dev/null
+++ b/Plugins/emoticons/data/Plugins/Emoticons/AIM.emo
@@ -0,0 +1,19 @@
+# AIM protocol emoticons
+# http://www.aim.com/emoticons.adp
+
+"smile" = "Smiling", ":-) :)" 
+"wink" = "Winking", ";-) ;)" 
+"sad" = "Frowning", ":-( :(" 
+"tongue" = "Sticking-out-tongue", ":-P" ":-p"
+"shock" = "Surprised", "=-O"
+"kiss" = "Kissing", ":-*", 
+"shout" = "Yelling", ">:o"
+"smile-big" = "Ecstatic", ":-D" ":D"
+"moneymouth" = "Money-mouth", ":-$" 
+"foot-in-mouth" = "Foot-in-mouth", ":-!"
+"embarrassed" = "Embarrassed", ":-[" 
+"angel" = "Innocent", "O:-)"
+"thinking" = "Undecided", ":-\\"
+"crying" = "Crying", ":'(" 
+"shut-mouth" = "Lips-are-sealed", ":-X"
+"glass-cool" = "Cool", "8-)" 
diff --git a/Plugins/emoticons/data/Plugins/Emoticons/MySpace.emo b/Plugins/emoticons/data/Plugins/Emoticons/MySpace.emo
new file mode 100644
index 0000000..d6145d4
--- /dev/null
+++ b/Plugins/emoticons/data/Plugins/Emoticons/MySpace.emo
@@ -0,0 +1,26 @@
+# My Space protocol emoticons
+
+"smile-big" = "bigsmile", ":D" ":-D"
+"devilish" = "devil", "}:)" "}:-)"
+"confused" = "frassled", ":Z"
+"glass-nerdy" = "geek / nerd", "B)" "Q)"
+"silly" = "googles", "%)"
+"freaked-out" = "growl", ":E"
+"smile" = "happy", ":)" ":-)"
+"in-love" = "heart", ":X"
+"laugh" = "laugh", ":))"
+"mohawk" = "mohawk", "-:"
+"angry" = "mad", "X("
+"messed" = "messed", "X)"
+"doh" = "oops", ":G"
+"pirate" = "pirate", "P)"
+"shock" = "scared", ":O"
+"struggle" = "sidefrown", ":{"
+"sinister" = "sinister", ":B"
+"smirk" = "smirk", ":,"
+"neutral" = "straight", ":|"
+"tongue" = "tongue", ":p" ":P"
+"pissed-off" = "upset", "B|"
+"wink" = "wink", ";-)" ";)" 
+"sad" = "worried", ":[" 
+"kiss" = "kiss", ":x" ":X"
diff --git a/Plugins/emoticons/emoticons.cpp b/Plugins/emoticons/emoticons.cpp
index 800c9ba..baed7c2 100644
--- a/Plugins/emoticons/emoticons.cpp
+++ b/Plugins/emoticons/emoticons.cpp
@@ -155,11 +155,7 @@ static TCHAR *webs[] = {
 	_T("www."), 
 	_T("www2."),
 	_T("ftp."),
-	_T("irc."),
-	_T("A:\\"),
-	_T("B:\\"),
-	_T("C:\\"),
-	_T("D:\\"),
+	_T("irc.")
 };