Mercurial > pidgin
comparison libpurple/protocols/jabber/usermood.c @ 19699:680a3aea5eb6
Various warning fixes for the xmpp prpl.
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 10 Sep 2007 14:46:13 +0000 |
parents | d32ed28cf645 |
children | e10ed6060df3 ab38146f8f78 |
comparison
equal
deleted
inserted
replaced
19698:d32ed28cf645 | 19699:680a3aea5eb6 |
---|---|
125 if (newmood != NULL && moodtext != NULL) | 125 if (newmood != NULL && moodtext != NULL) |
126 break; | 126 break; |
127 } | 127 } |
128 } | 128 } |
129 if (newmood != NULL) { | 129 if (newmood != NULL) { |
130 const char *status_id; | |
130 JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL); | 131 JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL); |
131 if(!resource) { /* huh? */ | 132 if(!resource) { /* huh? */ |
132 if (moodtext) | 133 g_free(moodtext); |
133 g_free(moodtext); | |
134 return; | 134 return; |
135 } | 135 } |
136 const char *status_id = jabber_buddy_state_get_status_id(resource->state); | 136 status_id = jabber_buddy_state_get_status_id(resource->state); |
137 | 137 |
138 purple_prpl_got_user_status(js->gc->account, from, status_id, "mood", _(newmood), "moodtext", moodtext?moodtext:"", NULL); | 138 purple_prpl_got_user_status(js->gc->account, from, status_id, "mood", _(newmood), "moodtext", moodtext?moodtext:"", NULL); |
139 } | 139 } |
140 if (moodtext) | 140 g_free(moodtext); |
141 g_free(moodtext); | |
142 } | 141 } |
143 | 142 |
144 void jabber_mood_init(void) { | 143 void jabber_mood_init(void) { |
145 jabber_add_feature("mood", "http://jabber.org/protocol/mood", jabber_pep_namespace_only_when_pep_enabled_cb); | 144 jabber_add_feature("mood", "http://jabber.org/protocol/mood", jabber_pep_namespace_only_when_pep_enabled_cb); |
146 jabber_pep_register_handler("moodn", "http://jabber.org/protocol/mood", jabber_mood_cb); | 145 jabber_pep_register_handler("moodn", "http://jabber.org/protocol/mood", jabber_mood_cb); |