[gnome-clocks] Minor cosmetic changes

[Paolo Borelli <pborelli src gnome org>]

commit 13abdbf0879311e55485bc000f527c25a3fd975c
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Feb 21 18:39:33 2016 +0100

    Minor cosmetic changes

 data/ui/alarm.ui |    4 ----
 data/ui/world.ui |   22 ----------------------
 src/alarm.vala   |    7 ++++---
 src/world.vala   |    9 ++++-----
 4 files changed, 8 insertions(+), 34 deletions(-)
---
diff --git a/data/ui/alarm.ui b/data/ui/alarm.ui
index 1b54b6e..99c7bf4 100644
--- a/data/ui/alarm.ui
+++ b/data/ui/alarm.ui
@@ -22,8 +22,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -39,8 +37,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
diff --git a/data/ui/world.ui b/data/ui/world.ui
index 93d6a36..90b9965 100644
--- a/data/ui/world.ui
+++ b/data/ui/world.ui
@@ -22,8 +22,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -39,8 +37,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
@@ -75,8 +71,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -90,8 +84,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -105,16 +97,12 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -139,8 +127,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -155,8 +141,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -168,8 +152,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -180,16 +162,12 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
diff --git a/src/alarm.vala b/src/alarm.vala
index efe18b7..dde81f7 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -527,10 +527,10 @@ public class Face : Gtk.Stack, Clocks.Clock {
     private GLib.Settings settings;
     private Gtk.Button new_button;
     [GtkChild]
-    private ContentView content_view;
-    [GtkChild]
     private Gtk.Widget empty_view;
     [GtkChild]
+    private ContentView content_view;
+    [GtkChild]
     private RingingPanel ringing_panel;
 
     public Face (HeaderBar header_bar) {
@@ -573,7 +573,6 @@ public class Face : Gtk.Stack, Clocks.Clock {
         content_view.set_header_bar (header_bar);
 
         load ();
-        reset_view ();
         show_all ();
 
         alarms.items_changed.connect ((position, removed, added) => {
@@ -581,6 +580,8 @@ public class Face : Gtk.Stack, Clocks.Clock {
             reset_view ();
         });
 
+        reset_view ();
+
         // Start ticking...
         Utils.WallClock.get_default ().tick.connect (() => {
             alarms.foreach ((i) => {
diff --git a/src/world.vala b/src/world.vala
index c68ed28..94a8048 100644
--- a/src/world.vala
+++ b/src/world.vala
@@ -240,10 +240,10 @@ public class Face : Gtk.Stack, Clocks.Clock {
     private Gdk.Pixbuf? night_pixbuf;
     private Item standalone_location;
     [GtkChild]
-    private ContentView content_view;
-    [GtkChild]
     private Gtk.Widget empty_view;
     [GtkChild]
+    private ContentView content_view;
+    [GtkChild]
     private Gtk.Widget standalone;
     [GtkChild]
     private Gtk.Label standalone_time_label;
@@ -297,6 +297,7 @@ public class Face : Gtk.Stack, Clocks.Clock {
         content_view.set_header_bar (header_bar);
 
         load ();
+        show_all ();
 
         if (settings.get_boolean ("geolocation")) {
             use_geolocation.begin ((obj, res) => {
@@ -304,14 +305,12 @@ public class Face : Gtk.Stack, Clocks.Clock {
             });
         }
 
-        reset_view ();
-
         locations.items_changed.connect ((position, removed, added) => {
             save ();
             reset_view ();
         });
 
-        show_all ();
+        reset_view ();
 
         // Start ticking...
         Utils.WallClock.get_default ().tick.connect (() => {