From c650d5467d924784a62a2049616c39af8ce27e15 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 12 Jan 2001 21:59:42 +0000 Subject: Anna's dialogs. 2001-01-12 Jeffrey Stedfast * mail-config.glade: Anna's dialogs. * mail-config.c (mail_config_get_account_by_address): Removed. Danw and I decided on setting a X-Evolution-Transport header on messages going to the Outbox so we can later guess which transport to use when sending it. * mail-account-editor.c (apply_changes): Update to some day be able to support SSL. (construct): Update for Anna's dialogs... * subscribe-dialog.c (populate_store_list): Updated to reflect past changes to the mail-config API. svn path=/trunk/; revision=7461 --- mail/ChangeLog | 18 +- mail/mail-account-editor.c | 51 +- mail/mail-account-editor.h | 2 +- mail/mail-config-druid.c | 4 +- mail/mail-config.glade | 2338 ++++++++++++++++++++------------------------ mail/mail-config.glade.h | 71 +- mail/mail-config.h | 1 - mail/subscribe-dialog.c | 9 +- 8 files changed, 1169 insertions(+), 1325 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 44555fcfca..2096297276 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,19 @@ +2001-01-12 Jeffrey Stedfast + + * mail-config.glade: Anna's dialogs. + + * mail-config.c (mail_config_get_account_by_address): + Removed. Danw and I decided on setting a X-Evolution-Transport + header on messages going to the Outbox so we can later guess which + transport to use when sending it. + + * mail-account-editor.c (apply_changes): Update to some day be + able to support SSL. + (construct): Update for Anna's dialogs... + + * subscribe-dialog.c (populate_store_list): Updated to reflect + past changes to the mail-config API. + 2001-01-12 Jeffrey Stedfast * mail-callbacks.c (composer_send_cb): Get the account by using @@ -20,7 +36,7 @@ * message-list.c: Add strings for localization - * folder-browser.c: Rename "Save" to "Store search as vFolder". + * folder-browser.c: Rename "Save" to "Store search as vFolder". 2001-01-11 Miguel de Icaza diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index 6336bc5635..60f4c0ec09 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -114,8 +114,10 @@ apply_changes (MailAccountEditor *editor) account = (MailConfigAccount *) editor->account; /* account name */ - g_free (account->name); - account->name = g_strdup (gtk_entry_get_text (editor->account_name)); + if (editor->account_name) { + g_free (account->name); + account->name = g_strdup (gtk_entry_get_text (editor->account_name)); + } /* identity info */ g_free (account->id->name); @@ -124,14 +126,20 @@ apply_changes (MailAccountEditor *editor) g_free (account->id->address); account->id->address = g_strdup (gtk_entry_get_text (editor->email)); - g_free (account->id->reply_to); - account->id->reply_to = g_strdup (gtk_entry_get_text (editor->reply_to)); + if (editor->reply_to) { + g_free (account->id->reply_to); + account->id->reply_to = g_strdup (gtk_entry_get_text (editor->reply_to)); + } - g_free (account->id->organization); - account->id->organization = g_strdup (gtk_entry_get_text (editor->organization)); + if (editor->organization) { + g_free (account->id->organization); + account->id->organization = g_strdup (gtk_entry_get_text (editor->organization)); + } - g_free (account->id->signature); - account->id->signature = gnome_file_entry_get_full_path (editor->signature, TRUE); + if (editor->signature) { + g_free (account->id->signature); + account->id->signature = gnome_file_entry_get_full_path (editor->signature, TRUE); + } /* source */ url = camel_url_new (account->source->url, NULL); @@ -163,6 +171,9 @@ apply_changes (MailAccountEditor *editor) account->source->save_passwd = GTK_TOGGLE_BUTTON (editor->save_passwd)->active; account->source->keep_on_server = GTK_TOGGLE_BUTTON (editor->keep_on_server)->active; + if (editor->source_ssl) + account->source->use_ssl = GTK_TOGGLE_BUTTON (editor->source_ssl)->active; + /* check to make sure the source works */ if (!mail_config_check_service (url, CAMEL_PROVIDER_STORE, NULL)) { camel_url_free (url); @@ -197,6 +208,9 @@ apply_changes (MailAccountEditor *editor) url->host = host; url->port = port; + if (editor->transport_ssl) + account->transport->use_ssl = GTK_TOGGLE_BUTTON (editor->transport_ssl)->active; + /* check to make sure the transport works */ if (!mail_config_check_service (url, CAMEL_PROVIDER_TRANSPORT, NULL)) { camel_url_free (url); @@ -577,7 +591,7 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) editor->gui = gui; /* get our toplevel widget */ - notebook = glade_xml_get_widget (gui, "notebook"); + notebook = glade_xml_get_widget (gui, "toplevel"); /* reparent */ gtk_widget_reparent (notebook, GNOME_DIALOG (editor)->vbox); @@ -604,7 +618,9 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) /* General */ editor->account_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtAccountName")); - gtk_entry_set_text (editor->account_name, account->name); + /* Anna's dialog doesn't have a way to edit the Account name... */ + if (editor->account_name) + gtk_entry_set_text (editor->account_name, account->name); gtk_signal_connect (GTK_OBJECT (editor->account_name), "changed", entry_changed, editor); editor->name = GTK_ENTRY (glade_xml_get_widget (gui, "txtName")); gtk_entry_set_text (editor->name, account->id->name); @@ -622,8 +638,11 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) /* Servers */ url = camel_url_new (account->source->url, NULL); - editor->source_type = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourceType")); - gtk_entry_set_text (editor->source_type, url->protocol); + editor->source_type = glade_xml_get_widget (gui, "txtSourceType"); + if (GTK_IS_LABEL (editor->source_type)) + gtk_label_set_text (GTK_LABEL (editor->source_type), url->protocol); + else + gtk_entry_set_text (GTK_ENTRY (editor->source_type), url->protocol); editor->source_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourceHost")); gtk_entry_set_text (editor->source_host, url->host ? url->host : ""); if (url->port) { @@ -642,7 +661,9 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->save_passwd), account->source->save_passwd); editor->source_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuSourceAuth")); editor->source_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceSSL")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_ssl), account->source->use_ssl); + /* Anna's dialog doesn't have SSL either... */ + if (editor->source_ssl) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->source_ssl), account->source->use_ssl); editor->keep_on_server = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkKeepMailOnServer")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->keep_on_server), account->source->keep_on_server); source_check (editor, url); @@ -662,7 +683,9 @@ construct (MailAccountEditor *editor, const MailConfigAccount *account) } editor->transport_auth = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportAuth")); editor->transport_ssl = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportSSL")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl); + /* Anna's dialog doesn't have SSL... */ + if (editor->transport_ssl) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (editor->transport_ssl), account->transport->use_ssl); transport_type_init (editor, url); camel_url_free (url); diff --git a/mail/mail-account-editor.h b/mail/mail-account-editor.h index 83504e3fbf..cd782ef800 100644 --- a/mail/mail-account-editor.h +++ b/mail/mail-account-editor.h @@ -53,7 +53,7 @@ struct _MailAccountEditor { GtkEntry *organization; GnomeFileEntry *signature; - GtkEntry *source_type; + GtkWidget *source_type; GtkEntry *source_host; GtkEntry *source_user; GtkEntry *source_passwd; diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index aeb4509f43..ba13dda948 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -439,14 +439,14 @@ incoming_type_changed (GtkWidget *widget, gpointer user_data) if (provider->url_flags & CAMEL_URL_ALLOW_PATH) { if (!dwidget) dwidget = GTK_WIDGET (druid->incoming_path); - + if (!strcmp (provider->protocol, "mbox") || !strcmp (provider->protocol, "maildir")){ if (getenv ("MAIL")) gtk_entry_set_text (druid->incoming_path, getenv ("MAIL")); } else { gtk_entry_set_text (druid->incoming_path, ""); } - + gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_path), TRUE); gtk_widget_set_sensitive (label, TRUE); } else { diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 4842117902..4ed99225e4 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -1364,12 +1364,14 @@ Click "Finish" to save your settings. GnomeDialog - mail-account-editor + mail-accounts-dialog False - Account Properties + Evolution Mail Configuration GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER - True + False + 350 + 240 False True True @@ -1379,7 +1381,7 @@ Click "Finish" to save your settings. GtkVBox GnomeDialog:vbox - dialog-vbox3 + vbox37 False 8 @@ -1391,7 +1393,7 @@ Click "Finish" to save your settings. GtkHButtonBox GnomeDialog:action_area - dialog-action_area3 + hbuttonbox2 GTK_BUTTONBOX_END 8 85 @@ -1413,14 +1415,6 @@ Click "Finish" to save your settings. GNOME_STOCK_BUTTON_OK - - GtkButton - cmdApply - True - True - GNOME_STOCK_BUTTON_APPLY - - GtkButton cmdCancel @@ -1448,415 +1442,107 @@ Click "Finish" to save your settings. - GtkVBox - vbox32 - 5 + GtkHBox + hbox36 False 0 - GtkVBox - vbox33 - False - 0 + GtkScrolledWindow + scrolledwindow1 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 - False - False + True + True - GtkHBox - hbox26 - False - 0 - - 5 - True - True - + GtkCList + clistAccounts + True + 2 + 150,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN GtkLabel - lblMailAccount - + CList:title + lblAccount + GTK_JUSTIFY_CENTER False 0.5 0.5 0 0 - - 10 - False - False - - - - - GtkHSeparator - hseparator - - 10 - True - True - - - - - GtkLabel - lblDirections - - GTK_JUSTIFY_LEFT - True - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkEntry - txtAccountName - True - True - True - 0 - - - 5 - False - False - - - - - - GtkTable - tableUserInfo - 6 - 10 - True - 4 - 0 - - 0 - False - True - - - - GtkHBox - hbox35 - False - 0 - - 0 - 10 - 0 - 1 - 0 - 0 - True - True - False - False - True - True - GtkLabel - lblUserInfo - + CList:title + lblType + GTK_JUSTIFY_CENTER False 0.5 0.5 0 0 - - 10 - False - False - - - - - GtkHSeparator - hseparator8 - - 10 - True - True - + - - GtkEntry - txtName - True - True - True - 0 - - - 4 - 10 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - + + GtkVButtonBox + vbuttonbox1 + GTK_BUTTONBOX_START + 0 + 85 + 27 + 7 + 0 + + 0 + False + False + - GtkEntry - txtAddress + GtkButton + cmdMailAdd + True True - True - True - 0 - - - 4 - 10 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - + - GtkEntry - txtReplyTo + GtkButton + cmdMailEdit + True True - True - True - 0 - - - 4 - 10 - 3 - 4 - 0 - 0 - True - False - False - False - True - False - + - GtkEntry - txtOrganization + GtkButton + cmdMailDelete + True True - True - True - 0 - - - 4 - 10 - 4 - 5 - 0 - 0 - True - False - False - False - True - False - - - - - GnomeFileEntry - fileSignature - 10 - Select signature file - False - True - - 4 - 10 - 5 - 6 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GnomeEntry:entry - txtSignature - True - True - True - 0 - - - - - - GtkLabel - lblName - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 1 - 2 - 0 - 0 - False - False - False - False - False - False - - - - - GtkLabel - lblEMail - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 2 - 3 - 0 - 0 - False - False - False - False - False - False - - - - - GtkLabel - lblReplyTo - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 3 - 4 - 0 - 0 - False - False - False - False - False - False - - - - - GtkLabel - lblOrganization - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 4 - 5 - 0 - 0 - False - False - False - False - False - False - + - GtkLabel - lblSignature - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 5 - 6 - 0 - 0 - False - False - False - False - False - False - + GtkButton + cmdMailDefault + True + True + @@ -1864,8 +1550,8 @@ Click "Finish" to save your settings. GtkLabel Notebook:tab - lblGeneral - + lblMail + GTK_JUSTIFY_CENTER False 0.5 @@ -1875,670 +1561,871 @@ Click "Finish" to save your settings. - GtkVBox - vbox34 - 5 + GtkHBox + hbox37 False 0 - GtkTable - tableIncomingServer - 8 - 10 - True - 0 - 0 + GtkScrolledWindow + scrolledwindow2 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS 0 - False - False + True + True - GtkHBox - hbox31 - False - 0 - - 0 - 10 - 0 - 1 - 0 - 0 - True - True - False - False - True - True - - - - GtkLabel - lblIncomingMailServer - + GtkCList + clistNews + True + 1 + 80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN + + + GtkLabel + CList:title + lblSources + GTK_JUSTIFY_CENTER False 0.5 0.5 0 0 - - 10 - False - False - - - - - GtkHSeparator - hseparator4 - - 10 - True - True - + - - GtkCheckButton - chkSavePasswd - True - - False - True - - 4 - 10 - 5 - 6 - 0 - 0 - False - False - False - False - True - False - - + + GtkVButtonBox + vbuttonbox2 + GTK_BUTTONBOX_START + 0 + 85 + 27 + 7 + 0 + + 0 + False + False + - GtkOptionMenu - omenuSourceAuth + GtkButton + cmdNewsAdd + True True - Plain Text -Kerberos -CRAM-MD5 -DIGEST-MD5 - - 0 - - 4 - 10 - 6 - 7 - 0 - 0 - False - False - False - False - True - False - + - GtkEntry - txtSourceType + GtkButton + cmdNewsEdit + True True - False - True - 0 - - - 3 - 10 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - + - GtkEntry - txtSourceHost + GtkButton + cmdNewsDelete + True True - True - True - 0 - - - 3 - 10 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - + + + - - GtkEntry - txtSourceUser - True - True - True - 0 - - - 3 - 10 - 3 - 4 - 0 - 0 - True - False - False - False - True - False - - + + GtkLabel + Notebook:tab + lblNews + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + - - GtkEntry - txtSourcePasswd - True - True - False - 0 - - - 3 - 10 - 4 - 5 - 0 - 0 - True - False - False - False - True - False - - + + GnomeDialog + mail-account-editor + False + Edit Mail Configuration Settings + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + False - - GtkCheckButton - chkSourceSSL - False - True - - False - True - - 1 - 10 - 7 - 8 - 0 - 0 - False - False - False - False - False - False - - + + GtkVBox + GnomeDialog:vbox + dialog-vbox1 + False + 8 + + 4 + True + True + - - GtkLabel - lblSourceUser - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 3 - 4 - 0 - 0 - False - False - False - False - False - False - - + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area1 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + - - GtkLabel - lblSourcePasswd - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 4 - 5 - 0 - 0 - False - False - False - False - False - False - - + + GtkButton + button3 + True + True + GNOME_STOCK_BUTTON_OK + - - GtkLabel - lblSourceAuth - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 6 - 7 - 0 - 0 - False - False - False - False - False - False - - + + GtkButton + button4 + True + True + GNOME_STOCK_BUTTON_APPLY + - - GtkLabel - lblSourceHost - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - False - False - - + + GtkButton + button5 + True + True + GNOME_STOCK_BUTTON_CANCEL + + - - GtkLabel - lblIncomingServerType - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 1 - 2 - 0 - 0 - False - False - False - False - False - False - - - + + GtkVBox + toplevel + True + 0 + + 0 + False + True + + + + GtkFrame + identity-frame + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - GtkTable - tableOutgoingServer - 5 - 10 - True - 0 - 0 - - 0 - False - False - + GtkVBox + vbox28 + False + 2 - GtkHBox - hbox32 + GtkTable + table14 + 4 + 2 + 2 False - 0 + 4 + 4 - 0 - 10 - 0 - 1 - 0 - 0 - True - True - False - False - True - True + 0 + True + True + + + + GtkEntry + txtName + 80 + 20 + True + True + True + True + 50 + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtAddress + True + True + True + 50 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + full-name-label + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + email-address-label + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + + GtkHButtonBox + hbuttonbox6 + GTK_BUTTONBOX_END + 30 + 85 + 27 + 7 + 0 + + 0 + True + True + + + + GtkButton + add-fields-button + True + True + + + + + + + + GtkFrame + receiving-frame + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + + + + GtkVBox + vbox26 + False + 0 + + + GtkTable + table12 + 4 + 6 + 2 + False + 4 + 4 + + 4 + False + True + + + + GtkLabel + lblSourceType + + GTK_JUSTIFY_LEFT + False + 7.45058e-09 + 0.5 + 0 + 0 + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkEntry + txtSourcePath + True + True + True + 0 + + + 1 + 2 + 4 + 5 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtSourcePasswd + True + True + True + 0 + + + 1 + 2 + 3 + 4 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtSourceUser + True + True + True + 0 + + + 1 + 2 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + GtkEntry + txtSourceHost + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + type-label + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + lblSourceHost + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + lblSourceUser + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + lblSourcePath + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + lblSourceAuth + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + 1 + 5 + 6 + 0 + 0 + False + False + False + False + False + False + + + + + GtkLabel + lblSourcePasswd + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkOptionMenu + omenuSourceAuth + True + Kerberos +Plain-text Password + + 0 + + 1 + 2 + 5 + 6 + 0 + 0 + False + False + False + False + True + False + + + + + + GtkHBox + hbox21 + False + 0 + + 0 + False + True - GtkLabel - lblOutgoingMailServer - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + GtkCheckButton + chkKeepMailOnServer + 3 + True + + False + True - 10 + 2 False - False + True - GtkHSeparator - hseparator5 + GtkHButtonBox + hbuttonbox4 + GTK_BUTTONBOX_END + 30 + 85 + 27 + 7 + 0 - 10 + 0 True True + + - - GtkOptionMenu - omenuTransportAuth - True - None -CRAM-MD5 - - 0 - - 4 - 10 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkEntry - txtTransportHost - True - True - True - 0 - - - 3 - 10 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - + + GtkFrame + sending-frame + 3 + + 0 + GTK_SHADOW_ETCHED_IN + + 0 + True + True + - - GtkOptionMenu - omenuTransportType - True - Sendmail -SMTP - - 0 - - 3 - 10 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - + + GtkVBox + vbox27 + False + 0 - GtkCheckButton - chkTransportSSL - False - True - - False - True + GtkTable + table13 + 4 + 3 + 2 + False + 4 + 4 - 1 - 10 - 4 - 5 - 0 - 0 - False - False - False - False - False - False + 4 + False + True - - - GtkLabel - lblOutgoingServerType - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 1 - 2 + + GtkLabel + lblTransportHost + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 0 0 - False - False - False - False - False - False - - + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + - - GtkLabel - lblTransportHost - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - False - False - - + + GtkEntry + txtTransportHost + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + - - GtkLabel - lblTransportAuth - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 1 - 4 - 3 - 4 + + GtkLabel + label100 + + GTK_JUSTIFY_RIGHT + False + 1 + 0.5 0 0 - False - False - False - False - False - False - - - - - - - GtkLabel - Notebook:tab - lblServers - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox36 - 5 - False - 0 - - - GtkTable - tableServerTimeouts - 3 - 10 - True - 0 - 0 - - 0 - False - True - + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + - - GtkHBox - hbox34 - False - 0 - - 0 - 10 - 0 - 1 + + GtkLabel + lblTransportType + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 0 0 - True - False - False - False - True - True - + + 1 + 2 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + GtkLabel - lblMisc - + lblTransportAuth + GTK_JUSTIFY_CENTER False 0.5 @@ -2546,109 +2433,74 @@ SMTP 0 0 - 10 - False - False + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + False + False - GtkHSeparator - hseparator7 + GtkOptionMenu + omenuTransportAuth + True + Kerberos +Plain-text Password + + 0 - 10 - True - True + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + False - GtkEntry - txtSourcePath - True - True - True - 0 - - - 3 - 10 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkCheckButton - chkKeepMailOnServer - True - - True - True - - 1 - 10 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - lblSourcePath - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 + GtkHBox + hbox22 + False + 0 - 1 - 3 - 1 - 2 - 0 - 0 - False - False - False - False - True - False + 0 + False + True - - - - - GtkLabel - Notebook:tab - lblAdvanced - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + GtkHButtonBox + hbuttonbox5 + GTK_BUTTONBOX_END + 30 + 85 + 27 + 7 + 0 + + 0 + True + True + + + + @@ -2656,24 +2508,21 @@ SMTP GnomeDialog - mail-accounts-dialog - False - Evolution Mail Configuration + optional-identity-info + Additional Identity Fields GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False - 350 - 240 False - True - True + False + False False False GtkVBox GnomeDialog:vbox - vbox37 + dialog-vbox3 False 8 @@ -2685,7 +2534,7 @@ SMTP GtkHButtonBox GnomeDialog:action_area - hbuttonbox2 + dialog-action_area3 GTK_BUTTONBOX_END 8 85 @@ -2701,7 +2550,7 @@ SMTP GtkButton - cmdOK + button21 True True GNOME_STOCK_BUTTON_OK @@ -2709,7 +2558,7 @@ SMTP GtkButton - cmdCancel + button23 True True GNOME_STOCK_BUTTON_CANCEL @@ -2717,237 +2566,200 @@ SMTP - GtkNotebook - notebook - True - True - True - GTK_POS_TOP - False - 2 - 2 - False + GtkFrame + frame19 + 3 + 102 + + 0 + GTK_SHADOW_ETCHED_IN - 0 + 3 True True - GtkHBox - hbox36 + GtkTable + table15 + 4 + 3 + 2 False - 0 + 4 + 4 - GtkScrolledWindow - scrolledwindow1 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS + GtkLabel + label106 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 - 0 - True - True + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + False + False - - - GtkCList - clistAccounts - True - 2 - 150,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - lblAccount - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - lblType - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - GtkVButtonBox - vbuttonbox1 - GTK_BUTTONBOX_START - 0 - 85 - 27 - 7 - 0 + GtkLabel + label107 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 - 0 - False - False + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + False + False - - - GtkButton - cmdMailAdd - True - True - - - - - GtkButton - cmdMailEdit - True - True - - - - - GtkButton - cmdMailDelete - True - True - - - - - GtkButton - cmdMailDefault - True - True - - - - - - GtkLabel - Notebook:tab - lblMail - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - GtkHBox - hbox37 - False - 0 + + GtkEntry + txtOrganization + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + - GtkScrolledWindow - scrolledwindow2 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS + GtkHBox + hbox23 + False + 4 - 0 - True - True + 1 + 2 + 2 + 3 + 0 + 0 + False + False + False + False + True + True - GtkCList - clistNews - True - 1 - 80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN + GnomeFileEntry + fileSignature + 10 + Select your signature file + False + True + + 0 + False + False + - GtkLabel - CList:title - lblSources - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + GtkEntry + GnomeEntry:entry + txtSignature + True + True + True + 0 + - GtkVButtonBox - vbuttonbox2 - GTK_BUTTONBOX_START - 0 - 85 - 27 - 7 - 0 + GtkLabel + label108 + + GTK_JUSTIFY_RIGHT + True + 1 + 0.5 + 0 + 0 - 0 - False - False + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False - - - GtkButton - cmdNewsAdd - True - True - - - - - GtkButton - cmdNewsEdit - True - True - - - - - GtkButton - cmdNewsDelete - True - True - - - - - GtkLabel - Notebook:tab - lblNews - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + GtkEntry + txtReplyTo + True + True + True + 0 + + + 1 + 2 + 0 + 1 + 1 + 0 + True + False + False + False + True + False + + diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h index 29e1846d12..55de5a085d 100644 --- a/mail/mail-config.glade.h +++ b/mail/mail-config.glade.h @@ -44,46 +44,6 @@ gchar *s = N_("Congratulations, your mail configuration is complete.\n" "using Evolution. \n" "\n" "Click \"Finish\" to save your settings."); -gchar *s = N_("Account Properties"); -gchar *s = N_("Mail Account"); -gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\"."); -gchar *s = N_("User Information"); -gchar *s = N_("Select signature file"); -gchar *s = N_("Name:"); -gchar *s = N_("E-Mail Address:"); -gchar *s = N_("Reply-To:"); -gchar *s = N_("Organization:"); -gchar *s = N_("Signature:"); -gchar *s = N_("General"); -gchar *s = N_("Incoming Mail Server"); -gchar *s = N_("Save password"); -gchar *s = N_("Plain Text\n" - "Kerberos\n" - "CRAM-MD5\n" - "DIGEST-MD5\n" - ""); -gchar *s = N_("This server requires a secure connection (SSL)"); -gchar *s = N_("Username:"); -gchar *s = N_("Password:"); -gchar *s = N_("Authentication:"); -gchar *s = N_("Hostname:"); -gchar *s = N_("Type:"); -gchar *s = N_("Outgoing Mail Server"); -gchar *s = N_("None\n" - "CRAM-MD5\n" - ""); -gchar *s = N_("Sendmail\n" - "SMTP\n" - ""); -gchar *s = N_("This server requires a secure connection (SSL)"); -gchar *s = N_("Type:"); -gchar *s = N_("Hostname:"); -gchar *s = N_("Authentication:"); -gchar *s = N_("Servers"); -gchar *s = N_("Miscellaneous"); -gchar *s = N_("Keep mail on server"); -gchar *s = N_("Path:"); -gchar *s = N_("Advanced"); gchar *s = N_("Evolution Mail Configuration"); gchar *s = N_("Account"); gchar *s = N_("Type"); @@ -97,3 +57,34 @@ gchar *s = N_("Add"); gchar *s = N_("Edit"); gchar *s = N_("Delete"); gchar *s = N_("News"); +gchar *s = N_("Edit Mail Configuration Settings"); +gchar *s = N_("Identity"); +gchar *s = N_("Full Name:"); +gchar *s = N_("Email Address:"); +gchar *s = N_("Add Optional Fields..."); +gchar *s = N_("Receiving Mail"); +gchar *s = N_("IMAP"); +gchar *s = N_("Type:"); +gchar *s = N_("Server:"); +gchar *s = N_("Username:"); +gchar *s = N_("Path:"); +gchar *s = N_("Authentication:"); +gchar *s = N_("Password:"); +gchar *s = N_("Kerberos \n" + "Plain-text Password\n" + ""); +gchar *s = N_("Don't delete messages from server"); +gchar *s = N_("Sending Mail"); +gchar *s = N_("Server:"); +gchar *s = N_("Type:"); +gchar *s = N_("SMTP"); +gchar *s = N_("Authentication:"); +gchar *s = N_("Kerberos \n" + "Plain-text Password\n" + ""); +gchar *s = N_("Additional Identity Fields"); +gchar *s = N_("Optional Information"); +gchar *s = N_("Organization:"); +gchar *s = N_("Signature file:"); +gchar *s = N_("Select your signature file"); +gchar *s = N_("Reply-to:"); diff --git a/mail/mail-config.h b/mail/mail-config.h index b8713be1e3..cc8e9b7cbe 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -95,7 +95,6 @@ void mail_config_set_mark_as_seen_timeout (gint timeout); const MailConfigAccount *mail_config_get_default_account (void); const MailConfigAccount *mail_config_get_account_by_name (const char *account_name); -const MailConfigAccount *mail_config_get_account_by_address (const char *address); const GSList *mail_config_get_accounts (void); void mail_config_add_account (MailConfigAccount *account); void mail_config_set_default_account (const MailConfigAccount *account); diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index 066ebe0a04..1f5b3eebad 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -864,12 +864,15 @@ populate_store_foreach (MailConfigService *service, SubscribeDialog *sc) static void populate_store_list (SubscribeDialog *sc) { + const GSList *news; GSList *sources; - + sources = mail_config_get_sources (); g_slist_foreach (sources, (GFunc)populate_store_foreach, sc); - sources = mail_config_get_news (); - g_slist_foreach (sources, (GFunc)populate_store_foreach, sc); + g_slist_free (sources); + + news = mail_config_get_news (); + g_slist_foreach (news, (GFunc)populate_store_foreach, sc); e_table_model_changed (sc->store_model); } -- cgit v1.2.3