talons

commit 41f150e4d758fb24520f992d0107b5e5f310e3b0
parent 2b8ce9a53b7c4004d2a4eafc06ca5b9117c719e6
Author: Paul <paul@claws-mail.org>
Date:   Tue, 24 Sep 2019 10:04:04 +0100

when creating a new account, don't pre-fill data from the default account

Diffstat:
M
src/prefs_account.c
 | 
25
+------------------------

1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -461,7 +461,7 @@ static PrefParam basic_param[] = {
 	 &basic_page.nntpauth_onconnect_checkbtn,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
 
-	{"user_id", "ENV_USER", &tmp_ac_prefs.userid, P_STRING,
+	{"user_id", NULL, &tmp_ac_prefs.userid, P_STRING,
 	 &basic_page.uid_entry, prefs_set_data_from_entry, prefs_set_entry},
 
 	{"password", NULL, &tmp_ac_prefs.passwd, P_PASSWORD,
@@ -1450,33 +1450,10 @@ static void basic_create_widget_func(PrefsPage * _page,
 	page->auto_configure_lbl = auto_configure_lbl;
 
 	if (new_account) {
-		PrefsAccount *def_ac;
-
 		prefs_set_dialog_to_default(basic_param);
 		buf = g_strdup_printf(_("Account%d"), ac_prefs->account_id);
 		gtk_entry_set_text(GTK_ENTRY(basic_page.acname_entry), buf);
 		g_free(buf);
-		def_ac = account_get_default();
-		if (def_ac) {
-			FolderItem *item = folder_get_default_inbox_for_class(F_MH);
-			gtk_entry_set_text(GTK_ENTRY(basic_page.name_entry),
-					   def_ac->name ? def_ac->name : "");
-			gtk_entry_set_text(GTK_ENTRY(basic_page.addr_entry),
-					   def_ac->address ? def_ac->address : "");
-			gtk_entry_set_text(GTK_ENTRY(basic_page.org_entry),
-					   def_ac->organization ? def_ac->organization : "");
-			if (!item) {
-				item = folder_get_default_inbox();
-			}
-			if (item) {
-				gchar *id = folder_item_get_identifier(item);
-				gtk_entry_set_text(GTK_ENTRY(receive_page.inbox_entry),
-					id);
-				gtk_entry_set_text(GTK_ENTRY(receive_page.local_inbox_entry),
-					id);
-				g_free(id);
-			}
-		}
 	} else {
 		prefs_set_dialog(basic_param);