Merge branch 'master' into wip/gsettings

2 files changed, 17 insertions, 11 deletions

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index f4acb61c29..717a9ea024 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -463,7 +463,7 @@ zone_display_name_with_offset (icaltimezone *zone)
 	if (icaltimezone_get_builtin_timezone (display_name))
 		display_name = _(display_name);
 
-	return g_strdup_printf("%s (%s)\n", display_name, buffer);;
+	return g_strdup_printf("%s (%s)", display_name, buffer);
 }
 
 static const gchar *
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.ui b/widgets/e-timezone-dialog/e-timezone-dialog.ui
index 017c76c5f3..5a23ec180e 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.ui
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.ui
@@ -16,7 +16,8 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="homogeneous">False</property>
         <property name="spacing">6</property>
@@ -56,13 +57,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="timezone-table">
+          <object class="GtkBox" id="timezone-table">
+            <property name="orientation">vertical</property>
             <property name="border_width">12</property>
             <property name="visible">True</property>
             <property name="homogeneous">False</property>
             <property name="spacing">12</property>
             <child>
-              <object class="GtkHBox" id="hbox3">
+              <object class="GtkBox" id="hbox3">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="homogeneous">False</property>
                 <property name="spacing">12</property>
@@ -133,14 +136,15 @@ Use the right mouse button to zoom out.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="homogeneous">False</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes"/>
+                    <property name="label" translatable="no"> </property>
                     <property name="use_underline">False</property>
                     <property name="use_markup">False</property>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -158,7 +162,8 @@ Use the right mouse button to zoom out.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkBox" id="vbox1">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="homogeneous">False</property>
                     <property name="spacing">6</property>
@@ -183,14 +188,14 @@ Use the right mouse button to zoom out.</property>
                     <child>
                       <object class="GtkLabel" id="preview-label">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">America/New_York</property>
+                        <property name="label" translatable="no">America/New_York</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</property>
-                        <property name="yalign">0.5</property>
+                        <property name="yalign">0</property>
                         <property name="xpad">0</property>
                         <property name="ypad">0</property>
                       </object>
@@ -238,14 +243,15 @@ Use the right mouse button to zoom out.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkBox" id="hbox1">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="homogeneous">False</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes"/>
+                    <property name="label" translatable="no"> </property>
                     <property name="use_underline">False</property>
                     <property name="use_markup">False</property>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>