cpw.rekkanoryo.icqxstatus: c9735a4e: Actually set the mood when creating a pr...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: c9735a4e7922385cf7d662443dcb87cfcb72df10
Ancestor: 3b3804039eb91585981ca7ea599299577dc3762d
Author: malu at pidgin.im
Date: 2010-02-09T21:34:38
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/c9735a4e7922385cf7d662443dcb87cfcb72df10

Modified files:
        libpurple/protocols/jabber/usermood.c
        pidgin/pixmaps/emotes/small/16/Makefile.am

ChangeLog: 

Actually set the mood when creating a presence update when receiving mood PEP.
Fixed some erronious pixmap references

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/usermood.c	80d735e42faaf1b8210d905a77047e7bea12eace
+++ libpurple/protocols/jabber/usermood.c	f50fe0ee5dc85fa28bdf4c25c4ff327d70197c85
@@ -160,7 +160,7 @@ static void jabber_mood_cb(JabberStream 
 	}
 	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 {
============================================================
--- pidgin/pixmaps/emotes/small/16/Makefile.am	95adb3491f60964768972acadac4797f8e8cd419
+++ pidgin/pixmaps/emotes/small/16/Makefile.am	901068cd8245dc8584780ff7008895db7201bb92
@@ -1,12 +1,10 @@ MOODS = \
 # 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 \