From f5b711013dc1b1cbf5b846a45c634a530780db83 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 3 Aug 2011 21:13:49 -0500
Subject: EMAccountEditor: Utilize CamelSettings.

Simplifies the code overall, since now we can bind widget properties to
settings properties and omit a bunch of callback functions.  Plus now we
can initialize the settings widgets with proper defaults according to
the property specifications of CamelSettings classes.
---
 mail/mail-config.ui | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'mail/mail-config.ui')

diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 4a7515d349..2f50f30cf2 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -3212,15 +3212,15 @@ for display purposes only. </property>
     <data>
       <row>
         <col id="0" translatable="yes">No encryption</col>
-        <col id="1">never</col>
+        <col id="1">none</col>
       </row>
       <row>
         <col id="0" translatable="yes">TLS encryption</col>
-        <col id="1">when-possible</col>
+        <col id="1">starttls-on-standard-port</col>
       </row>
       <row>
         <col id="0" translatable="yes">SSL encryption</col>
-        <col id="1">always</col>
+        <col id="1">ssl-on-alternate-port</col>
       </row>
     </data>
   </object>
@@ -5063,6 +5063,7 @@ For example: "Work" or "Personal"</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="model">use_ssl_model</property>
+                        <property name="id_column">1</property>
                         <child>
                           <object class="GtkCellRendererText" id="source_use_ssl_renderer"/>
                           <attributes>
@@ -5567,6 +5568,7 @@ For example: "Work" or "Personal"</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="model">use_ssl_model</property>
+                        <property name="id_column">1</property>
                         <child>
                           <object class="GtkCellRendererText" id="transport_use_ssl_renderer"/>
                           <attributes>
-- 
cgit