Mercurial > pidgin
changeset 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 | 892a99da5c5f |
| files | libpurple/protocols/jabber/adhoccommands.c libpurple/protocols/jabber/pep.c libpurple/protocols/jabber/presence.c libpurple/protocols/jabber/usermood.c libpurple/protocols/jabber/xdata.c |
| diffstat | 5 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/adhoccommands.c Mon Sep 10 14:37:40 2007 +0000 +++ b/libpurple/protocols/jabber/adhoccommands.c Mon Sep 10 14:46:13 2007 +0000 @@ -266,7 +266,7 @@ jabber_iq_send(iq); } -void jabber_adhoc_server_execute(PurplePluginAction *action) { +static void jabber_adhoc_server_execute(PurplePluginAction *action) { JabberAdHocCommands *cmd = action->user_data; if(cmd) { PurpleConnection *gc = (PurpleConnection *) action->context;
--- a/libpurple/protocols/jabber/pep.c Mon Sep 10 14:37:40 2007 +0000 +++ b/libpurple/protocols/jabber/pep.c Mon Sep 10 14:46:13 2007 +0000 @@ -109,21 +109,22 @@ void jabber_pep_publish(JabberStream *js, xmlnode *publish) { JabberIq *iq; - + xmlnode *pubsub; + if(js->pep != TRUE) { /* ignore when there's no PEP support on the server */ xmlnode_free(publish); return; } - + iq = jabber_iq_new(js, JABBER_IQ_SET); - - xmlnode *pubsub = xmlnode_new("pubsub"); + + pubsub = xmlnode_new("pubsub"); xmlnode_set_namespace(pubsub, "http://jabber.org/protocol/pubsub"); - + xmlnode_insert_child(pubsub, publish); - + xmlnode_insert_child(iq->node, pubsub); - + jabber_iq_send(iq); }
--- a/libpurple/protocols/jabber/presence.c Mon Sep 10 14:37:40 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Mon Sep 10 14:46:13 2007 +0000 @@ -209,9 +209,9 @@ js->old_length = length; js->old_track = g_strdup(track); } - -#undef CHANGED(a,b) - + +#undef CHANGED + jabber_presence_fake_to_self(js, status); }
--- a/libpurple/protocols/jabber/usermood.c Mon Sep 10 14:37:40 2007 +0000 +++ b/libpurple/protocols/jabber/usermood.c Mon Sep 10 14:46:13 2007 +0000 @@ -127,18 +127,17 @@ } } if (newmood != NULL) { + const char *status_id; JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL); if(!resource) { /* huh? */ - if (moodtext) - g_free(moodtext); + g_free(moodtext); return; } - const char *status_id = jabber_buddy_state_get_status_id(resource->state); - + status_id = jabber_buddy_state_get_status_id(resource->state); + purple_prpl_got_user_status(js->gc->account, from, status_id, "mood", _(newmood), "moodtext", moodtext?moodtext:"", NULL); } - if (moodtext) - g_free(moodtext); + g_free(moodtext); } void jabber_mood_init(void) {
--- a/libpurple/protocols/jabber/xdata.c Mon Sep 10 14:37:40 2007 +0000 +++ b/libpurple/protocols/jabber/xdata.c Mon Sep 10 14:46:13 2007 +0000 @@ -172,8 +172,8 @@ data->values = g_slist_delete_link(data->values, data->values); } if (data->actions) { + GList *action; hasActions = TRUE; - GList *action; for(action = data->actions; action; action = g_list_next(action)) { g_free(action->data); }