1 files changed, 97 insertions, 114 deletions
diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui
index 7eddf6a8c6..18d5df252b 100644
--- a/smime/gui/smime-ui.ui
+++ b/smime/gui/smime-ui.ui
@@ -2141,143 +2141,126 @@
       <action-widget response="-5">okbutton</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="cert_selector">
-    <property name="title" translatable="yes">Dummy window only</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+  <object class="GtkVBox" id="cert_selector_vbox">
+    <property name="visible">True</property>
+    <property name="homogeneous">False</property>
+    <property name="spacing">0</property>
     <child>
-      <object class="GtkVBox" id="cert_selector_vbox">
+      <object class="GtkHBox" id="hbox5">
+        <property name="border_width">6</property>
         <property name="visible">True</property>
         <property name="homogeneous">False</property>
-        <property name="spacing">0</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkHBox" id="hbox5">
-            <property name="border_width">6</property>
+          <object class="GtkLabel" id="label67">
             <property name="visible">True</property>
-            <property name="homogeneous">False</property>
-            <property name="spacing">6</property>
+            <property name="label" translatable="yes">Certificate</property>
+            <property name="use_underline">False</property>
+            <property name="use_markup">False</property>
+            <property name="justify">GTK_JUSTIFY_LEFT</property>
+            <property name="wrap">False</property>
+            <property name="selectable">False</property>
+            <property name="xalign">0.5</property>
+            <property name="yalign">0.5</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+            <property name="width_chars">-1</property>
+            <property name="single_line_mode">False</property>
+            <property name="angle">0</property>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="cert_combobox">
+            <property name="visible">True</property>
+            <property name="add_tearoffs">False</property>
+            <property name="focus_on_click">True</property>
+            <property name="model">model1</property>
             <child>
-              <object class="GtkLabel" id="label67">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Certificate</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="cert_combobox">
-                <property name="visible">True</property>
-                <property name="add_tearoffs">False</property>
-                <property name="focus_on_click">True</property>
-                <property name="model">model1</property>
-                <child>
-                  <object class="GtkCellRendererText" id="renderer1"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
-              </object>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
+              <object class="GtkCellRendererText" id="renderer1"/>
+              <attributes>
+                <attribute name="text">0</attribute>
+              </attributes>
             </child>
           </object>
           <packing>
             <property name="padding">0</property>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
           </packing>
         </child>
+      </object>
+      <packing>
+        <property name="padding">0</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame7">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="label_yalign">0.5</property>
+        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
         <child>
-          <object class="GtkFrame" id="frame7">
+          <object class="GtkScrolledWindow" id="scrolledwindow7">
+            <property name="border_width">6</property>
             <property name="visible">True</property>
-            <property name="label_xalign">0</property>
-            <property name="label_yalign">0.5</property>
-            <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="shadow_type">GTK_SHADOW_IN</property>
+            <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow7">
-                <property name="border_width">6</property>
+              <object class="GtkTextView" id="cert_description">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
-                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-                <child>
-                  <object class="GtkTextView" id="cert_description">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">True</property>
-                    <property name="overwrite">False</property>
-                    <property name="accepts_tab">True</property>
-                    <property name="justification">GTK_JUSTIFY_LEFT</property>
-                    <property name="wrap_mode">GTK_WRAP_NONE</property>
-                    <property name="cursor_visible">True</property>
-                    <property name="pixels_above_lines">0</property>
-                    <property name="pixels_below_lines">0</property>
-                    <property name="pixels_inside_wrap">0</property>
-                    <property name="left_margin">0</property>
-                    <property name="right_margin">0</property>
-                    <property name="indent">0</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label68">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Certificate details</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
+                <property name="editable">True</property>
+                <property name="overwrite">False</property>
+                <property name="accepts_tab">True</property>
+                <property name="justification">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap_mode">GTK_WRAP_NONE</property>
+                <property name="cursor_visible">True</property>
+                <property name="pixels_above_lines">0</property>
+                <property name="pixels_below_lines">0</property>
+                <property name="pixels_inside_wrap">0</property>
+                <property name="left_margin">0</property>
+                <property name="right_margin">0</property>
+                <property name="indent">0</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label68">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Certificate details</property>
+            <property name="use_underline">False</property>
+            <property name="use_markup">False</property>
+            <property name="justify">GTK_JUSTIFY_LEFT</property>
+            <property name="wrap">False</property>
+            <property name="selectable">False</property>
+            <property name="xalign">0.5</property>
+            <property name="yalign">0.5</property>
+            <property name="xpad">0</property>
+            <property name="ypad">0</property>
+            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+            <property name="width_chars">-1</property>
+            <property name="single_line_mode">False</property>
+            <property name="angle">0</property>
+          </object>
         </child>
       </object>
+      <packing>
+        <property name="padding">0</property>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+      </packing>
     </child>
   </object>
   <object class="GtkDialog" id="cert-trust-dialog">