aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog18
-rw-r--r--mail/mail-account-editor.c51
-rw-r--r--mail/mail-account-editor.h2
-rw-r--r--mail/mail-config-druid.c4
-rw-r--r--mail/mail-config.glade2256
-rw-r--r--mail/mail-config.glade.h71
-rw-r--r--mail/mail-config.h1
-rw-r--r--mail/subscribe-dialog.c9
8 files changed, 1128 insertions, 1284 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 <fejj@ximian.com>
+
+ * 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 <fejj@helixcode.com>
* 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 <miguel@gnu.org>
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 &quot;Finish&quot; to save your settings.</text>
<widget>
<class>GnomeDialog</class>
- <name>mail-account-editor</name>
+ <name>mail-accounts-dialog</name>
<visible>False</visible>
- <title>Account Properties</title>
+ <title>Evolution Mail Configuration</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_CENTER</position>
- <modal>True</modal>
+ <modal>False</modal>
+ <default_width>350</default_width>
+ <default_height>240</default_height>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>True</auto_shrink>
@@ -1379,7 +1381,7 @@ Click &quot;Finish&quot; to save your settings.</text>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
- <name>dialog-vbox3</name>
+ <name>vbox37</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
@@ -1391,7 +1393,7 @@ Click &quot;Finish&quot; to save your settings.</text>
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
- <name>dialog-action_area3</name>
+ <name>hbuttonbox2</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
@@ -1415,14 +1417,6 @@ Click &quot;Finish&quot; to save your settings.</text>
<widget>
<class>GtkButton</class>
- <name>cmdApply</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
- </widget>
-
- <widget>
- <class>GtkButton</class>
<name>cmdCancel</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
@@ -1448,415 +1442,107 @@ Click &quot;Finish&quot; to save your settings.</text>
</child>
<widget>
- <class>GtkVBox</class>
- <name>vbox32</name>
- <border_width>5</border_width>
+ <class>GtkHBox</class>
+ <name>hbox36</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
- <class>GtkVBox</class>
- <name>vbox33</name>
- <homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <class>GtkScrolledWindow</class>
+ <name>scrolledwindow1</name>
+ <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+ <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+ <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+ <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <expand>True</expand>
+ <fill>True</fill>
</child>
<widget>
- <class>GtkHBox</class>
- <name>hbox26</name>
- <homogeneous>False</homogeneous>
- <spacing>0</spacing>
- <child>
- <padding>5</padding>
- <expand>True</expand>
- <fill>True</fill>
- </child>
+ <class>GtkCList</class>
+ <name>clistAccounts</name>
+ <can_focus>True</can_focus>
+ <columns>2</columns>
+ <column_widths>150,80</column_widths>
+ <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+ <show_titles>True</show_titles>
+ <shadow_type>GTK_SHADOW_IN</shadow_type>
<widget>
<class>GtkLabel</class>
- <name>lblMailAccount</name>
- <label>Mail Account</label>
+ <child_name>CList:title</child_name>
+ <name>lblAccount</name>
+ <label>Account</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <child>
- <padding>10</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
</widget>
<widget>
- <class>GtkHSeparator</class>
- <name>hseparator</name>
- <child>
- <padding>10</padding>
- <expand>True</expand>
- <fill>True</fill>
- </child>
- </widget>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <name>lblDirections</name>
- <label>Type the name by which you would like to refer to these servers. For example: &quot;Work&quot; or &quot;Home&quot;.</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>True</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
- </widget>
-
- <widget>
- <class>GtkEntry</class>
- <name>txtAccountName</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <padding>5</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
- </widget>
- </widget>
-
- <widget>
- <class>GtkTable</class>
- <name>tableUserInfo</name>
- <rows>6</rows>
- <columns>10</columns>
- <homogeneous>True</homogeneous>
- <row_spacing>4</row_spacing>
- <column_spacing>0</column_spacing>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>True</fill>
- </child>
-
- <widget>
- <class>GtkHBox</class>
- <name>hbox35</name>
- <homogeneous>False</homogeneous>
- <spacing>0</spacing>
- <child>
- <left_attach>0</left_attach>
- <right_attach>10</right_attach>
- <top_attach>0</top_attach>
- <bottom_attach>1</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>True</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
- </child>
-
- <widget>
<class>GtkLabel</class>
- <name>lblUserInfo</name>
- <label>User Information</label>
+ <child_name>CList:title</child_name>
+ <name>lblType</name>
+ <label>Type</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <child>
- <padding>10</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
- </widget>
-
- <widget>
- <class>GtkHSeparator</class>
- <name>hseparator8</name>
- <child>
- <padding>10</padding>
- <expand>True</expand>
- <fill>True</fill>
- </child>
</widget>
</widget>
+ </widget>
- <widget>
- <class>GtkEntry</class>
- <name>txtName</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <widget>
+ <class>GtkVButtonBox</class>
+ <name>vbuttonbox1</name>
+ <layout_style>GTK_BUTTONBOX_START</layout_style>
+ <spacing>0</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
<widget>
- <class>GtkEntry</class>
- <name>txtAddress</name>
+ <class>GtkButton</class>
+ <name>cmdMailAdd</name>
+ <can_default>True</can_default>
<can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
+ <label>Add</label>
</widget>
<widget>
- <class>GtkEntry</class>
- <name>txtReplyTo</name>
+ <class>GtkButton</class>
+ <name>cmdMailEdit</name>
+ <can_default>True</can_default>
<can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
+ <label>Edit</label>
</widget>
<widget>
- <class>GtkEntry</class>
- <name>txtOrganization</name>
+ <class>GtkButton</class>
+ <name>cmdMailDelete</name>
+ <can_default>True</can_default>
<can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>4</top_attach>
- <bottom_attach>5</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GnomeFileEntry</class>
- <name>fileSignature</name>
- <max_saved>10</max_saved>
- <title>Select signature file</title>
- <directory>False</directory>
- <modal>True</modal>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>5</top_attach>
- <bottom_attach>6</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
-
- <widget>
- <class>GtkEntry</class>
- <child_name>GnomeEntry:entry</child_name>
- <name>txtSignature</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- </widget>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <name>lblName</name>
- <label>Name:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <name>lblEMail</name>
- <label>E-Mail Address:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <name>lblReplyTo</name>
- <label>Reply-To:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <name>lblOrganization</name>
- <label>Organization:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>4</top_attach>
- <bottom_attach>5</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
+ <label>Delete</label>
</widget>
<widget>
- <class>GtkLabel</class>
- <name>lblSignature</name>
- <label>Signature:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>5</top_attach>
- <bottom_attach>6</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
+ <class>GtkButton</class>
+ <name>cmdMailDefault</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <label>Default</label>
</widget>
</widget>
</widget>
@@ -1864,8 +1550,8 @@ Click &quot;Finish&quot; to save your settings.</text>
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
- <name>lblGeneral</name>
- <label>General</label>
+ <name>lblMail</name>
+ <label>Mail</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
@@ -1875,805 +1561,968 @@ Click &quot;Finish&quot; to save your settings.</text>
</widget>
<widget>
- <class>GtkVBox</class>
- <name>vbox34</name>
- <border_width>5</border_width>
+ <class>GtkHBox</class>
+ <name>hbox37</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
- <class>GtkTable</class>
- <name>tableIncomingServer</name>
- <rows>8</rows>
- <columns>10</columns>
- <homogeneous>True</homogeneous>
- <row_spacing>0</row_spacing>
- <column_spacing>0</column_spacing>
+ <class>GtkScrolledWindow</class>
+ <name>scrolledwindow2</name>
+ <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+ <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+ <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+ <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <expand>True</expand>
+ <fill>True</fill>
</child>
<widget>
- <class>GtkHBox</class>
- <name>hbox31</name>
- <homogeneous>False</homogeneous>
- <spacing>0</spacing>
- <child>
- <left_attach>0</left_attach>
- <right_attach>10</right_attach>
- <top_attach>0</top_attach>
- <bottom_attach>1</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>True</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
- </child>
+ <class>GtkCList</class>
+ <name>clistNews</name>
+ <can_focus>True</can_focus>
+ <columns>1</columns>
+ <column_widths>80</column_widths>
+ <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+ <show_titles>True</show_titles>
+ <shadow_type>GTK_SHADOW_IN</shadow_type>
<widget>
<class>GtkLabel</class>
- <name>lblIncomingMailServer</name>
- <label>Incoming Mail Server</label>
+ <child_name>CList:title</child_name>
+ <name>lblSources</name>
+ <label>Sources</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <child>
- <padding>10</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
- </widget>
-
- <widget>
- <class>GtkHSeparator</class>
- <name>hseparator4</name>
- <child>
- <padding>10</padding>
- <expand>True</expand>
- <fill>True</fill>
- </child>
</widget>
</widget>
+ </widget>
- <widget>
- <class>GtkCheckButton</class>
- <name>chkSavePasswd</name>
- <can_focus>True</can_focus>
- <label>Save password</label>
- <active>False</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>5</top_attach>
- <bottom_attach>6</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <widget>
+ <class>GtkVButtonBox</class>
+ <name>vbuttonbox2</name>
+ <layout_style>GTK_BUTTONBOX_START</layout_style>
+ <spacing>0</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
<widget>
- <class>GtkOptionMenu</class>
- <name>omenuSourceAuth</name>
+ <class>GtkButton</class>
+ <name>cmdNewsAdd</name>
+ <can_default>True</can_default>
<can_focus>True</can_focus>
- <items>Plain Text
-Kerberos
-CRAM-MD5
-DIGEST-MD5
-</items>
- <initial_choice>0</initial_choice>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>6</top_attach>
- <bottom_attach>7</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
+ <label>Add</label>
</widget>
<widget>
- <class>GtkEntry</class>
- <name>txtSourceType</name>
+ <class>GtkButton</class>
+ <name>cmdNewsEdit</name>
+ <can_default>True</can_default>
<can_focus>True</can_focus>
- <editable>False</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
+ <label>Edit</label>
</widget>
<widget>
- <class>GtkEntry</class>
- <name>txtSourceHost</name>
+ <class>GtkButton</class>
+ <name>cmdNewsDelete</name>
+ <can_default>True</can_default>
<can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
+ <label>Delete</label>
</widget>
+ </widget>
+ </widget>
- <widget>
- <class>GtkEntry</class>
- <name>txtSourceUser</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <widget>
+ <class>GtkLabel</class>
+ <child_name>Notebook:tab</child_name>
+ <name>lblNews</name>
+ <label>News</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ </widget>
+ </widget>
+ </widget>
+</widget>
- <widget>
- <class>GtkEntry</class>
- <name>txtSourcePasswd</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>False</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>4</top_attach>
- <bottom_attach>5</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+<widget>
+ <class>GnomeDialog</class>
+ <name>mail-account-editor</name>
+ <visible>False</visible>
+ <title>Edit Mail Configuration Settings</title>
+ <type>GTK_WINDOW_TOPLEVEL</type>
+ <position>GTK_WIN_POS_NONE</position>
+ <modal>False</modal>
+ <allow_shrink>False</allow_shrink>
+ <allow_grow>True</allow_grow>
+ <auto_shrink>False</auto_shrink>
+ <auto_close>False</auto_close>
+ <hide_on_close>False</hide_on_close>
- <widget>
- <class>GtkCheckButton</class>
- <name>chkSourceSSL</name>
- <sensitive>False</sensitive>
- <can_focus>True</can_focus>
- <label>This server requires a secure connection (SSL)</label>
- <active>False</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <left_attach>1</left_attach>
- <right_attach>10</right_attach>
- <top_attach>7</top_attach>
- <bottom_attach>8</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <widget>
+ <class>GtkVBox</class>
+ <child_name>GnomeDialog:vbox</child_name>
+ <name>dialog-vbox1</name>
+ <homogeneous>False</homogeneous>
+ <spacing>8</spacing>
+ <child>
+ <padding>4</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
- <widget>
- <class>GtkLabel</class>
- <name>lblSourceUser</name>
- <label>Username:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <widget>
+ <class>GtkHButtonBox</class>
+ <child_name>GnomeDialog:action_area</child_name>
+ <name>dialog-action_area1</name>
+ <layout_style>GTK_BUTTONBOX_END</layout_style>
+ <spacing>8</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ <pack>GTK_PACK_END</pack>
+ </child>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button3</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button4</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+ </widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button5</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+ </widget>
+ </widget>
+
+ <widget>
+ <class>GtkVBox</class>
+ <name>toplevel</name>
+ <homogeneous>True</homogeneous>
+ <spacing>0</spacing>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ </child>
+
+ <widget>
+ <class>GtkFrame</class>
+ <name>identity-frame</name>
+ <border_width>3</border_width>
+ <label>Identity</label>
+ <label_xalign>0</label_xalign>
+ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+ <child>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
+
+ <widget>
+ <class>GtkVBox</class>
+ <name>vbox28</name>
+ <homogeneous>False</homogeneous>
+ <spacing>2</spacing>
<widget>
- <class>GtkLabel</class>
- <name>lblSourcePasswd</name>
- <label>Password:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
+ <class>GtkTable</class>
+ <name>table14</name>
+ <border_width>4</border_width>
+ <rows>2</rows>
+ <columns>2</columns>
+ <homogeneous>False</homogeneous>
+ <row_spacing>4</row_spacing>
+ <column_spacing>4</column_spacing>
<child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>4</top_attach>
- <bottom_attach>5</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
</child>
- </widget>
- <widget>
- <class>GtkLabel</class>
- <name>lblSourceAuth</name>
- <label>Authentication:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>6</top_attach>
- <bottom_attach>7</bottom_attach>
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtName</name>
+ <width>80</width>
+ <height>20</height>
+ <can_focus>True</can_focus>
+ <has_focus>True</has_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>50</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtAddress</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>50</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>full-name-label</name>
+ <label>Full Name:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkLabel</class>
- <name>lblSourceHost</name>
- <label>Hostname:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>email-address-label</name>
+ <label>Email Address:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
</widget>
<widget>
- <class>GtkLabel</class>
- <name>lblIncomingServerType</name>
- <label>Type:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
+ <class>GtkHButtonBox</class>
+ <name>hbuttonbox6</name>
+ <layout_style>GTK_BUTTONBOX_END</layout_style>
+ <spacing>30</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
<child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
</child>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>add-fields-button</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <label>Add Optional Fields...</label>
+ </widget>
</widget>
</widget>
+ </widget>
+
+ <widget>
+ <class>GtkFrame</class>
+ <name>receiving-frame</name>
+ <border_width>3</border_width>
+ <label>Receiving Mail</label>
+ <label_xalign>0</label_xalign>
+ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+ <child>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
<widget>
- <class>GtkTable</class>
- <name>tableOutgoingServer</name>
- <rows>5</rows>
- <columns>10</columns>
- <homogeneous>True</homogeneous>
- <row_spacing>0</row_spacing>
- <column_spacing>0</column_spacing>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
+ <class>GtkVBox</class>
+ <name>vbox26</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
<widget>
- <class>GtkHBox</class>
- <name>hbox32</name>
+ <class>GtkTable</class>
+ <name>table12</name>
+ <border_width>4</border_width>
+ <rows>6</rows>
+ <columns>2</columns>
<homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <row_spacing>4</row_spacing>
+ <column_spacing>4</column_spacing>
<child>
- <left_attach>0</left_attach>
- <right_attach>10</right_attach>
- <top_attach>0</top_attach>
- <bottom_attach>1</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>True</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
+ <padding>4</padding>
+ <expand>False</expand>
+ <fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
- <name>lblOutgoingMailServer</name>
- <label>Outgoing Mail Server</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
+ <name>lblSourceType</name>
+ <label>IMAP</label>
+ <justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
- <xalign>0.5</xalign>
+ <xalign>7.45058e-09</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
- <padding>10</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
<widget>
- <class>GtkHSeparator</class>
- <name>hseparator5</name>
+ <class>GtkEntry</class>
+ <name>txtSourcePath</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
<child>
- <padding>10</padding>
- <expand>True</expand>
- <fill>True</fill>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
- </widget>
- <widget>
- <class>GtkOptionMenu</class>
- <name>omenuTransportAuth</name>
- <can_focus>True</can_focus>
- <items>None
-CRAM-MD5
-</items>
- <initial_choice>0</initial_choice>
- <child>
- <left_attach>4</left_attach>
- <right_attach>10</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtSourcePasswd</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtSourceUser</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtSourceHost</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>type-label</name>
+ <label>Type:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkEntry</class>
- <name>txtTransportHost</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblSourceHost</name>
+ <label>Server:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkOptionMenu</class>
- <name>omenuTransportType</name>
- <can_focus>True</can_focus>
- <items>Sendmail
-SMTP
-</items>
- <initial_choice>0</initial_choice>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblSourceUser</name>
+ <label>Username:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkCheckButton</class>
- <name>chkTransportSSL</name>
- <sensitive>False</sensitive>
- <can_focus>True</can_focus>
- <label>This server requires a secure connection (SSL)</label>
- <active>False</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <left_attach>1</left_attach>
- <right_attach>10</right_attach>
- <top_attach>4</top_attach>
- <bottom_attach>5</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblSourcePath</name>
+ <label>Path:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkLabel</class>
- <name>lblOutgoingServerType</name>
- <label>Type:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblSourceAuth</name>
+ <label>Authentication:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkLabel</class>
- <name>lblTransportHost</name>
- <label>Hostname:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblSourcePasswd</name>
+ <label>Password:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
- </child>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkOptionMenu</class>
+ <name>omenuSourceAuth</name>
+ <can_focus>True</can_focus>
+ <items>Kerberos
+Plain-text Password
+</items>
+ <initial_choice>0</initial_choice>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
</widget>
<widget>
- <class>GtkLabel</class>
- <name>lblTransportAuth</name>
- <label>Authentication:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>0</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
+ <class>GtkHBox</class>
+ <name>hbox21</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
<child>
- <left_attach>1</left_attach>
- <right_attach>4</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>False</xfill>
- <yfill>False</yfill>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
</child>
+
+ <widget>
+ <class>GtkCheckButton</class>
+ <name>chkKeepMailOnServer</name>
+ <border_width>3</border_width>
+ <can_focus>True</can_focus>
+ <label>Don't delete messages from server</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <child>
+ <padding>2</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkHButtonBox</class>
+ <name>hbuttonbox4</name>
+ <layout_style>GTK_BUTTONBOX_END</layout_style>
+ <spacing>30</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
+ </widget>
</widget>
</widget>
</widget>
<widget>
- <class>GtkLabel</class>
- <child_name>Notebook:tab</child_name>
- <name>lblServers</name>
- <label>Servers</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- </widget>
-
- <widget>
- <class>GtkVBox</class>
- <name>vbox36</name>
- <border_width>5</border_width>
- <homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <class>GtkFrame</class>
+ <name>sending-frame</name>
+ <border_width>3</border_width>
+ <label>Sending Mail</label>
+ <label_xalign>0</label_xalign>
+ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+ <child>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
<widget>
- <class>GtkTable</class>
- <name>tableServerTimeouts</name>
- <rows>3</rows>
- <columns>10</columns>
- <homogeneous>True</homogeneous>
- <row_spacing>0</row_spacing>
- <column_spacing>0</column_spacing>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>True</fill>
- </child>
+ <class>GtkVBox</class>
+ <name>vbox27</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
<widget>
- <class>GtkHBox</class>
- <name>hbox34</name>
+ <class>GtkTable</class>
+ <name>table13</name>
+ <border_width>4</border_width>
+ <rows>3</rows>
+ <columns>2</columns>
<homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <row_spacing>4</row_spacing>
+ <column_spacing>4</column_spacing>
<child>
- <left_attach>0</left_attach>
- <right_attach>10</right_attach>
- <top_attach>0</top_attach>
- <bottom_attach>1</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>True</yfill>
+ <padding>4</padding>
+ <expand>False</expand>
+ <fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
- <name>lblMisc</name>
- <label>Miscellaneous</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
+ <name>lblTransportHost</name>
+ <label>Server:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
<wrap>False</wrap>
- <xalign>0.5</xalign>
+ <xalign>1</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
- <padding>10</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
<widget>
- <class>GtkHSeparator</class>
- <name>hseparator7</name>
+ <class>GtkEntry</class>
+ <name>txtTransportHost</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
<child>
- <padding>10</padding>
- <expand>True</expand>
- <fill>True</fill>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
- </widget>
- <widget>
- <class>GtkEntry</class>
- <name>txtSourcePath</name>
- <can_focus>True</can_focus>
- <editable>True</editable>
- <text_visible>True</text_visible>
- <text_max_length>0</text_max_length>
- <text></text>
- <child>
- <left_attach>3</left_attach>
- <right_attach>10</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>label100</name>
+ <label>Type:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>True</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
- </widget>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
- <widget>
- <class>GtkCheckButton</class>
- <name>chkKeepMailOnServer</name>
- <can_focus>True</can_focus>
- <label>Keep mail on server</label>
- <active>True</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <left_attach>1</left_attach>
- <right_attach>10</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblTransportType</name>
+ <label>SMTP</label>
+ <justify>GTK_JUSTIFY_LEFT</justify>
+ <wrap>False</wrap>
+ <xalign>0</xalign>
+ <yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
- </child>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>lblTransportAuth</name>
+ <label>Authentication:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkOptionMenu</class>
+ <name>omenuTransportAuth</name>
+ <can_focus>True</can_focus>
+ <items>Kerberos
+Plain-text Password
+</items>
+ <initial_choice>0</initial_choice>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
</widget>
<widget>
- <class>GtkLabel</class>
- <name>lblSourcePath</name>
- <label>Path:</label>
- <justify>GTK_JUSTIFY_LEFT</justify>
- <wrap>False</wrap>
- <xalign>7.45058e-09</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
+ <class>GtkHBox</class>
+ <name>hbox22</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
<child>
- <left_attach>1</left_attach>
- <right_attach>3</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
- <xpad>0</xpad>
- <ypad>0</ypad>
- <xexpand>False</xexpand>
- <yexpand>False</yexpand>
- <xshrink>False</xshrink>
- <yshrink>False</yshrink>
- <xfill>True</xfill>
- <yfill>False</yfill>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
</child>
+
+ <widget>
+ <class>GtkHButtonBox</class>
+ <name>hbuttonbox5</name>
+ <layout_style>GTK_BUTTONBOX_END</layout_style>
+ <spacing>30</spacing>
+ <child_min_width>85</child_min_width>
+ <child_min_height>27</child_min_height>
+ <child_ipad_x>7</child_ipad_x>
+ <child_ipad_y>0</child_ipad_y>
+ <child>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
+ </widget>
</widget>
</widget>
</widget>
-
- <widget>
- <class>GtkLabel</class>
- <child_name>Notebook:tab</child_name>
- <name>lblAdvanced</name>
- <label>Advanced</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- </widget>
</widget>
</widget>
</widget>
<widget>
<class>GnomeDialog</class>
- <name>mail-accounts-dialog</name>
- <visible>False</visible>
- <title>Evolution Mail Configuration</title>
+ <name>optional-identity-info</name>
+ <title>Additional Identity Fields</title>
<type>GTK_WINDOW_TOPLEVEL</type>
- <position>GTK_WIN_POS_CENTER</position>
+ <position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
- <default_width>350</default_width>
- <default_height>240</default_height>
<allow_shrink>False</allow_shrink>
- <allow_grow>True</allow_grow>
- <auto_shrink>True</auto_shrink>
+ <allow_grow>False</allow_grow>
+ <auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
- <name>vbox37</name>
+ <name>dialog-vbox3</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
@@ -2685,7 +2534,7 @@ SMTP
<widget>
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
- <name>hbuttonbox2</name>
+ <name>dialog-action_area3</name>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
@@ -2701,7 +2550,7 @@ SMTP
<widget>
<class>GtkButton</class>
- <name>cmdOK</name>
+ <name>button21</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
@@ -2709,7 +2558,7 @@ SMTP
<widget>
<class>GtkButton</class>
- <name>cmdCancel</name>
+ <name>button23</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
@@ -2717,237 +2566,200 @@ SMTP
</widget>
<widget>
- <class>GtkNotebook</class>
- <name>notebook</name>
- <can_focus>True</can_focus>
- <show_tabs>True</show_tabs>
- <show_border>True</show_border>
- <tab_pos>GTK_POS_TOP</tab_pos>
- <scrollable>False</scrollable>
- <tab_hborder>2</tab_hborder>
- <tab_vborder>2</tab_vborder>
- <popup_enable>False</popup_enable>
+ <class>GtkFrame</class>
+ <name>frame19</name>
+ <border_width>3</border_width>
+ <height>102</height>
+ <label>Optional Information</label>
+ <label_xalign>0</label_xalign>
+ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
- <padding>0</padding>
+ <padding>3</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
- <class>GtkHBox</class>
- <name>hbox36</name>
+ <class>GtkTable</class>
+ <name>table15</name>
+ <border_width>4</border_width>
+ <rows>3</rows>
+ <columns>2</columns>
<homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <row_spacing>4</row_spacing>
+ <column_spacing>4</column_spacing>
<widget>
- <class>GtkScrolledWindow</class>
- <name>scrolledwindow1</name>
- <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
- <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
- <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
- <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+ <class>GtkLabel</class>
+ <name>label106</name>
+ <label>Organization:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
<child>
- <padding>0</padding>
- <expand>True</expand>
- <fill>True</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>False</yfill>
</child>
-
- <widget>
- <class>GtkCList</class>
- <name>clistAccounts</name>
- <can_focus>True</can_focus>
- <columns>2</columns>
- <column_widths>150,80</column_widths>
- <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
- <show_titles>True</show_titles>
- <shadow_type>GTK_SHADOW_IN</shadow_type>
-
- <widget>
- <class>GtkLabel</class>
- <child_name>CList:title</child_name>
- <name>lblAccount</name>
- <label>Account</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <child_name>CList:title</child_name>
- <name>lblType</name>
- <label>Type</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- </widget>
- </widget>
</widget>
<widget>
- <class>GtkVButtonBox</class>
- <name>vbuttonbox1</name>
- <layout_style>GTK_BUTTONBOX_START</layout_style>
- <spacing>0</spacing>
- <child_min_width>85</child_min_width>
- <child_min_height>27</child_min_height>
- <child_ipad_x>7</child_ipad_x>
- <child_ipad_y>0</child_ipad_y>
+ <class>GtkLabel</class>
+ <name>label107</name>
+ <label>Signature file:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
<child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>False</yfill>
</child>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdMailAdd</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Add</label>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdMailEdit</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Edit</label>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdMailDelete</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Delete</label>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdMailDefault</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Default</label>
- </widget>
</widget>
- </widget>
-
- <widget>
- <class>GtkLabel</class>
- <child_name>Notebook:tab</child_name>
- <name>lblMail</name>
- <label>Mail</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
- </widget>
- <widget>
- <class>GtkHBox</class>
- <name>hbox37</name>
- <homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtOrganization</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
<widget>
- <class>GtkScrolledWindow</class>
- <name>scrolledwindow2</name>
- <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
- <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
- <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
- <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+ <class>GtkHBox</class>
+ <name>hbox23</name>
+ <homogeneous>False</homogeneous>
+ <spacing>4</spacing>
<child>
- <padding>0</padding>
- <expand>True</expand>
- <fill>True</fill>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
</child>
<widget>
- <class>GtkCList</class>
- <name>clistNews</name>
- <can_focus>True</can_focus>
- <columns>1</columns>
- <column_widths>80</column_widths>
- <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
- <show_titles>True</show_titles>
- <shadow_type>GTK_SHADOW_IN</shadow_type>
+ <class>GnomeFileEntry</class>
+ <name>fileSignature</name>
+ <max_saved>10</max_saved>
+ <title>Select your signature file</title>
+ <directory>False</directory>
+ <modal>True</modal>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
<widget>
- <class>GtkLabel</class>
- <child_name>CList:title</child_name>
- <name>lblSources</name>
- <label>Sources</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
+ <class>GtkEntry</class>
+ <child_name>GnomeEntry:entry</child_name>
+ <name>txtSignature</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
</widget>
</widget>
</widget>
<widget>
- <class>GtkVButtonBox</class>
- <name>vbuttonbox2</name>
- <layout_style>GTK_BUTTONBOX_START</layout_style>
- <spacing>0</spacing>
- <child_min_width>85</child_min_width>
- <child_min_height>27</child_min_height>
- <child_ipad_x>7</child_ipad_x>
- <child_ipad_y>0</child_ipad_y>
+ <class>GtkLabel</class>
+ <name>label108</name>
+ <label>Reply-to:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>True</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
<child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdNewsAdd</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Add</label>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdNewsEdit</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Edit</label>
- </widget>
-
- <widget>
- <class>GtkButton</class>
- <name>cmdNewsDelete</name>
- <can_default>True</can_default>
- <can_focus>True</can_focus>
- <label>Delete</label>
- </widget>
</widget>
- </widget>
- <widget>
- <class>GtkLabel</class>
- <child_name>Notebook:tab</child_name>
- <name>lblNews</name>
- <label>News</label>
- <justify>GTK_JUSTIFY_CENTER</justify>
- <wrap>False</wrap>
- <xalign>0.5</xalign>
- <yalign>0.5</yalign>
- <xpad>0</xpad>
- <ypad>0</ypad>
+ <widget>
+ <class>GtkEntry</class>
+ <name>txtReplyTo</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>1</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
</widget>
</widget>
</widget>
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);
}