aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-dialogs.ui
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-10 18:50:18 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-10 18:50:18 +0800
commit56a166bb42bd55216a489c0b850ddd6bca2a3cd5 (patch)
tree3f87cf07fd6098ab2700c56d71d97686c5e5bc71 /mail/mail-dialogs.ui
parent8fd93c9042bb30e53ce88303f8a0789a6ca688eb (diff)
parent6d5db4c7cd468d424ea8628344c5a1bba6fc3d7c (diff)
downloadgsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.gz
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.bz2
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.lz
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.xz
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.zst
gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.zip
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/mail-dialogs.ui')
-rw-r--r--mail/mail-dialogs.ui68
1 files changed, 6 insertions, 62 deletions
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index 58a9f8c2aa..d3382dc18d 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -578,41 +578,13 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox170">
+ <object class="GtkGrid" id="signature_grid">
<property name="visible">True</property>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
<child>
- <object class="GtkLabel" id="label465">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkVBox" id="signature_vbox">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -641,41 +613,13 @@ Please select a follow up action from the "Flag" menu.</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox171">
+ <object class="GtkGrid" id="encryption_grid">
<property name="visible">True</property>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
<child>
- <object class="GtkLabel" id="label478">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkVBox" id="encryption_vbox">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>