Mercurial > pidgin
view libpurple/whiteboard.c @ 31588:06ed9020b784
jabber: Treat empty <group/> elements as "Buddies", not ""
This ultimately led to duplicates in the list, because
we had one entry in the GSList as "", and one as NULL, both of which are
invalid group names, which resulted in the core blithely replacing
them with "Buddies" and generating duplicates.
I've tested with and without, and can reproduce the issues without the change.
Log:
<item subscription='both' name='person' jid='person@example.com'><group></group><group></group></item>
(19:32:23) jabber: jabber_roster_parse(): Removing person@example.com from group 'Buddies' on the local list
(19:32:23) GLib: g_string_append: assertion `val != NULL' failed
(19:32:23) jabber: jabber_roster_parse(): Adding person@example.com to groups: ,
(19:32:23) g_log: purple_find_group: assertion `(name != NULL) && (*name != '\0')' failed
(19:32:23) g_log: purple_group_new: assertion `name != NULL' failed
(19:32:23) g_log: purple_blist_add_group: assertion `group != NULL' failed
(19:32:23) g_log: purple_find_group: assertion `(name != NULL) && (*name != '\0')' failed
(19:32:23) g_log: purple_group_new: assertion `*name != '\0'' failed
(19:32:23) g_log: purple_blist_add_group: assertion `group != NULL' failed
Since I had to look it up, purple_blist_add_buddy replaces (group == NULL) with "Buddies".
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Wed, 11 May 2011 01:58:03 +0000 |
parents | f1437342cc0e |
children | cea77667da7d 3828a61c44da |
line wrap: on
line source
/* * 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 * */ #include "internal.h" #include "whiteboard.h" #include "prpl.h" /****************************************************************************** * Globals *****************************************************************************/ static PurpleWhiteboardUiOps *whiteboard_ui_ops = NULL; /* static PurpleWhiteboardPrplOps *whiteboard_prpl_ops = NULL; */ static GList *wbList = NULL; /*static gboolean auto_accept = TRUE; */ /****************************************************************************** * API *****************************************************************************/ void purple_whiteboard_set_ui_ops(PurpleWhiteboardUiOps *ops) { whiteboard_ui_ops = ops; } void purple_whiteboard_set_prpl_ops(PurpleWhiteboard *wb, PurpleWhiteboardPrplOps *ops) { wb->prpl_ops = ops; } PurpleWhiteboard *purple_whiteboard_create(PurpleAccount *account, const char *who, int state) { PurplePluginProtocolInfo *prpl_info; PurpleWhiteboard *wb = g_new0(PurpleWhiteboard, 1); wb->account = account; wb->state = state; wb->who = g_strdup(who); prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl( purple_account_get_connection(account))); purple_whiteboard_set_prpl_ops(wb, prpl_info->whiteboard_prpl_ops); /* Start up protocol specifics */ if(wb->prpl_ops && wb->prpl_ops->start) wb->prpl_ops->start(wb); wbList = g_list_append(wbList, wb); return wb; } void purple_whiteboard_destroy(PurpleWhiteboard *wb) { g_return_if_fail(wb != NULL); if(wb->ui_data) { /* Destroy frontend */ if(whiteboard_ui_ops && whiteboard_ui_ops->destroy) whiteboard_ui_ops->destroy(wb); } /* Do protocol specific session ending procedures */ if(wb->prpl_ops && wb->prpl_ops->end) wb->prpl_ops->end(wb); g_free(wb->who); wbList = g_list_remove(wbList, wb); g_free(wb); } void purple_whiteboard_start(PurpleWhiteboard *wb) { /* Create frontend for whiteboard */ if(whiteboard_ui_ops && whiteboard_ui_ops->create) whiteboard_ui_ops->create(wb); } /* Looks through the list of whiteboard sessions for one that is between * usernames 'me' and 'who'. Returns a pointer to a matching whiteboard * session; if none match, it returns NULL. */ PurpleWhiteboard *purple_whiteboard_get_session(const PurpleAccount *account, const char *who) { PurpleWhiteboard *wb; GList *l = wbList; /* Look for a whiteboard session between the local user and the remote user */ while(l != NULL) { wb = l->data; if(wb->account == account && purple_strequal(wb->who, who)) return wb; l = l->next; } return NULL; } void purple_whiteboard_draw_list_destroy(GList *draw_list) { g_list_free(draw_list); } gboolean purple_whiteboard_get_dimensions(const PurpleWhiteboard *wb, int *width, int *height) { PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops; if (prpl_ops && prpl_ops->get_dimensions) { prpl_ops->get_dimensions(wb, width, height); return TRUE; } return FALSE; } void purple_whiteboard_set_dimensions(PurpleWhiteboard *wb, int width, int height) { if(whiteboard_ui_ops && whiteboard_ui_ops->set_dimensions) whiteboard_ui_ops->set_dimensions(wb, width, height); } void purple_whiteboard_send_draw_list(PurpleWhiteboard *wb, GList *list) { PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops; if (prpl_ops && prpl_ops->send_draw_list) prpl_ops->send_draw_list(wb, list); } void purple_whiteboard_draw_point(PurpleWhiteboard *wb, int x, int y, int color, int size) { if(whiteboard_ui_ops && whiteboard_ui_ops->draw_point) whiteboard_ui_ops->draw_point(wb, x, y, color, size); } void purple_whiteboard_draw_line(PurpleWhiteboard *wb, int x1, int y1, int x2, int y2, int color, int size) { if(whiteboard_ui_ops && whiteboard_ui_ops->draw_line) whiteboard_ui_ops->draw_line(wb, x1, y1, x2, y2, color, size); } void purple_whiteboard_clear(PurpleWhiteboard *wb) { if(whiteboard_ui_ops && whiteboard_ui_ops->clear) whiteboard_ui_ops->clear(wb); } void purple_whiteboard_send_clear(PurpleWhiteboard *wb) { PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops; if (prpl_ops && prpl_ops->clear) prpl_ops->clear(wb); } void purple_whiteboard_send_brush(PurpleWhiteboard *wb, int size, int color) { PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops; if (prpl_ops && prpl_ops->set_brush) prpl_ops->set_brush(wb, size, color); } gboolean purple_whiteboard_get_brush(const PurpleWhiteboard *wb, int *size, int *color) { PurpleWhiteboardPrplOps *prpl_ops = wb->prpl_ops; if (prpl_ops && prpl_ops->get_brush) { prpl_ops->get_brush(wb, size, color); return TRUE; } return FALSE; } void purple_whiteboard_set_brush(PurpleWhiteboard *wb, int size, int color) { if (whiteboard_ui_ops && whiteboard_ui_ops->set_brush) whiteboard_ui_ops->set_brush(wb, size, color); }