Mercurial > pidgin.yaz
view pidgin/gtkconn.c @ 32040: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 | 71dc3b5edbe7 |
children | af709c6ab032 |
line wrap: on
line source
/* * @file gtkconn.c GTK+ Connection API * @ingroup pidgin */ /* pidgin * * Pidgin 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 "pidgin.h" #include "account.h" #include "debug.h" #include "notify.h" #include "prefs.h" #include "gtkblist.h" #include "gtkconn.h" #include "gtkdialogs.h" #include "gtkstatusbox.h" #include "pidginstock.h" #include "gtkutils.h" #include "util.h" #define INITIAL_RECON_DELAY_MIN 8000 #define INITIAL_RECON_DELAY_MAX 60000 #define MAX_RECON_DELAY 600000 #define MAX_RACCOON_DELAY "shorter in urban areas" typedef struct { int delay; guint timeout; } PidginAutoRecon; /** * Contains accounts that are auto-reconnecting. * The key is a pointer to the PurpleAccount and the * value is a pointer to a PidginAutoRecon. */ static GHashTable *auto_reconns = NULL; static void pidgin_connection_connect_progress(PurpleConnection *gc, const char *text, size_t step, size_t step_count) { PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if (!gtkblist) return; pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox), (purple_connections_get_connecting() != NULL)); pidgin_status_box_pulse_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox)); } static void pidgin_connection_connected(PurpleConnection *gc) { PurpleAccount *account; PidginBuddyList *gtkblist; account = purple_connection_get_account(gc); gtkblist = pidgin_blist_get_default_gtk_blist(); if (gtkblist != NULL) pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox), (purple_connections_get_connecting() != NULL)); g_hash_table_remove(auto_reconns, account); } static void pidgin_connection_disconnected(PurpleConnection *gc) { PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if (!gtkblist) return; pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox), (purple_connections_get_connecting() != NULL)); if (purple_connections_get_all() != NULL) return; pidgin_dialogs_destroy_all(); } static void free_auto_recon(gpointer data) { PidginAutoRecon *info = data; if (info->timeout != 0) g_source_remove(info->timeout); g_free(info); } static gboolean do_signon(gpointer data) { PurpleAccount *account = data; PidginAutoRecon *info; PurpleStatus *status; purple_debug_info("autorecon", "do_signon called\n"); g_return_val_if_fail(account != NULL, FALSE); info = g_hash_table_lookup(auto_reconns, account); if (info) info->timeout = 0; status = purple_account_get_active_status(account); if (purple_status_is_online(status)) { purple_debug_info("autorecon", "calling purple_account_connect\n"); purple_account_connect(account); purple_debug_info("autorecon", "done calling purple_account_connect\n"); } return FALSE; } static void pidgin_connection_report_disconnect_reason (PurpleConnection *gc, PurpleConnectionError reason, const char *text) { PurpleAccount *account = NULL; PidginAutoRecon *info; account = purple_connection_get_account(gc); info = g_hash_table_lookup(auto_reconns, account); if (!purple_connection_error_is_fatal (reason)) { if (info == NULL) { info = g_new0(PidginAutoRecon, 1); g_hash_table_insert(auto_reconns, account, info); info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX); } else { info->delay = MIN(2 * info->delay, MAX_RECON_DELAY); if (info->timeout != 0) g_source_remove(info->timeout); } info->timeout = g_timeout_add(info->delay, do_signon, account); } else { if (info != NULL) g_hash_table_remove(auto_reconns, account); purple_account_set_enabled(account, PIDGIN_UI, FALSE); } } static void pidgin_connection_network_connected (void) { GList *list, *l; PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if(gtkblist) pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), TRUE); l = list = purple_accounts_get_all_active(); while (l) { PurpleAccount *account = (PurpleAccount*)l->data; g_hash_table_remove(auto_reconns, account); if (purple_account_is_disconnected(account)) do_signon(account); l = l->next; } g_list_free(list); } static void pidgin_connection_network_disconnected (void) { GList *list, *l; PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist(); if(gtkblist) pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), FALSE); l = list = purple_accounts_get_all_active(); while (l) { PurpleAccount *a = (PurpleAccount*)l->data; if (!purple_account_is_disconnected(a)) { char *password = g_strdup(purple_account_get_password(a)); purple_account_disconnect(a); purple_account_set_password(a, password); g_free(password); } l = l->next; } g_list_free(list); } static void pidgin_connection_notice(PurpleConnection *gc, const char *text) { } static PurpleConnectionUiOps conn_ui_ops = { pidgin_connection_connect_progress, pidgin_connection_connected, pidgin_connection_disconnected, pidgin_connection_notice, NULL, /* report_disconnect */ pidgin_connection_network_connected, pidgin_connection_network_disconnected, pidgin_connection_report_disconnect_reason, NULL, NULL, NULL }; PurpleConnectionUiOps * pidgin_connections_get_ui_ops(void) { return &conn_ui_ops; } static void account_removed_cb(PurpleAccount *account, gpointer user_data) { g_hash_table_remove(auto_reconns, account); } /************************************************************************** * GTK+ connection glue **************************************************************************/ void * pidgin_connection_get_handle(void) { static int handle; return &handle; } void pidgin_connection_init(void) { auto_reconns = g_hash_table_new_full( g_direct_hash, g_direct_equal, NULL, free_auto_recon); purple_signal_connect(purple_accounts_get_handle(), "account-removed", pidgin_connection_get_handle(), PURPLE_CALLBACK(account_removed_cb), NULL); } void pidgin_connection_uninit(void) { purple_signals_disconnect_by_handle(pidgin_connection_get_handle()); g_hash_table_destroy(auto_reconns); }