Tue, 07 Jul 2009 17:44:13 +0000
Plug a leak of an account dropdown selection dialog or two.
The optmenu was being assigned to the wrong field, meaning it would be
created twice (the latter when pidgin_request_fields hits that field). On
top of that, the dropdown was being created even when the field isn't
visible (which, in the case of one active account and the New IM dialog,
it isn't).
Fixes a bunch of failed assertions in the debug log like:
g_log: purple_request_field_account_set_value: assertion `field->type == PURPLE_REQUEST_FIELD_ACCOUNT' failed
/* * PidginIconThemeLoader for 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 "gtkicon-theme-loader.h" #include "gtkstatus-icon-theme.h" #include "xmlnode.h" #include "debug.h" /***************************************************************************** * Icon Theme Builder *****************************************************************************/ static PurpleTheme * pidgin_icon_loader_build(const gchar *dir) { xmlnode *root_node = NULL, *sub_node; gchar *filename_full, *data = NULL; PidginIconTheme *theme = NULL; const gchar *name; /* Find the theme file */ g_return_val_if_fail(dir != NULL, NULL); filename_full = g_build_filename(dir, "theme.xml", NULL); if (g_file_test(filename_full, G_FILE_TEST_IS_REGULAR)) root_node = xmlnode_from_file(dir, "theme.xml", "icon themes", "icon-theme-loader"); g_free(filename_full); if (root_node == NULL) return NULL; name = xmlnode_get_attrib(root_node, "name"); if (name) { /* Parse the tree */ sub_node = xmlnode_get_child(root_node, "description"); data = xmlnode_get_data(sub_node); if (xmlnode_get_attrib(root_node, "name") != NULL) { theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon", "name", name, "author", xmlnode_get_attrib(root_node, "author"), "image", xmlnode_get_attrib(root_node, "image"), "directory", dir, "description", data, NULL); sub_node = xmlnode_get_child(root_node, "icon"); while (sub_node) { pidgin_icon_theme_set_icon(theme, xmlnode_get_attrib(sub_node, "id"), xmlnode_get_attrib(sub_node, "file")); sub_node = xmlnode_get_next_twin(sub_node); } } } xmlnode_free(root_node); g_free(data); return PURPLE_THEME(theme); } /****************************************************************************** * GObject Stuff *****************************************************************************/ static void pidgin_icon_theme_loader_class_init (PidginIconThemeLoaderClass *klass) { PurpleThemeLoaderClass *loader_klass = PURPLE_THEME_LOADER_CLASS(klass); loader_klass->purple_theme_loader_build = pidgin_icon_loader_build; } GType pidgin_icon_theme_loader_get_type (void) { static GType type = 0; if (type == 0) { static const GTypeInfo info = { sizeof(PidginIconThemeLoaderClass), NULL, /* base_init */ NULL, /* base_finalize */ (GClassInitFunc)pidgin_icon_theme_loader_class_init, /* class_init */ NULL, /* class_finalize */ NULL, /* class_data */ sizeof (PidginIconThemeLoader), 0, /* n_preallocs */ NULL, /* instance_init */ NULL, /* value table */ }; type = g_type_register_static (PURPLE_TYPE_THEME_LOADER, "PidginIconThemeLoader", &info, 0); } return type; }