Remove (obsolete) FSF address from welcome mail

[claws.git] / src / wizard.c

diff --git a/src/wizard.c b/src/wizard.c
index 8d6ba936742b28a6e27489cb737df4912da43fc5..777b8bfeebdc6c62cc9058202b4b8c80b94f6cd9 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -576,9 +576,8 @@ static void write_welcome_email(WizardWindow *wizard)
                "-------\n"
                "Claws Mail is free software, released under the terms\n"
                "of the GNU General Public License, version 3 or later, as\n"
-               "published by the Free Software Foundation, 51 Franklin Street,\n"
-               "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
-               "found at <%s>.\n"
+               "published by the Free Software Foundation. The license can\n"
+               "be found at <%s>.\n"
                "\n"
                "DONATIONS\n"
                "---------\n"
@@ -760,14 +759,10 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        prefs_account->smtp_userid = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->smtp_username)));
 
-       passwd_store_set(PWS_ACCOUNT,
-                       prefs_account->account_name,
-                       PWS_ACCOUNT_RECV,
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_RECV,
                        gtk_entry_get_text(GTK_ENTRY(wizard->recv_password)),
                        FALSE);
-       passwd_store_set(PWS_ACCOUNT,
-                       prefs_account->account_name,
-                       PWS_ACCOUNT_SEND,
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_SEND,
                        gtk_entry_get_text(GTK_ENTRY(wizard->smtp_password)),
                        FALSE);
 
@@ -804,14 +799,10 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        prefs_account->in_ssl_client_cert_file = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_ssl_cert_file)));
 
-       passwd_store_set(PWS_ACCOUNT,
-                       prefs_account->account_name,
-                       PWS_ACCOUNT_SEND_CERT,
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_SEND_CERT,
                        gtk_entry_get_text(GTK_ENTRY(wizard->smtp_ssl_cert_pass)),
                        FALSE);
-       passwd_store_set(PWS_ACCOUNT,
-                       prefs_account->account_name,
-                       PWS_ACCOUNT_RECV_CERT,
+       passwd_store_set_account(prefs_account->account_id, PWS_ACCOUNT_RECV_CERT,
                        gtk_entry_get_text(GTK_ENTRY(wizard->recv_ssl_cert_pass)),
                        FALSE);
 #endif
@@ -856,8 +847,7 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
 
        /* create the titlebar */
        hbox = gtk_hbox_new (FALSE, 12);
-       image = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_CLAWS_MAIL_ICON);
+       image = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_ICON);
        gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 0);
        title_string = g_strconcat ("<span size=\"xx-large\" weight=\"ultrabold\">", title ? title : "", "</span>", NULL);
        w = gtk_label_new (title_string);
@@ -1831,8 +1821,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        page = create_page(wizard, _("Welcome to Claws Mail"));
        
        wizard->pages = g_slist_append(wizard->pages, page);
-       widget = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_CLAWS_MAIL_LOGO);
+       widget = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_LOGO);
 
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
        
@@ -1914,8 +1903,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        page = create_page(wizard, _("Configuration finished"));
        
        wizard->pages = g_slist_append(wizard->pages, page);
-       widget = stock_pixmap_widget(wizard->window, 
-                               STOCK_PIXMAP_CLAWS_MAIL_LOGO);
+       widget = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_LOGO);
 
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);