From c2d89a590375f902505ce3b77a6ca9a8ac8c260d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= <erick.red@gmail.com>
Date: Sun, 17 May 2015 22:29:08 -0400
Subject: [PATCH] build: simplify UI files using gtk-builder-tool

---
 data/ui/date-selector.ui      |  12 ----
 data/ui/edit-dialog.ui        |  43 +++---------
 data/ui/online-account-row.ui |   5 --
 data/ui/search-view.ui        |  12 +---
 data/ui/source-dialog.ui      | 128 +++-------------------------------
 data/ui/time-selector.ui      |   5 --
 data/ui/window.ui             |  48 +------------
 data/ui/year-view.ui          |  66 ++++++++----------
 8 files changed, 53 insertions(+), 266 deletions(-)

diff --git a/data/ui/date-selector.ui b/data/ui/date-selector.ui
index fa810389..5db89c53 100644
--- a/data/ui/date-selector.ui
+++ b/data/ui/date-selector.ui
@@ -12,12 +12,10 @@
     </child>
   </template>
   <object class="GtkPopover" id="date_selector_popover">
-    <property name="visible">False</property>
     <property name="position">bottom</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="row_spacing">6</property>
         <child>
@@ -72,7 +70,6 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="homogeneous">True</property>
             <child>
@@ -87,11 +84,6 @@
                 <signal name="focus-out-event" handler="date_entry_focus_out" object="GcalDateSelector" swapped="no"/>
                 <signal name="activate" handler="entry_activated" object="GcalDateSelector" swapped="no"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry">
@@ -109,8 +101,6 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -128,8 +118,6 @@
                 <signal name="activate" handler="entry_activated" object="GcalDateSelector" swapped="no"/>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
diff --git a/data/ui/edit-dialog.ui b/data/ui/edit-dialog.ui
index 97de35c5..41ee50d4 100644
--- a/data/ui/edit-dialog.ui
+++ b/data/ui/edit-dialog.ui
@@ -15,7 +15,6 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="titlebar">
         <property name="visible">True</property>
-        <property name="has-subtitle">True</property>
         <child>
           <object class="GtkButton" id="cancel_button">
             <property name="label" translatable="yes">Cancel</property>
@@ -26,8 +25,6 @@
         </child>
         <child>
           <object class="GtkImage" id="lock">
-            <property name="visible">False</property>
-            <property name="can_focus">False</property>
             <property name="icon_name">changes-prevent-symbolic</property>
             <property name="icon_size">1</property>
           </object>
@@ -51,35 +48,29 @@
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkGrid" id="main_grid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">18</property>
             <property name="row_spacing">24</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="summary_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">Title</property>
                 <property name="ellipsize">end</property>
                 <style>
-                  <class name="dim-label" />
+                  <class name="dim-label"/>
                 </style>
               </object>
               <packing>
@@ -90,11 +81,10 @@
             <child>
               <object class="GtkLabel" id="starts_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">Starts</property>
                 <style>
-                  <class name="dim-label" />
+                  <class name="dim-label"/>
                 </style>
               </object>
               <packing>
@@ -105,11 +95,10 @@
             <child>
               <object class="GtkLabel" id="ends_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">Ends</property>
                 <style>
-                  <class name="dim-label" />
+                  <class name="dim-label"/>
                 </style>
               </object>
               <packing>
@@ -120,12 +109,11 @@
             <child>
               <object class="GtkLabel" id="notes_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="valign">start</property>
                 <property name="label" translatable="yes">Notes</property>
                 <style>
-                  <class name="dim-label" />
+                  <class name="dim-label"/>
                 </style>
               </object>
               <packing>
@@ -136,11 +124,10 @@
             <child>
               <object class="GtkLabel" id="location_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">Location</property>
                 <style>
-                  <class name="dim-label" />
+                  <class name="dim-label"/>
                 </style>
               </object>
               <packing>
@@ -171,7 +158,6 @@
                 <child>
                   <object class="GtkImage" id="source_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="halign">start</property>
                   </object>
                 </child>
@@ -179,14 +165,12 @@
               <packing>
                 <property name="left_attach">3</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="all_day_check">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="draw_indicator">True</property>
                 <property name="label" translatable="yes">All day</property>
                 <signal name="toggled" handler="gcal_edit_dialog_all_day_changed" object="GcalEditDialog" swapped="no"/>
@@ -195,7 +179,6 @@
                 <property name="left_attach">3</property>
                 <property name="top_attach">1</property>
                 <property name="width">2</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -238,10 +221,9 @@
             <child>
               <object class="GtkBox" id="start_date_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <style>
-                  <class name="linked" />
+                  <class name="linked"/>
                 </style>
                 <child>
                   <object class="GcalDateSelector" id="start_date_selector">
@@ -273,10 +255,9 @@
             <child>
               <object class="GtkBox" id="end_date_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <style>
-                  <class name="linked" />
+                  <class name="linked"/>
                 </style>
                 <child>
                   <object class="GcalDateSelector" id="end_date_selector">
@@ -313,24 +294,21 @@
                 <child>
                   <object class="GtkLabel" id="delete_label">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Delete event</property>
                   </object>
                 </child>
                 <style>
-                  <class name="destructive-action" />
+                  <class name="destructive-action"/>
                 </style>
               </object>
               <packing>
-                 <property name="left_attach">0</property>
-                 <property name="top_attach">5</property>
-                 <property name="width">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -338,6 +316,5 @@
     </child>
   </template>
   <object class="GtkPopover" id="sources_popover">
-    <property name="visible">False</property>
   </object>
 </interface>
diff --git a/data/ui/online-account-row.ui b/data/ui/online-account-row.ui
index 7d0436ad..678f199e 100644
--- a/data/ui/online-account-row.ui
+++ b/data/ui/online-account-row.ui
@@ -9,14 +9,12 @@
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="margin_end">18</property>
         <property name="border_width">6</property>
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkImage" id="icon">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="pixel_size">22</property>
           </object>
           <packing>
@@ -28,7 +26,6 @@
         <child>
           <object class="GtkLabel" id="account_provider_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="xalign">0</property>
           </object>
@@ -40,7 +37,6 @@
         <child>
           <object class="GtkLabel" id="account_name_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="xalign">0</property>
             <style>
@@ -55,7 +51,6 @@
         <child>
           <object class="GtkLabel" id="on_off_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
diff --git a/data/ui/search-view.ui b/data/ui/search-view.ui
index cfb86040..5dba5b04 100644
--- a/data/ui/search-view.ui
+++ b/data/ui/search-view.ui
@@ -12,10 +12,8 @@
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="no_results_grid">
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="hexpand">True</property>
@@ -24,7 +22,6 @@
             <child>
               <object class="GtkImage" id="image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="pixel_size">48</property>
@@ -38,7 +35,6 @@
             <child>
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="label" translatable="yes">No results found</property>
@@ -64,21 +60,18 @@
             <child>
               <object class="GtkViewport" id="viewport">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="shadow_type">none</property>
                 <style>
-                  <class name="search-viewport" />
+                  <class name="search-viewport"/>
                 </style>
                 <child>
                   <object class="GtkGrid" id="search_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkLabel" id="empty_search_label">
-                        <property name="visible" bind-source="listbox" bind-property="visible" bind-flags="invert-boolean | bidirectional" />
-                        <property name="can_focus">False</property>
+                        <property name="visible" bind-source="listbox" bind-property="visible" bind-flags="invert-boolean | bidirectional"/>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <property name="label" translatable="yes">Use the entry above to search for events.</property>
@@ -91,7 +84,6 @@
                     <child>
                       <object class="GtkListBox" id="listbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="selection_mode">none</property>
                         <signal name="row-activated" handler="open_event" object="GcalSearchView" swapped="no"/>
                       </object>
diff --git a/data/ui/source-dialog.ui b/data/ui/source-dialog.ui
index 767b7332..abc35ffc 100644
--- a/data/ui/source-dialog.ui
+++ b/data/ui/source-dialog.ui
@@ -15,27 +15,17 @@
     <signal name="response" handler="response_signal" object="GcalSourceDialog" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkOverlay" id="overlay">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child type="overlay">
               <object class="GtkRevealer" id="notification">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">start</property>
                 <property name="transition_duration">100</property>
@@ -43,11 +33,9 @@
                 <child>
                   <object class="GtkFrame">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="margin_start">12</property>
                         <property name="margin_end">12</property>
                         <property name="margin_top">2</property>
@@ -56,7 +44,6 @@
                         <child>
                           <object class="GtkLabel" id="notification_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="use_markup">True</property>
                           </object>
                           <packing>
@@ -92,7 +79,6 @@
                             <child>
                               <object class="GtkImage">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="icon_name">window-close-symbolic</property>
                                 <property name="icon_size">2</property>
                               </object>
@@ -118,7 +104,6 @@
             <child>
               <object class="GtkStack" id="stack">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="vhomogeneous">False</property>
@@ -132,12 +117,10 @@
                     <child>
                       <object class="GtkViewport" id="main_viewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkBox" id="main_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
                             <property name="border_width">18</property>
@@ -146,13 +129,11 @@
                             <child>
                               <object class="GtkGrid" id="online_account_main_grid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="row_spacing">12</property>
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="online_account_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
                                     <property name="label" translatable="yes">Online Accounts</property>
                                     <property name="xalign">0</property>
@@ -171,11 +152,10 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="tooltip_text" translatable="yes">Open online account settings</property>
-                                    <signal name="clicked" handler="online_accounts_settings_button_clicked" object="GcalSourceDialog" swapped="no" />
+                                    <signal name="clicked" handler="online_accounts_settings_button_clicked" object="GcalSourceDialog" swapped="no"/>
                                     <child>
                                       <object class="GtkImage" id="online_accounts_settings_button_image">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="icon_name">emblem-system-symbolic</property>
                                       </object>
                                     </child>
@@ -188,14 +168,11 @@
                                 <child>
                                   <object class="GtkFrame" id="online_accounts_main_frame">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label_xalign">0</property>
                                     <child>
                                       <object class="GtkListBox" id="online_accounts_listbox">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="selection_mode">none</property>
-                                        <signal name="row-activated" handler="online_accounts_listbox_row_activated" object="GcalSourceDialog" swapped="no" />
+                                        <signal name="row-activated" handler="online_accounts_listbox_row_activated" object="GcalSourceDialog" swapped="no"/>
                                         <child>
                                           <object class="GtkListBoxRow" id="google_stub_row">
                                             <property name="visible">True</property>
@@ -203,14 +180,12 @@
                                             <child>
                                               <object class="GtkGrid" id="google_stub_grid">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="border_width">6</property>
                                                 <property name="margin_end">18</property>
                                                 <property name="column_spacing">12</property>
                                                 <child>
                                                   <object class="GtkImage" id="google_account_image">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="pixel_size">32</property>
                                                     <property name="icon_name">goa-account-google</property>
                                                   </object>
@@ -223,20 +198,17 @@
                                                 <child>
                                                   <object class="GtkLabel" id="google_account_label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Google</property>
                                                     <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="top_attach">0</property>
-                                                    <property name="height">1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" id="google_account_config_label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Click to set up</property>
                                                     <property name="xalign">0</property>
                                                     <style>
@@ -246,7 +218,6 @@
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="top_attach">1</property>
-                                                    <property name="height">1</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -260,14 +231,12 @@
                                             <child>
                                               <object class="GtkGrid" id="owncloud_stub_grid">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="border_width">6</property>
                                                 <property name="margin_end">18</property>
                                                 <property name="column_spacing">12</property>
                                                 <child>
                                                   <object class="GtkImage" id="owncloud_account_image">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="pixel_size">32</property>
                                                     <property name="icon_name">goa-account-owncloud</property>
                                                   </object>
@@ -280,20 +249,17 @@
                                                 <child>
                                                   <object class="GtkLabel" id="owncloud_account_label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">ownCloud</property>
                                                     <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="top_attach">0</property>
-                                                    <property name="height">1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" id="owncloud_account_config_label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Click to set up</property>
                                                     <property name="xalign">0</property>
                                                     <style>
@@ -303,7 +269,6 @@
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="top_attach">1</property>
-                                                    <property name="height">1</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -317,14 +282,12 @@
                                             <child>
                                               <object class="GtkGrid" id="exchange_stub_grid">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="border_width">6</property>
                                                 <property name="margin_end">18</property>
                                                 <property name="column_spacing">12</property>
                                                 <child>
                                                   <object class="GtkImage" id="exchange_account_image">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="pixel_size">32</property>
                                                     <property name="icon_name">goa-account</property>
                                                   </object>
@@ -337,20 +300,17 @@
                                                 <child>
                                                   <object class="GtkLabel" id="exchange_account_label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Microsoft Exchange</property>
                                                     <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="top_attach">0</property>
-                                                    <property name="height">1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkLabel" id="exchange_account_config_label">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Click to set up</property>
                                                     <property name="xalign">0</property>
                                                     <style>
@@ -360,7 +320,6 @@
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="top_attach">1</property>
-                                                    <property name="height">1</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -377,22 +336,15 @@
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkGrid" id="other_calendars_main_grid">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="row_spacing">12</property>
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="calendars_header_label">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
                                     <property name="label" translatable="yes">Calendars</property>
                                     <property name="xalign">0</property>
@@ -408,14 +360,11 @@
                                 <child>
                                   <object class="GtkFrame" id="other_calendars_main_frame">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label_xalign">0</property>
                                     <child>
                                       <object class="GtkListBox" id="calendars_listbox">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="selection_mode">none</property>
-                                        <signal name="row-activated" handler="calendar_listbox_row_activated" object="GcalSourceDialog" swapped="no" />
+                                        <signal name="row-activated" handler="calendar_listbox_row_activated" object="GcalSourceDialog" swapped="no"/>
                                       </object>
                                     </child>
                                   </object>
@@ -433,29 +382,19 @@
                                     <child>
                                       <object class="GtkBox" id="add_calendar_button_box">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkLabel" id="add_calendar_button">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Add</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkImage" id="add_calendar_button_image">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="icon_name">pan-down-symbolic</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -469,8 +408,6 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -487,7 +424,6 @@
                 <child>
                   <object class="GtkGrid" id="edit_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="border_width">18</property>
@@ -497,14 +433,11 @@
                       <object class="GtkCheckButton" id="default_check">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <signal name="notify::active" handler="default_check_toggled" object="GcalSourceDialog" swapped="no"/>
                         <child>
                           <object class="GtkLabel" id="default_check_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Add new events to this calendar by default</property>
                             <property name="xalign">0</property>
                           </object>
@@ -542,14 +475,12 @@
                       <object class="GtkCheckButton" id="calendar_visible_check">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <signal name="notify::active" handler="calendar_visible_check_toggled" object="GcalSourceDialog" swapped="no"/>
                         <child>
                           <object class="GtkLabel" id="display_calendar_check_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Display calendar</property>
                           </object>
                         </child>
@@ -588,7 +519,6 @@
                     <child>
                       <object class="GtkLabel" id="calendar_dim_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Calendar name</property>
                         <property name="xalign">1</property>
                         <style>
@@ -603,7 +533,6 @@
                     <child>
                       <object class="GtkLabel" id="color_dim_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Color</property>
                         <property name="xalign">1</property>
                         <style>
@@ -618,7 +547,6 @@
                     <child>
                       <object class="GtkLabel" id="account_dim_label">
                         <property name="visible" bind-source="account_box" bind-property="visible" bind-flags="default|sync-create"/>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Account</property>
                         <property name="xalign">1</property>
                         <style>
@@ -633,7 +561,6 @@
                     <child>
                       <object class="GtkLabel" id="location_dim_label">
                         <property name="visible" bind-source="calendar_url_button" bind-property="visible" bind-flags="default|sync-create"/>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Location</property>
                         <property name="xalign">1</property>
                         <style>
@@ -648,20 +575,13 @@
                     <child>
                       <object class="GtkBox" id="account_box">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="account_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="settings_button">
@@ -669,11 +589,9 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <signal name="clicked" handler="settings_button_clicked" object="GcalSourceDialog" swapped="no" />
+                            <signal name="clicked" handler="settings_button_clicked" object="GcalSourceDialog" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -706,15 +624,13 @@
                 <child>
                   <object class="GtkGrid" id="web_source_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="border_width">18</property>
                     <property name="row_spacing">16</property>
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="web_description_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Enter the address of the calendar that you want to add. If the calendar belongs to one of you online accounts, you can add it through the &lt;a href="GOA"&gt;online account settings&lt;/a&gt;.</property>
+                        <property name="label" translatable="yes">Enter the address of the calendar that you want to add. If the calendar belongs to one of you online accounts, you can add it through the &lt;a href=&quot;GOA&quot;&gt;online account settings&lt;/a&gt;.</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
                         <property name="xalign">0</property>
@@ -729,7 +645,6 @@
                     <child>
                       <object class="GtkLabel" id="calendar_address_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Calendar Address</property>
                         <property name="xalign">1</property>
                         <style>
@@ -756,28 +671,22 @@
                     </child>
                     <child>
                       <object class="GtkRevealer" id="web_sources_revealer">
-                        <property name="can_focus">False</property>
                         <property name="transition_type">crossfade</property>
                         <property name="transition_duration">200</property>
                         <child>
                           <object class="GtkBox" id="web_sources_listbox_box">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="web_sources_calendar_label">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Calendars</property>
                                 <property name="xalign">0</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
                               </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkScrolledWindow" id="web_list_scrolledwindow">
@@ -786,20 +695,17 @@
                                 <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
-                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkViewport" id="viewport">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="shadow_type">none</property>
                                     <child>
                                       <object class="GtkListBox" id="web_sources_listbox">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="activate_on_single_click">False</property>
                                         <property name="selection_mode">none</property>
                                         <style>
-                                          <class name="calendar-list" />
+                                          <class name="calendar-list"/>
                                         </style>
                                       </object>
                                     </child>
@@ -830,8 +736,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -840,20 +744,16 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="title">Calendar Settings</property>
-        <property name="has_subtitle">True</property>
         <property name="show_close_button">True</property>
         <child>
           <object class="GtkButton" id="back_button">
-            <property name="visible">False</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <signal name="clicked" handler="back_button_clicked" object="GcalSourceDialog" swapped="no" />
+            <signal name="clicked" handler="back_button_clicked" object="GcalSourceDialog" swapped="no"/>
             <child>
               <object class="GtkImage" id="back_button_image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">go-previous-symbolic</property>
               </object>
             </child>
@@ -890,19 +790,14 @@
     </child>
   </template>
   <object class="GtkDialog" id="credentials_dialog">
-    <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <property name="transient_for">GcalSourceDialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="credentials-dialog-vbox1">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">0</property>
-        <property name="border_width">0</property>
         <child>
           <object class="GtkGrid" id="credentials_grid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="border_width">12</property>
             <property name="row_spacing">6</property>
@@ -910,7 +805,6 @@
             <child>
               <object class="GtkLabel" id="credentials_user_dim_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">User</property>
                 <property name="xalign">1</property>
                 <style>
@@ -925,7 +819,6 @@
             <child>
               <object class="GtkLabel" id="credentials_password_dim_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Password</property>
                 <property name="xalign">1</property>
                 <style>
@@ -964,8 +857,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -974,7 +865,6 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="credentials_headerbar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="title">Enter your credentials</property>
         <child>
           <object class="GtkButton" id="credentials_cancel_button">
@@ -982,7 +872,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <signal name="clicked" handler="credential_button_clicked" object="GcalSourceDialog" swapped="no" />
+            <signal name="clicked" handler="credential_button_clicked" object="GcalSourceDialog" swapped="no"/>
           </object>
         </child>
         <child>
@@ -991,7 +881,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <signal name="clicked" handler="credential_button_clicked" object="GcalSourceDialog" swapped="no" />
+            <signal name="clicked" handler="credential_button_clicked" object="GcalSourceDialog" swapped="no"/>
             <style>
               <class name="suggested-action"/>
             </style>
diff --git a/data/ui/time-selector.ui b/data/ui/time-selector.ui
index cda16db5..de3d5b9d 100644
--- a/data/ui/time-selector.ui
+++ b/data/ui/time-selector.ui
@@ -23,12 +23,10 @@
     <signal name="value-changed" handler="time_changed" object="GcalTimeSelector" swapped="no"/>
   </object>
   <object class="GtkPopover" id="time_selector_popover">
-    <property name="visible">False</property>
     <property name="position">bottom</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="column_spacing">6</property>
         <child>
@@ -64,7 +62,6 @@
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">:</property>
           </object>
           <packing>
@@ -74,8 +71,6 @@
         </child>
         <child>
           <object class="GtkComboBoxText" id="period_combo">
-            <property name="visible">False</property>
-            <property name="can_focus">False</property>
             <property name="valign">center</property>
             <property name="active">0</property>
             <signal name="changed" handler="period_changed" object="GcalTimeSelector" swapped="no"/>
diff --git a/data/ui/window.ui b/data/ui/window.ui
index 3b069469..a9cfa63a 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.14"/>
   <template class="GcalWindow" parent="GtkApplicationWindow">
-    <property name="can_focus">False</property>
     <property name="window_position">center</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
@@ -15,17 +14,14 @@
     <child>
       <object class="GtkOverlay" id="views_overlay">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="main_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child>
               <object class="GtkSearchBar" id="search_bar">
                 <property name="app_paintable">True</property>
-                <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="hexpand">True</property>
                 <property name="show_close_button">True</property>
@@ -34,7 +30,6 @@
                 <child>
                   <object class="GtkBox" id="search_entry_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkSearchEntry" id="search_entry">
                         <property name="width_request">500</property>
@@ -47,9 +42,6 @@
                         <property name="primary_icon_sensitive">False</property>
                         <signal name="search-changed" handler="search_changed" object="GcalWindow" swapped="no"/>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -62,7 +54,6 @@
             <child>
               <object class="GtkStack" id="views_stack">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="transition_duration">250</property>
@@ -80,7 +71,6 @@
                     <signal name="event-activated" handler="event_activated" object="GcalWindow" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="position">0</property>
                     <property name="name">month</property>
                     <property name="title" translatable="yes">Month</property>
                   </packing>
@@ -110,7 +100,6 @@
         <child type="overlay">
           <object class="GtkRevealer" id="notification">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="transition_duration">100</property>
@@ -118,11 +107,9 @@
             <child>
               <object class="GtkFrame">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="margin_end">12</property>
                     <property name="margin_top">2</property>
@@ -131,7 +118,6 @@
                     <child>
                       <object class="GtkLabel" id="notification_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
@@ -167,7 +153,6 @@
                         <child>
                           <object class="GtkImage">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="icon_name">window-close-symbolic</property>
                             <property name="icon_size">2</property>
                           </object>
@@ -195,13 +180,11 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="show_close_button">True</property>
         <property name="title" translatable="yes">Calendar</property>
         <child>
           <object class="GtkBox" id="button_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="back_button">
                 <property name="visible">True</property>
@@ -211,16 +194,10 @@
                 <child>
                   <object class="GtkImage" id="go_back_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">go-previous-symbolic</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="today_button">
@@ -231,8 +208,6 @@
                 <signal name="clicked" handler="date_updated" object="GcalWindow" swapped="no"/>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -245,14 +220,11 @@
                 <child>
                   <object class="GtkImage" id="go_next_image">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="icon_name">go-next-symbolic</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -264,7 +236,6 @@
         <child type="title">
           <object class="GtkStackSwitcher" id="views_switcher">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="stack">views_stack</property>
           </object>
         </child>
@@ -276,7 +247,6 @@
             <child>
               <object class="GtkImage" id="menu_image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">open-menu-symbolic</property>
               </object>
             </child>
@@ -294,7 +264,6 @@
             <child>
               <object class="GtkImage" id="calendars_button_image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">x-office-calendar-symbolic</property>
               </object>
             </child>
@@ -311,7 +280,6 @@
             <child>
               <object class="GtkImage" id="search_button_image">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="icon_name">edit-find-symbolic</property>
               </object>
             </child>
@@ -350,15 +318,11 @@
                 <property name="visible">True</property>
                 <property name="hexpand">True</property>
                 <property name="selection_mode">none</property>
-                <signal name="row-activated" handler="source_row_activated" object="GcalWindow" swapped="no" />
+                <signal name="row-activated" handler="source_row_activated" object="GcalWindow" swapped="no"/>
                 <style>
-                  <class name="calendar-list" />
+                  <class name="calendar-list"/>
                 </style>
               </object>
-              <packing>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="calendar_settings_button">
@@ -366,7 +330,7 @@
                 <property name="can_focus">True</property>
                 <property name="relief">none</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="show_source_dialog" object="GcalWindow" swapped="no" />
+                <signal name="clicked" handler="show_source_dialog" object="GcalWindow" swapped="no"/>
                 <child>
                   <object class="GtkLabel" id="calendar_settings_label">
                     <property name="visible">True</property>
@@ -376,7 +340,6 @@
                 </child>
               </object>
               <packing>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -386,25 +349,21 @@
     </child>
   </object>
   <object class="GtkPopover" id="popover">
-    <property name="visible">False</property>
     <property name="relative_to">views_stack</property>
     <signal name="closed" handler="close_new_event_widget" object="GcalWindow" swapped="no"/>
     <child>
       <object class="GtkGrid">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="border_width">14</property>
         <child>
           <object class="GtkGrid">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">18</property>
             <property name="column_spacing">12</property>
             <property name="column_homogeneous">True</property>
             <child>
               <object class="GtkLabel" id="new_event_title_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -467,7 +426,6 @@
   </object>
   <object class="GcalSourceDialog" id="source_dialog">
     <property name="visible">False</property>
-    <property name="can_focus">False</property>
     <property name="transient_for">GcalWindow</property>
   </object>
 </interface>
diff --git a/data/ui/year-view.ui b/data/ui/year-view.ui
index 61914244..231c9c40 100644
--- a/data/ui/year-view.ui
+++ b/data/ui/year-view.ui
@@ -7,18 +7,18 @@
         <property name="visible">True</property>
         <property name="hexpand">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK|GDK_BUTTON_MOTION_MASK|GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK|GDK_STRUCTURE_MASK</property>
-        <signal name="draw" handler="draw_navigator" object="GcalYearView" swapped="yes" />
-        <signal name="button-press-event" handler="navigator_button_press_cb" object="GcalYearView" swapped="yes" />
-        <signal name="button-release-event" handler="navigator_button_release_cb" object="GcalYearView" swapped="yes" />
-        <signal name="motion-notify-event" handler="navigator_motion_notify_cb" object="GcalYearView" swapped="yes" />
+        <signal name="draw" handler="draw_navigator" object="GcalYearView" swapped="yes"/>
+        <signal name="button-press-event" handler="navigator_button_press_cb" object="GcalYearView" swapped="yes"/>
+        <signal name="button-release-event" handler="navigator_button_release_cb" object="GcalYearView" swapped="yes"/>
+        <signal name="motion-notify-event" handler="navigator_motion_notify_cb" object="GcalYearView" swapped="yes"/>
         <style>
-          <class name="year-navigator" />
+          <class name="year-navigator"/>
         </style>
       </object>
-     <packing>
-       <property name="position">0</property>
-       <property name="pack_type">start</property>
-     </packing>
+      <packing>
+        <property name="position">0</property>
+        <property name="pack_type">start</property>
+      </packing>
     </child>
     <child>
       <object class="GtkBox" id="sidebar">
@@ -37,13 +37,12 @@
                   <object class="GtkListBox" id="events_sidebar">
                     <property name="visible">True</property>
                     <style>
-                      <class name="sidebar" />
+                      <class name="sidebar"/>
                     </style>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="position">0</property>
                 <property name="name">events-list</property>
               </packing>
             </child>
@@ -52,32 +51,29 @@
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <style>
-                  <class name="sidebar" />
+                  <class name="sidebar"/>
                 </style>
                 <child>
                   <object class="GtkLabel" id="no_events_title">
-                     <property name="visible">True</property>
-                     <property name="halign">start</property>
-                     <property name="margin">6</property>
-                     <property name="label" translatable="yes">Today</property>
-                      <style>
-                        <class name="sidebar-header" />
-                      </style>
+                    <property name="visible">True</property>
+                    <property name="halign">start</property>
+                    <property name="margin">6</property>
+                    <property name="label" translatable="yes">Today</property>
+                    <style>
+                      <class name="sidebar-header"/>
+                    </style>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
-                     <property name="visible">True</property>
-                     <property name="halign">start</property>
-                     <property name="margin_start">6</property>
-                     <property name="label" translatable="yes">No events</property>
-                      <style>
-                        <class name="dim-label" />
-                        <class name="italic-label"/>
-                      </style>
+                    <property name="visible">True</property>
+                    <property name="halign">start</property>
+                    <property name="margin_start">6</property>
+                    <property name="label" translatable="yes">No events</property>
+                    <style>
+                      <class name="dim-label"/>
+                      <class name="italic-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -90,16 +86,13 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">True</property>
             <property name="valign">end</property>
             <property name="label" translatable="yes">Add Event…</property>
-            <signal name="clicked" handler="add_event_clicked_cb" object="GcalYearView" swapped="yes" />
+            <signal name="clicked" handler="add_event_clicked_cb" object="GcalYearView" swapped="yes"/>
           </object>
           <packing>
             <property name="position">1</property>
@@ -111,9 +104,8 @@
   <object class="GtkPopover" id="popover">
     <property name="relative_to">navigator</property>
     <style>
-      <class name="events" />
+      <class name="events"/>
     </style>
-    <signal name="closed" handler="popover_closed_cb" object="GcalYearView" swapped="yes" />
+    <signal name="closed" handler="popover_closed_cb" object="GcalYearView" swapped="yes"/>
   </object>
 </interface>
-