aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-12-24 02:31:47 +0800
committerMilan Crha <mcrha@redhat.com>2009-12-24 02:31:47 +0800
commit83dc7625983470bff4ce8b9070fbc23c3370c472 (patch)
treeb53ffbc8e2c94061a37aace6c006516bb2cf76c2 /mail
parent3f36489c67887491385086180147a7e4475a349d (diff)
downloadgsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.tar
gsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.tar.gz
gsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.tar.bz2
gsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.tar.lz
gsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.tar.xz
gsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.tar.zst
gsoc2013-evolution-83dc7625983470bff4ce8b9070fbc23c3370c472.zip
Bug #520816 - S/MIME shares "Do not sign meeting requests" with PGP
Diffstat (limited to 'mail')
-rw-r--r--mail/mail-config.ui85
1 files changed, 66 insertions, 19 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 577adac656..55f5ee6227 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -2035,6 +2035,68 @@ For example: "Work" or "Personal"</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
+ <object class="GtkVBox" id="general_vbox">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">General</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="pgp_no_imip_sign">
+ <property name="label" translatable="yes">_Do not sign meeting requests (for Outlook compatibility)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkVBox" id="pgp_frame">
<property name="visible">True</property>
<property name="orientation">vertical</property>
@@ -2128,21 +2190,6 @@ For example: "Work" or "Personal"</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="pgp_no_imip_sign">
- <property name="label" translatable="yes">_Do not sign meeting requests (for Outlook compatibility)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="pgp_encrypt_to_self">
<property name="label" translatable="yes">Always encrypt to _myself when sending encrypted messages</property>
<property name="visible">True</property>
@@ -2155,7 +2202,7 @@ For example: "Work" or "Personal"</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -2170,7 +2217,7 @@ For example: "Work" or "Personal"</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -2189,7 +2236,7 @@ For example: "Work" or "Personal"</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -2585,7 +2632,7 @@ For example: "Work" or "Personal"</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>