Index: scripts/smileys.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/smileys/scripts/Attic/smileys.js,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 smileys.js
--- scripts/smileys.js	5 Jan 2009 08:50:25 -0000	1.1.2.3
+++ scripts/smileys.js	7 Feb 2010 19:13:00 -0000
@@ -79,7 +79,10 @@ Drupal.smileysAttach = function() {
     var smiley = " " + this.alt + " ";
     // edit-body and edit-comment included to insert smiley into them when none of the textarea is focussed.
     $("textarea#"+ textareaFocussed +", textarea#edit-comment").each(function() {
-      if (typeof tinyMCE !== "undefined" && (tinyMCE.getInstanceById("edit-comment") ? true : false || tinyMCE.getInstanceById("edit-body") ? true : false)) {
+      if (Drupal.wysiwyg && Drupal.wysiwyg.instances[textareaFocussed] && Drupal.wysiwyg.instances[textareaFocussed].insert && Drupal.wysiwyg.instances[textareaFocussed].field == textareaFocussed) {
+        Drupal.wysiwyg.instances[textareaFocussed].insert(smiley);
+      }
+      else if (typeof tinyMCE !== "undefined" && (tinyMCE.getInstanceById("edit-comment") ? true : false || tinyMCE.getInstanceById("edit-body") ? true : false)) {
       // tinyMCE support
         tinyMCE.execCommand("mceInsertContent", false, smiley);
       }