diff options
Diffstat (limited to 'net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff')
| -rw-r--r-- | net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff b/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff deleted file mode 100644 index 127405fd1f49..000000000000 --- a/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff +++ /dev/null @@ -1,82 +0,0 @@ -=================================================================== -RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/chat.c,v -retrieving revision 1.40 -retrieving revision 1.40.2.1 -diff -u -r1.40 -r1.40.2.1 ---- gaim/gaim/src/protocols/jabber/chat.c 2004/08/31 01:45:08 1.40 -+++ gaim/gaim/src/protocols/jabber/chat.c 2004/09/19 04:16:00 1.40.2.1 -@@ -690,17 +690,43 @@ - js->roomlist = NULL; - } - -+static void roomlist_cancel_cb(JabberStream *js, const char *server) { -+ if(js->roomlist) { -+ gaim_roomlist_set_in_progress(js->roomlist, FALSE); -+ gaim_roomlist_unref(js->roomlist); -+ js->roomlist = NULL; -+ } -+} -+ - static void roomlist_ok_cb(JabberStream *js, const char *server) - { - JabberIq *iq; -- GList *fields = NULL; -- GaimRoomlistField *f; -+ -+ if(!js->roomlist) -+ return; - - if(!server || !*server) { - gaim_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL); - return; - } - -+ gaim_roomlist_set_in_progress(js->roomlist, TRUE); -+ -+ iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items"); -+ -+ xmlnode_set_attrib(iq->node, "to", server); -+ -+ jabber_iq_set_callback(iq, roomlist_disco_result_cb, NULL); -+ -+ jabber_iq_send(iq); -+} -+ -+GaimRoomlist *jabber_roomlist_get_list(GaimConnection *gc) -+{ -+ JabberStream *js = gc->proto_data; -+ GList *fields = NULL; -+ GaimRoomlistField *f; -+ - if(js->roomlist) - gaim_roomlist_unref(js->roomlist); - -@@ -717,26 +743,13 @@ - - gaim_roomlist_set_fields(js->roomlist, fields); - -- gaim_roomlist_set_in_progress(js->roomlist, TRUE); -- -- iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items"); -- -- xmlnode_set_attrib(iq->node, "to", server); -- -- jabber_iq_set_callback(iq, roomlist_disco_result_cb, NULL); -- -- jabber_iq_send(iq); --} -- --GaimRoomlist *jabber_roomlist_get_list(GaimConnection *gc) --{ -- JabberStream *js = gc->proto_data; - - gaim_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), - _("Select a conference server to query"), - js->chat_servers ? js->chat_servers->data : "conference.jabber.org", - FALSE, FALSE, NULL, -- _("Find Rooms"), G_CALLBACK(roomlist_ok_cb), _("Cancel"), NULL, js); -+ _("Find Rooms"), GAIM_CALLBACK(roomlist_ok_cb), -+ _("Cancel"), GAIM_CALLBACK(roomlist_cancel_cb), js); - - return js->roomlist; - } |