From 83dc7625983470bff4ce8b9070fbc23c3370c472 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 23 Dec 2009 19:31:47 +0100
Subject: Bug #520816 - S/MIME shares "Do not sign meeting requests" with PGP

---
 mail/mail-config.ui | 85 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 19 deletions(-)

(limited to 'mail')

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
@@ -2034,6 +2034,68 @@ For example: "Work" or "Personal"</property>
     <property name="border_width">12</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>
@@ -2127,21 +2189,6 @@ For example: "Work" or "Personal"</property>
                         <property name="position">1</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>
@@ -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>
-- 
cgit v1.2.3