# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1265751278 0
# Node ID 65004796201dd9e5ef615a85b06697a2f5fe53d1
# Parent  c9866e46f6290a1a0b8240835e0cfa2277b958db
Actually set the mood when creating a presence update when receiving mood PEP.
Fixed some erronious pixmap references

diff -r c9866e46f629 -r 65004796201d libpurple/protocols/jabber/usermood.c
--- a/libpurple/protocols/jabber/usermood.c	Tue Feb 09 20:14:10 2010 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Tue Feb 09 21:34:38 2010 +0000
@@ -160,7 +160,7 @@
 	}
 	if (newmood != NULL) {
 		purple_prpl_got_user_status(js->gc->account, from, "mood",
-				PURPLE_MOOD_NAME, mood,
+				PURPLE_MOOD_NAME, newmood,
 				PURPLE_MOOD_COMMENT, moodtext,
 				NULL);
 	} else {
diff -r c9866e46f629 -r 65004796201d pidgin/pixmaps/emotes/small/16/Makefile.am
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am	Tue Feb 09 20:14:10 2010 +0000
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am	Tue Feb 09 21:34:38 2010 +0000
@@ -1,12 +1,10 @@
 # These are mood images that are NOT also used in the smiley theme.
 MOODS = \
     afraid.png \
-    amazed.png \
-    annoyed.png \
     bathing.png \
     cinema.png \
-    dissapointed.png \
-    embarressed.png \
+    disappointed.png \
+    embarrassed.png \
     internet.png \
     music.png \
     restroom.png \