Merge branch 'master' into wip/gsettings

7 files changed, 25 insertions, 13 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>
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index c1fa5daf8b..a16c72bcc0 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -134,6 +134,7 @@ gal_view_etable_clone (GalView *view)
 	new = g_object_new (GAL_TYPE_VIEW_ETABLE, NULL);
 	new->spec  = gve->spec;
 	new->title = g_strdup (gve->title);
+	g_object_unref (new->state);
 	new->state = e_table_state_duplicate (gve->state);
 
 	g_object_ref (new->spec);
diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index 7eae4e14aa..bd21668e2f 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -301,6 +301,9 @@ account_tree_view_refresh_timeout_cb (gpointer ptree_view)
 		COLUMN_NAME, _("Search Folders"),
 		COLUMN_PROTOCOL, NULL,
 		-1);
+
+	g_list_free (list);
+
  skip:
 	/* Restore the previously selected account. */
 	selected = e_account_tree_view_get_selected_type (tree_view);
diff --git a/widgets/misc/e-signature-tree-view.c b/widgets/misc/e-signature-tree-view.c
index 914b03ec13..62a923d8b9 100644
--- a/widgets/misc/e-signature-tree-view.c
+++ b/widgets/misc/e-signature-tree-view.c
@@ -115,6 +115,8 @@ signature_tree_view_refresh_cb (ESignatureList *signature_list,
 		gtk_tree_path_free (path);
 	}
 
+	g_list_free (list);
+
 skip:
 	/* Restore the previously selected signature. */
 	signature = e_signature_tree_view_get_selected (tree_view);
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index a8eb4ccb76..98bbf897cd 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -350,5 +350,5 @@ e_cell_hbox_append (ECellHbox *hbox,
 	hbox->def_size_cols[hbox->subcell_count - 1] = size;
 
 	if (subcell)
-		g_object_ref (subcell);
+		g_object_ref_sink (subcell);
 }
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 9830a06aff..bce40a8a2e 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -338,5 +338,5 @@ e_cell_vbox_append (ECellVbox *vbox,
 	vbox->model_cols[vbox->subcell_count - 1] = model_col;
 
 	if (subcell)
-		g_object_ref (subcell);
+		g_object_ref_sink (subcell);
 }