diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2004-09-28 15:33:24 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2004-09-28 15:33:24 +0000 |
| commit | 1badd8d91316da4cdd519adc8abd957cab140619 (patch) | |
| tree | e6efb4881691e220236f67e251226eb8b9ef3c3d /net-im | |
| parent | use.mask a few more php USE flags (diff) | |
| download | gentoo-2-1badd8d91316da4cdd519adc8abd957cab140619.tar.gz gentoo-2-1badd8d91316da4cdd519adc8abd957cab140619.tar.bz2 gentoo-2-1badd8d91316da4cdd519adc8abd957cab140619.zip | |
Fix for getting roomlists in jabber.
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gaim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff | 82 | ||||
| -rw-r--r-- | net-im/gaim/gaim-1.0.0.ebuild | 3 |
3 files changed, 89 insertions, 2 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index b68fe3d832ba..ba4dc5c553d0 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gaim # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.244 2004/09/18 01:07:51 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.245 2004/09/28 15:33:24 rizzo Exp $ + + 28 Sep 2004; Don Seiler <rizzo@gentoo.org> + +files/gaim-1.0.1cvs-jabber-roomlist.diff, gaim-1.0.0.ebuild: + Fix for getting roomlists in jabber. *gaim-1.0.0 (17 Sep 2004) 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 new file mode 100644 index 000000000000..127405fd1f49 --- /dev/null +++ b/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff @@ -0,0 +1,82 @@ +=================================================================== +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; + } diff --git a/net-im/gaim/gaim-1.0.0.ebuild b/net-im/gaim/gaim-1.0.0.ebuild index d80025501a25..d56e14b3c121 100644 --- a/net-im/gaim/gaim-1.0.0.ebuild +++ b/net-im/gaim/gaim-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.0.ebuild,v 1.5 2004/09/23 14:28:33 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.0.ebuild,v 1.6 2004/09/28 15:33:24 rizzo Exp $ inherit flag-o-matic eutils gcc debug @@ -62,6 +62,7 @@ src_unpack() { unpack ${A} cd ${S} use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch + epatch ${FILESDIR}/gaim-1.0.1cvs-jabber-roomlist.diff } src_compile() { |