Mercurial > pidgin
changeset 17907:8d2ea5072f6f
merge of '56282c0e590e48f68f48934e6d0fe5bb4ecd518b'
and '71ed79a95ae8fc95aafeebbea64a8adcf4db8bfd'
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Wed, 11 Jul 2007 15:59:09 +0000 |
| parents | 692057170584 (diff) ba48f21e0795 (current diff) |
| children | 5c1ed6296b56 |
| files | libpurple/util.c |
| diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/adhoccommands.c Wed Jul 11 15:57:14 2007 +0000 +++ b/libpurple/protocols/jabber/adhoccommands.c Wed Jul 11 15:59:09 2007 +0000 @@ -94,12 +94,14 @@ } } +static void jabber_adhoc_parse(JabberStream *js, xmlnode *packet, gpointer data); + static void do_adhoc_action_cb(JabberStream *js, xmlnode *result, const char *actionhandle, gpointer user_data) { xmlnode *command; GList *action; JabberAdHocActionInfo *actionInfo = user_data; JabberIq *iq = jabber_iq_new(js, JABBER_IQ_SET); -/* jabber_iq_set_callback(iq, do_adhoc_parse_iq, NULL);*/ + jabber_iq_set_callback(iq, jabber_adhoc_parse, NULL); xmlnode_set_attrib(iq->node, "to", actionInfo->who); command = xmlnode_new_child(iq->node,"command");
--- a/libpurple/protocols/jabber/caps.c Wed Jul 11 15:57:14 2007 +0000 +++ b/libpurple/protocols/jabber/caps.c Wed Jul 11 15:59:09 2007 +0000 @@ -309,13 +309,13 @@ g_free(id->name); g_free(id); - clientinfo->identities = g_list_remove_link(clientinfo->identities,clientinfo->identities); + clientinfo->identities = g_list_delete_link(clientinfo->identities,clientinfo->identities); } while(clientinfo->features) { char *feat = clientinfo->features->data; g_free(feat); - clientinfo->features = g_list_remove_link(clientinfo->features,clientinfo->features); + clientinfo->features = g_list_delete_link(clientinfo->features,clientinfo->features); } g_free(clientinfo); @@ -340,7 +340,7 @@ g_free(userdata->ver); while(userdata->ext) { g_free(userdata->ext->data); - userdata->ext = g_list_remove_link(userdata->ext,userdata->ext); + userdata->ext = g_list_delete_link(userdata->ext,userdata->ext); } g_free(userdata); }
--- a/libpurple/protocols/jabber/jabber.c Wed Jul 11 15:57:14 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed Jul 11 15:59:09 2007 +0000 @@ -1170,7 +1170,6 @@ case JABBER_STREAM_INITIALIZING_ENCRYPTION: purple_connection_update_progress(js->gc, _("Initializing SSL/TLS"), 6, JABBER_CONNECT_STEPS); - jabber_stream_init(js); break; case JABBER_STREAM_AUTHENTICATING: purple_connection_update_progress(js->gc, _("Authenticating"),