diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-02-09 21:34:38 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-02-09 21:34:38 +0000 |
| commit | 3d8d5119a9e7cf26200d9ad42a837856a5578424 (patch) | |
| tree | 2de0147a86e2bd438901dcf7c63e78dd1ab75e26 | |
| parent | bf1cfe6fa1649762312e9062a1530e123ee76a86 (diff) | |
| download | pidgin-3d8d5119a9e7cf26200d9ad42a837856a5578424.tar.gz | |
Actually set the mood when creating a presence update when receiving mood PEP.
Fixed some erronious pixmap references
| -rw-r--r-- | libpurple/protocols/jabber/usermood.c | 2 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/Makefile.am | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libpurple/protocols/jabber/usermood.c b/libpurple/protocols/jabber/usermood.c index e3623f2641..da5c1a0ccc 100644 --- a/libpurple/protocols/jabber/usermood.c +++ b/libpurple/protocols/jabber/usermood.c @@ -160,7 +160,7 @@ static void jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items) { } 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 --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am index 96595a3c7d..64ce3768db 100644 --- a/pidgin/pixmaps/emotes/small/16/Makefile.am +++ b/pidgin/pixmaps/emotes/small/16/Makefile.am @@ -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 \ |