changeset 2190:24d947eff811

[gaim-migrate @ 2200] this was a dumb bug. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 29 Aug 2001 23:38:38 +0000
parents dca8e00d7de0
children 657dbe515608
files src/multi.c
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/multi.c	Wed Aug 29 20:58:08 2001 +0000
+++ b/src/multi.c	Wed Aug 29 23:38:38 2001 +0000
@@ -245,7 +245,6 @@
 			g_snprintf(u->password, sizeof(u->password), "%s", txt);
 		else
 			u->password[0] = '\0';
-		gtk_widget_destroy(u->mod);
 		i = gtk_clist_find_row_from_data(GTK_CLIST(list), u);
 		gtk_clist_set_text(GTK_CLIST(list), i, 2,
 				   (u->options & OPT_USR_AUTO) ? "True" : "False");
@@ -262,6 +261,8 @@
 		if (u->opt_entries)
 			g_list_free(u->opt_entries);
 		u->opt_entries = NULL;
+
+		gtk_widget_destroy(u->mod);
 	} else {
 		txt = gtk_entry_get_text(GTK_ENTRY(tmpusr.name));
 		u = new_user(txt, tmpusr.protocol, tmpusr.options);
@@ -484,6 +485,14 @@
 
 	gtk_notebook_remove_page(GTK_NOTEBOOK(book), 1);
 
+	if (u && u->opt_entries) {
+		g_list_free(u->opt_entries);
+		u->opt_entries = NULL;
+	} else if (!u && tmpusr.opt_entries) {
+		g_list_free(tmpusr.opt_entries);
+		tmpusr.opt_entries = NULL;
+	}
+
 	if (p && p->user_opts) {
 		GList *op = (*p->user_opts)();
 		GList *tmp = op;
@@ -495,14 +504,6 @@
 
 		char buf[256];
 
-		if (u && u->opt_entries) {
-			g_list_free(u->opt_entries);
-			u->opt_entries = NULL;
-		} else if (!u && tmpusr.opt_entries) {
-			g_list_free(tmpusr.opt_entries);
-			tmpusr.opt_entries = NULL;
-		}
-
 		vbox = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
 		g_snprintf(buf, sizeof(buf), "%s Options", (*p->name)());