Mercurial > pidgin
view libpurple/protocols/bonjour/jabber.h @ 22411:d9105ead88dc
When purple_buddy_icons_set_account_icon() is called, it unrefs the old PurpleStoredImage and refs the new one. Previously, it notified the prpl of the change in the buddy icon before updating pointer_icon_cache, which meant that if the prpl then called purple_buddy_icons_find_account_icon() it would get the old PurpleStoredImage (which is at this point not only old but also a pointer to invalid memory if unref'ing it caused it to be destroyed). This happens in jabber_set_info() as of 2.4.0, causing a crash when setting no-buddy-icon for an account after it has previously had an icon. I think this also means that XMPP accounts in 2.4.0 will also always set serverside the *last* icon set, not the current one, when changing icons, but I didn't test that.
The solution is simple: Update pointer_icon_cache earlier, setting the new img if there is one or removing the account entirely from the hash table if there isn't one now. This fixes both problems described above, making purple_buddy_icons_find_account_icon() return the new, current icon (or NULL) at all times.
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Tue, 04 Mar 2008 00:11:22 +0000 |
parents | 603d5325af4c |
children | 5706043db5b5 |
line wrap: on
line source
/** * @file jabber.h The Purple interface to mDNS and peer to peer Jabber. * * purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _BONJOUR_JABBER_H_ #define _BONJOUR_JABBER_H_ #include <libxml/parser.h> #include "xmlnode.h" #include "account.h" #include "circbuffer.h" typedef struct _BonjourJabber { gint port; gint socket; gint watcher_id; PurpleAccount *account; GSList *pending_conversations; } BonjourJabber; typedef struct _BonjourJabberConversation { gint socket; guint rx_handler; guint tx_handler; guint close_timeout; PurpleCircBuffer *tx_buf; int sent_stream_start; /* 0 = Unsent, 1 = Partial, 2 = Complete */ gboolean recv_stream_start; PurpleProxyConnectData *connect_data; gpointer stream_data; xmlParserCtxt *context; xmlnode *current; PurpleBuddy *pb; PurpleAccount *account; /* The following are only needed before attaching to a PurpleBuddy */ gchar *buddy_name; gchar *ip; } BonjourJabberConversation; /** * Start listening for jabber connections. * * @return -1 if there was a problem, else returns the listening * port number. */ gint bonjour_jabber_start(BonjourJabber *data); int bonjour_jabber_send_message(BonjourJabber *data, const char *to, const char *body); void bonjour_jabber_close_conversation(BonjourJabberConversation *bconv); void async_bonjour_jabber_close_conversation(BonjourJabberConversation *bconv); void bonjour_jabber_stream_started(BonjourJabberConversation *bconv); void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv); void bonjour_jabber_process_packet(PurpleBuddy *pb, xmlnode *packet); void bonjour_jabber_stop(BonjourJabber *data); void bonjour_jabber_conv_match_by_ip(BonjourJabberConversation *bconv); void bonjour_jabber_conv_match_by_name(BonjourJabberConversation *bconv); typedef enum { XEP_IQ_SET, XEP_IQ_GET, XEP_IQ_RESULT, XEP_IQ_ERROR, XEP_IQ_NONE } XepIqType; typedef struct _XepIq { XepIqType type; char *id; xmlnode *node; char *to; void *data; } XepIq; XepIq *xep_iq_new(void *data, XepIqType type, const char *to, const char *from, const char *id); int xep_iq_send_and_free(XepIq *iq); const char *purple_network_get_my_ip_ext2(int fd); #endif /* _BONJOUR_JABBER_H_ */