--- old/src/gui/data/packagemanager.glade	Fri Jul  3 17:09:32 2009
+++ new/src/gui/data/packagemanager.glade	Fri Jul  3 17:09:32 2009
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Jun 30 10:24:37 2009 -->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mainwindow">
     <property name="width_request">750</property>
     <property name="height_request">500</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Package Manager</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="default_width">800</property>
     <property name="default_height">615</property>
     <property name="icon">PM_app_48x.png</property>
@@ -86,7 +86,7 @@
                         <property name="label" translatable="yes">Cu_t</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_cut_activate"/>
-                        <accelerator key="X" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="X" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -98,7 +98,7 @@
                         <property name="label" translatable="yes">_Copy</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_copy_activate"/>
-                        <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="C" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -110,7 +110,7 @@
                         <property name="label" translatable="yes">_Paste</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_paste_activate"/>
-                        <accelerator key="V" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="V" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -138,7 +138,7 @@
                         <property name="label" translatable="yes">Select _All</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_select_all_activate"/>
-                        <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="A" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -159,7 +159,7 @@
                         <property name="label" translatable="yes">_Deselect All</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_deselect_activate"/>
-                        <accelerator key="A" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="A" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -174,7 +174,7 @@
                         <property name="label" translatable="yes">_Search</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_edit_search_activate"/>
-                        <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="F" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -210,7 +210,7 @@
                         <property name="label" translatable="yes">Start _Page</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_help_start_page_activate"/>
-                        <accelerator key="Home" modifiers="GDK_MOD1_MASK" signal="activate"/>
+                        <accelerator key="Home" signal="activate" modifiers="GDK_MOD1_MASK"/>
                       </widget>
                     </child>
                   </widget>
@@ -286,7 +286,7 @@
                         <property name="label" translatable="yes">_Contents</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="on_help_help_activate"/>
-                        <accelerator key="F1" modifiers="" signal="activate"/>
+                        <accelerator key="F1" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -311,6 +311,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -328,6 +329,7 @@
                 <signal name="clicked" handler="on_reload_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -343,6 +345,7 @@
                 <signal name="clicked" handler="on_update_all_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -358,6 +361,7 @@
                 <signal name="clicked" handler="on_install_update_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -373,6 +377,7 @@
                 <signal name="clicked" handler="on_remove_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -381,6 +386,9 @@
                 <property name="visible">True</property>
                 <property name="draw">False</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkSeparatorToolItem" id="toolbutton3">
@@ -387,15 +395,18 @@
                 <property name="visible">True</property>
                 <property name="draw">False</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkToolItem" id="toolbutton1">
                 <property name="visible">True</property>
-                <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+                <property name="resize_mode">queue</property>
                 <child>
                   <widget class="GtkAlignment" id="alignment9">
                     <property name="visible">True</property>
-                    <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+                    <property name="resize_mode">queue</property>
                     <property name="xalign">1</property>
                     <property name="top_padding">11</property>
                     <property name="bottom_padding">11</property>
@@ -414,6 +425,7 @@
                           </widget>
                           <packing>
                             <property name="padding">6</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -421,11 +433,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="relief">none</property>
                             <property name="focus_on_click">False</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="response_id">0</property>
                             <signal name="button_press_event" handler="on_set_search_button_press_event"/>
                             <signal name="clicked" handler="on_set_search_clicked"/>
                             <child>
@@ -437,12 +448,15 @@
                                     <property name="xalign">0</property>
                                     <property name="stock">gtk-missing-image</property>
                                   </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkImage" id="search_image_arrow">
                                     <property name="visible">True</property>
                                     <property name="pixbuf">arrow.png</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -467,7 +481,7 @@
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="tooltip" translatable="yes">Type text to search name and description of the package.</property>
                             <accessibility>
-                              <atkproperty name="AtkObject::accessible_name">Search</atkproperty>
+                              <atkproperty name="AtkObject::accessible-name">Search</atkproperty>
                             </accessibility>
                             <signal name="changed" handler="on_searchentry_changed"/>
                             <signal name="focus_out_event" handler="on_searchentry_focus_out_event"/>
@@ -483,11 +497,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="relief">none</property>
                             <property name="focus_on_click">False</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="response_id">0</property>
                             <signal name="clicked" handler="on_clear_search_clicked"/>
                             <child>
                               <widget class="GtkImage" id="clear_image">
@@ -507,6 +520,9 @@
                   </widget>
                 </child>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
           </widget>
           <packing>
@@ -538,6 +554,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -546,8 +563,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <widget class="GtkTreeView" id="categoriestreeview">
                         <property name="visible">True</property>
@@ -555,7 +572,7 @@
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="headers_visible">False</property>
                         <accessibility>
-                          <atkproperty name="AtkObject::accessible_name">Categories</atkproperty>
+                          <atkproperty name="AtkObject::accessible-name">Categories</atkproperty>
                         </accessibility>
                       </widget>
                     </child>
@@ -577,6 +594,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -618,6 +636,9 @@
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">filtercombobox</property>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkComboBox" id="filtercombobox">
@@ -633,6 +654,7 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -648,9 +670,12 @@
                             <property name="label" translatable="yes">&lt;i&gt;_Repository:&lt;/i&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="use_underline">True</property>
-                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                            <property name="justify">right</property>
                             <property name="mnemonic_widget">repositorycombobox</property>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkComboBox" id="repositorycombobox">
@@ -667,7 +692,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">12</property>
-                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="pack_type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -674,6 +699,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -692,8 +718,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <widget class="GtkTreeView" id="applicationtreeview">
                                 <property name="height_request">270</property>
@@ -703,7 +729,7 @@
                                 <property name="rules_hint">True</property>
                                 <property name="enable_search">False</property>
                                 <accessibility>
-                                  <atkproperty name="AtkObject::accessible_name">Packages</atkproperty>
+                                  <atkproperty name="AtkObject::accessible-name">Packages</atkproperty>
                                 </accessibility>
                               </widget>
                             </child>
@@ -736,6 +762,7 @@
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -753,6 +780,9 @@
                                         <property name="label" translatable="yes">&lt;b&gt;PACKAGE NAME&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </widget>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkLabel" id="shortdescriptionlabel">
@@ -777,6 +807,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -790,8 +821,8 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <widget class="GtkTextView" id="generalinfotextview">
                                         <property name="visible">True</property>
@@ -810,8 +841,8 @@
                                     <property name="use_markup">True</property>
                                   </widget>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="tab_fill">False</property>
+                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -819,8 +850,8 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <widget class="GtkTextView" id="installedfilestextview">
                                         <property name="visible">True</property>
@@ -841,9 +872,9 @@
                                     <property name="label" translatable="yes">Files</property>
                                   </widget>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="position">1</property>
                                     <property name="tab_fill">False</property>
+                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -851,8 +882,8 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <widget class="GtkTextView" id="dependenciestextview">
                                         <property name="visible">True</property>
@@ -873,9 +904,9 @@
                                     <property name="label" translatable="yes">Dependencies</property>
                                   </widget>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="position">2</property>
                                     <property name="tab_fill">False</property>
+                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -882,8 +913,8 @@
                                   <widget class="GtkScrolledWindow" id="scrolledwindow16">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <widget class="GtkTextView" id="licensetextview">
                                         <property name="visible">True</property>
@@ -901,9 +932,9 @@
                                     <property name="label" translatable="yes">License</property>
                                   </widget>
                                   <packing>
-                                    <property name="type">tab</property>
                                     <property name="position">3</property>
                                     <property name="tab_fill">False</property>
+                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -936,7 +967,7 @@
                                 <property name="visible">True</property>
                                 <property name="border_width">1</property>
                                 <property name="label_xalign">0</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -949,6 +980,9 @@
                               </widget>
                             </child>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </widget>
                       <packing>
@@ -987,7 +1021,7 @@
                 <property name="no_show_all">True</property>
                 <property name="label_xalign">0</property>
                 <property name="label_yalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_OUT</property>
+                <property name="shadow_type">out</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <child>
@@ -996,13 +1030,12 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip" translatable="yes">Search Repositories Error</property>
-                    <property name="relief">GTK_RELIEF_NONE</property>
+                    <property name="relief">none</property>
                     <property name="focus_on_click">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="response_id">0</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name" translatable="yes">Remote search error</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name" translatable="yes">Remote search error</atkproperty>
                     </accessibility>
                     <signal name="clicked" handler="on_infosearch_button_clicked"/>
                     <child>
@@ -1011,7 +1044,7 @@
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
                         <property name="stock">gtk-dialog-warning</property>
-                        <property name="icon_size">1</property>
+                        <property name="icon-size">1</property>
                       </widget>
                     </child>
                   </widget>
@@ -1020,6 +1053,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1038,7 +1072,7 @@
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="label_yalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_OUT</property>
+                <property name="shadow_type">out</property>
                 <child>
                   <widget class="GtkHBox" id="legend_hbox">
                     <property name="visible">True</property>
@@ -1050,10 +1084,13 @@
                           <widget class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Legend:</property>
-                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                            <property name="justify">right</property>
                           </widget>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkImage" id="image2">
@@ -1090,7 +1127,7 @@
                           <widget class="GtkLabel" id="label18">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Updates</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                            <property name="ellipsize">end</property>
                             <property name="max_width_chars">10</property>
                           </widget>
                         </child>
@@ -1124,6 +1161,9 @@
                     <property name="visible">True</property>
                     <property name="spacing">2</property>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
@@ -1148,9 +1188,9 @@
     <property name="title" translatable="yes">Install/Upgrade Check</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
@@ -1177,10 +1217,11 @@
                       <widget class="GtkImage" id="icon_stage1">
                         <property name="visible">True</property>
                         <property name="stock">gtk-missing-image</property>
-                        <property name="icon_size">2</property>
+                        <property name="icon-size">2</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1201,6 +1242,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1211,10 +1253,11 @@
                       <widget class="GtkImage" id="icon_stage2">
                         <property name="visible">True</property>
                         <property name="stock">gtk-missing-image</property>
-                        <property name="icon_size">2</property>
+                        <property name="icon-size">2</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1246,10 +1289,11 @@
                       <widget class="GtkImage" id="icon_stage3">
                         <property name="visible">True</property>
                         <property name="stock">gtk-missing-image</property>
-                        <property name="icon_size">2</property>
+                        <property name="icon-size">2</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1277,6 +1321,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">5</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1292,6 +1337,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">5</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1309,6 +1355,9 @@
                       </packing>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkProgressBar" id="createplanprogress">
@@ -1336,8 +1385,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <widget class="GtkTextView" id="createplantextview">
                         <property name="height_request">250</property>
@@ -1374,23 +1423,28 @@
           <widget class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="cancelcreateplan">
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_cancelcreateplan_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -1401,9 +1455,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About Glade</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="program_name">Package Manager</property>
     <property name="version">2009.06</property>
     <property name="copyright" translatable="yes">Copyright 2009 Sun Microsystems, Inc.  
@@ -1769,11 +1823,12 @@
           <widget class="GtkHButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -1786,9 +1841,9 @@
     <property name="title" translatable="yes">Processing</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
@@ -1813,6 +1868,7 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1834,23 +1890,28 @@
           <widget class="GtkHButtonBox" id="dialog-action_area17">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="progresscancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_cancel_progressdialog_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -1863,9 +1924,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Manage Boot Environments</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
     <signal name="delete_event" handler="on_beadmin_delete_event"/>
@@ -1889,6 +1950,7 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1895,8 +1957,8 @@
               <widget class="GtkScrolledWindow" id="scrolledwindow11">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
                 <child>
                   <widget class="GtkTreeView" id="betreeview">
                     <property name="visible">True</property>
@@ -1903,7 +1965,7 @@
                     <property name="can_focus">True</property>
                     <property name="enable_search">False</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name">Bes</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name">Bes</atkproperty>
                     </accessibility>
                   </widget>
                 </child>
@@ -1923,6 +1985,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1956,43 +2019,54 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area18">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="help_bebutton">
+                <property name="label" translatable="yes">gtk-help</property>
+                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
                 <signal name="clicked" handler="on_help_bebutton_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="cancelbebutton">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="response_id">-2</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-2</property>
                 <signal name="clicked" handler="on_cancel_be_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="okbebutton">
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="response_id">-3</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-3</property>
                 <signal name="clicked" handler="on_ok_be_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -1999,7 +2073,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -2011,9 +2086,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Manage Repositories</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
     <signal name="delete_event" handler="on_repository_delete_event"/>
@@ -2052,6 +2127,9 @@
                           </widget>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkLabel" id="label14">
@@ -2089,6 +2167,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="padding">3</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2097,7 +2176,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <accessibility>
-                              <atkproperty name="AtkObject::accessible_name">repositoryname</atkproperty>
+                              <atkproperty name="AtkObject::accessible-name">repositoryname</atkproperty>
                             </accessibility>
                             <signal name="changed" handler="on_repositoryname_changed"/>
                           </widget>
@@ -2130,6 +2209,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="padding">3</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2138,7 +2218,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <accessibility>
-                              <atkproperty name="AtkObject::accessible_name">repositoryurl</atkproperty>
+                              <atkproperty name="AtkObject::accessible-name">repositoryurl</atkproperty>
                             </accessibility>
                             <signal name="changed" handler="on_repositoryurl_changed"/>
                           </widget>
@@ -2153,14 +2233,18 @@
                             <property name="visible">True</property>
                             <child>
                               <widget class="GtkButton" id="repositoryadd">
+                                <property name="label" translatable="yes">_Add</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">_Add</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <signal name="clicked" handler="on_repositoryadd_clicked"/>
                               </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                           </widget>
                           <packing>
@@ -2181,6 +2265,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -2197,6 +2282,7 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -2252,14 +2338,14 @@
                           <widget class="GtkScrolledWindow" id="scrolledwindow15">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <widget class="GtkTreeView" id="repositorytreeview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <accessibility>
-                                  <atkproperty name="AtkObject::accessible_name">Repositories</atkproperty>
+                                  <atkproperty name="AtkObject::accessible-name">Repositories</atkproperty>
                                 </accessibility>
                                 <signal name="move_cursor" handler="on_repositorytreeview_move_cursor"/>
                                 <signal name="button_release_event" handler="on_repositorytreeview_button_release_event"/>
@@ -2268,6 +2354,9 @@
                           </widget>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <placeholder/>
@@ -2276,29 +2365,34 @@
                       <widget class="GtkVButtonBox" id="vbuttonbox1">
                         <property name="visible">True</property>
                         <property name="spacing">5</property>
-                        <property name="layout_style">GTK_BUTTONBOX_START</property>
+                        <property name="layout_style">start</property>
                         <child>
                           <widget class="GtkButton" id="repositorymodify">
+                            <property name="label" translatable="yes">_Modify...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="label" translatable="yes">_Modify...</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <signal name="clicked" handler="on_repositorymodify_clicked"/>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkButton" id="repositoryremove">
+                            <property name="label" translatable="yes">_Remove</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="label" translatable="yes">_Remove</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <signal name="clicked" handler="on_repositoryremove_clicked"/>
                           </widget>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2305,7 +2399,7 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="pack_type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2324,29 +2418,35 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area23">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
               <widget class="GtkButton" id="repositoryhelp">
+                <property name="label" translatable="yes">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_repositoryhelp_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="repositoryclose">
+                <property name="label" translatable="yes">gtk-close</property>
+                <property name="response_id">-1</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-1</property>
                 <signal name="clicked" handler="on_repositoryclose_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -2353,7 +2453,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -2366,9 +2467,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Boot Environment Confirmation</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="deletable">False</property>
     <property name="transient_for">beadmin</property>
     <property name="has_separator">False</property>
@@ -2397,11 +2498,12 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="stock">gtk-dialog-warning</property>
-                        <property name="icon_size">5</property>
+                        <property name="icon-size">5</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -2420,6 +2522,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -2427,8 +2530,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <widget class="GtkTextView" id="beconfirmtext">
                         <property name="visible">True</property>
@@ -2452,31 +2555,36 @@
           <widget class="GtkHButtonBox" id="dialog-action_area21">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="cancel_be">
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_cancel_be_conf_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ok_be">
+                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_ok_be_conf_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -2483,7 +2591,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -2494,9 +2603,9 @@
     <property name="title" translatable="yes">Modify Repository</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="transient_for">repository</property>
     <property name="has_separator">False</property>
     <signal name="delete_event" handler="on_repositorymodif_delete_event"/>
@@ -2523,6 +2632,9 @@
                     <property name="label" translatable="yes">&lt;b&gt;Modify Repository URL&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkHBox" id="hbox14">
@@ -2547,6 +2659,7 @@
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -2555,7 +2668,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <accessibility>
-                                  <atkproperty name="AtkObject::accessible_name">repositorymodifyname</atkproperty>
+                                  <atkproperty name="AtkObject::accessible-name">repositorymodifyname</atkproperty>
                                 </accessibility>
                               </widget>
                               <packing>
@@ -2565,6 +2678,9 @@
                               </packing>
                             </child>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkHBox" id="hbox27">
@@ -2582,6 +2698,7 @@
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -2590,7 +2707,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <accessibility>
-                                  <atkproperty name="AtkObject::accessible_name">repositorymodifyurl</atkproperty>
+                                  <atkproperty name="AtkObject::accessible-name">repositorymodifyurl</atkproperty>
                                 </accessibility>
                                 <signal name="changed" handler="on_repositorymodifyurl_changed"/>
                               </widget>
@@ -2620,6 +2737,7 @@
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -2639,6 +2757,9 @@
                           </packing>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                   </widget>
                   <packing>
@@ -2664,6 +2785,7 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -2674,14 +2796,13 @@
                         <property name="top_padding">3</property>
                         <child>
                           <widget class="GtkLinkButton" id="repositorymodifyregistrationlinkbutton">
+                            <property name="label" translatable="yes">_Instructions</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="label" translatable="yes">_Instructions</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="relief">none</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
                             <property name="uri">http://glade.gnome.org</property>
                             <signal name="clicked" handler="on_repositorymodifyregistrationlinkbutton_clicked"/>
                           </widget>
@@ -2723,6 +2844,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2745,6 +2867,7 @@
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -2765,6 +2888,7 @@
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -2776,10 +2900,13 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <accessibility>
-                                      <atkproperty name="AtkObject::accessible_name">modkeyentry</atkproperty>
+                                      <atkproperty name="AtkObject::accessible-name">modkeyentry</atkproperty>
                                     </accessibility>
                                     <signal name="changed" handler="on_modkeyentry_changed"/>
                                   </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkEntry" id="modcertentry">
@@ -2786,7 +2913,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <accessibility>
-                                      <atkproperty name="AtkObject::accessible_name">modcertentry</atkproperty>
+                                      <atkproperty name="AtkObject::accessible-name">modcertentry</atkproperty>
                                     </accessibility>
                                     <signal name="changed" handler="on_modcertentry_changed"/>
                                   </widget>
@@ -2806,27 +2933,26 @@
                                 <property name="spacing">5</property>
                                 <child>
                                   <widget class="GtkButton" id="modkeybrowse">
+                                    <property name="label" translatable="yes">_Browse</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">_Browse</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <signal name="clicked" handler="on_sslkeybrowse_clicked"/>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkButton" id="modcertbrowse">
+                                    <property name="label" translatable="yes">Br_owse</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">Br_owse</property>
                                     <property name="use_underline">True</property>
-                                    <property name="response_id">0</property>
                                     <signal name="clicked" handler="on_sslcertbrowse_clicked"/>
                                   </widget>
                                   <packing>
@@ -2886,6 +3012,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -2915,7 +3042,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <accessibility>
-                                      <atkproperty name="AtkObject::accessible_name">addmirror_entry</atkproperty>
+                                      <atkproperty name="AtkObject::accessible-name">addmirror_entry</atkproperty>
                                     </accessibility>
                                     <signal name="changed" handler="on_addmirror_entry_changed"/>
                                   </widget>
@@ -2924,13 +3051,16 @@
                                   </packing>
                                 </child>
                               </widget>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <widget class="GtkScrolledWindow" id="scrolledwindow8">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
                                 <child>
                                   <widget class="GtkTreeView" id="mirrortreeview">
                                     <property name="visible">True</property>
@@ -2955,27 +3085,26 @@
                             <property name="visible">True</property>
                             <child>
                               <widget class="GtkButton" id="addmirror_button">
+                                <property name="label" translatable="yes">_Add</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">_Add</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <signal name="clicked" handler="on_addmirror_button_clicked"/>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkButton" id="mirrorremove">
+                                <property name="label" translatable="yes">_Remove</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">_Remove</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <signal name="clicked" handler="on_mirrorremove_clicked"/>
                               </widget>
                               <packing>
@@ -3023,29 +3152,34 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area24">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="repositorymodifycancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_repositorymodifycancel_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="repositorymodifyok">
+                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_repositorymodifyok_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -3052,7 +3186,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -3064,9 +3198,9 @@
     <property name="title" translatable="yes">Update All</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
@@ -3095,6 +3229,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">5</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -3113,6 +3248,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -3120,7 +3256,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name">BEName</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name">BEName</atkproperty>
                     </accessibility>
                     <signal name="changed" handler="on_ua_be_name_entry_changed"/>
                   </widget>
@@ -3147,6 +3283,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -3177,38 +3314,45 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area15">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="ua_help_button">
+                <property name="label" translatable="yes">gtk-help</property>
+                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
                 <signal name="clicked" handler="on_ua_help_button_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ua_cancel_button">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="response_id">-2</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-2</property>
                 <signal name="clicked" handler="on_ua_cancel_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ua_proceed_button">
+                <property name="response_id">-3</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="response_id">-3</property>
                 <signal name="clicked" handler="on_ua_proceed_button_clicked"/>
                 <child>
                   <widget class="GtkHBox" id="hbox3">
@@ -3220,6 +3364,9 @@
                           <placeholder/>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkImage" id="image8">
@@ -3257,6 +3404,8 @@
                 </child>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -3263,7 +3412,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -3276,9 +3426,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Remove Confirmation</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="deletable">False</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
@@ -3311,10 +3461,11 @@
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="stock">gtk-dialog-warning</property>
-                            <property name="icon_size">5</property>
+                            <property name="icon-size">5</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -3341,6 +3492,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">5</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -3351,8 +3503,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <widget class="GtkTreeView" id="removetreeview">
                                 <property name="visible">True</property>
@@ -3364,6 +3516,9 @@
                               </widget>
                             </child>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                       </widget>
                       <packing>
@@ -3383,18 +3538,22 @@
           <widget class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="cancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_cancel_button_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="remove_proceed">
@@ -3402,7 +3561,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_proceed_button_clicked"/>
                 <child>
                   <widget class="GtkHBox" id="hbox19">
@@ -3414,6 +3572,9 @@
                           <placeholder/>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkImage" id="image6">
@@ -3451,6 +3612,8 @@
                 </child>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -3457,7 +3620,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -3467,9 +3631,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">SSL Key and Certificate</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="transient_for">repository</property>
     <property name="has_separator">False</property>
     <signal name="delete_event" handler="on_sslkeyandcertdialog_delete_event"/>
@@ -3492,6 +3656,9 @@
 Enter the location of these files in the spaces provided, or use the Browse 
 buttons to provide their location.</property>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkAlignment" id="alignment20">
@@ -3523,6 +3690,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">3</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -3531,7 +3699,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name">keyentry</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name">keyentry</atkproperty>
                     </accessibility>
                     <signal name="changed" handler="on_keyentry_changed"/>
                   </widget>
@@ -3543,14 +3711,13 @@
                 </child>
                 <child>
                   <widget class="GtkButton" id="keybrowse">
+                    <property name="label" translatable="yes">_Browse</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">_Browse</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name" translatable="yes">Browse for SSL Key</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name" translatable="yes">Browse for SSL Key</atkproperty>
                     </accessibility>
                     <signal name="clicked" handler="on_keybrowse_clicked"/>
                   </widget>
@@ -3583,6 +3750,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="padding">3</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -3591,7 +3759,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name">certentry</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name">certentry</atkproperty>
                     </accessibility>
                     <signal name="changed" handler="on_certentry_changed"/>
                   </widget>
@@ -3603,14 +3771,13 @@
                 </child>
                 <child>
                   <widget class="GtkButton" id="certbrowse">
+                    <property name="label" translatable="yes">B_rowse</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">B_rowse</property>
                     <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
                     <accessibility>
-                      <atkproperty name="AtkObject::accessible_name" translatable="yes">Browse for SSL Certificate</atkproperty>
+                      <atkproperty name="AtkObject::accessible-name" translatable="yes">Browse for SSL Certificate</atkproperty>
                     </accessibility>
                     <signal name="clicked" handler="on_certbrowse_clicked"/>
                   </widget>
@@ -3635,29 +3802,34 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area25">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="keyandcertcancel">
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_sslkeyandcertcancel_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="keyandcertok">
+                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_sslkeyandcertok_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -3664,7 +3836,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -3675,9 +3848,9 @@
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="icon">PM_app_48x.png</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="transient_for">repository</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -3703,6 +3876,9 @@
                     <property name="label" translatable="yes">&lt;b&gt;Startup&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkHBox" id="hbox7">
@@ -3718,6 +3894,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -3729,14 +3906,17 @@
                             <property name="visible">True</property>
                             <child>
                               <widget class="GtkCheckButton" id="startpage_checkbutton">
+                                <property name="label" translatable="yes">_Show Start Page on startup     </property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">_Show Start Page on startup     </property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="toggled" handler="on_startpage_checkbutton_toggled"/>
                               </widget>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <placeholder/>
@@ -3744,6 +3924,7 @@
                           </widget>
                           <packing>
                             <property name="padding">4</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -3789,29 +3970,34 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area14">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
               <widget class="GtkButton" id="preferenceshelp">
+                <property name="label" translatable="yes">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_preferenceshelp_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="preferencesclose">
+                <property name="label" translatable="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_preferencesclose_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -3818,7 +4004,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -3829,11 +4016,11 @@
     <property name="height_request">370</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Install/Update</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
-    <signal name="close" handler="on_webinstalldialog_close"/>
     <signal name="destroy_event" handler="on_webinstalldialog_close"/>
+    <signal name="close" handler="on_webinstalldialog_close"/>
     <signal name="delete_event" handler="on_webinstalldialog_close"/>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox16">
@@ -3862,7 +4049,7 @@
                         <property name="left_padding">4</property>
                         <property name="right_padding">4</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment2">
+                          <widget class="GtkAlignment" id="alignment1">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -3874,7 +4061,7 @@
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="pixbuf">PM_app_48x.png</property>
-                                <property name="icon_size">10</property>
+                                <property name="icon-size">10</property>
                               </widget>
                             </child>
                           </widget>
@@ -3883,6 +4070,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -3909,6 +4097,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                           </widget>
@@ -3915,6 +4104,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -3959,6 +4149,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -3965,8 +4156,8 @@
                   <widget class="GtkScrolledWindow" id="scrolledwindow4">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <widget class="GtkTextView" id="webinstall_textview">
                         <property name="visible">True</property>
@@ -4015,38 +4206,45 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area16">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="help_button">
+                <property name="label" translatable="yes">gtk-help</property>
+                <property name="response_id">-11</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
                 <signal name="clicked" handler="on_help_button_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="response_id">-2</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-2</property>
                 <signal name="clicked" handler="on_cancel_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="proceed_button">
+                <property name="response_id">-3</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="response_id">-3</property>
                 <signal name="clicked" handler="on_proceed_button_clicked"/>
                 <child>
                   <widget class="GtkHBox" id="hbox38">
@@ -4058,6 +4256,9 @@
                           <placeholder/>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkImage" id="image5">
@@ -4095,20 +4296,24 @@
                 </child>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="close_button">
+                <property name="label" translatable="yes">gtk-close</property>
+                <property name="response_id">-4</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">-4</property>
                 <signal name="clicked" handler="on_cancel_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -4115,7 +4320,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>
@@ -4124,9 +4330,9 @@
   <widget class="GtkWindow" id="api_search_error">
     <property name="width_request">450</property>
     <property name="height_request">300</property>
-    <property name="title" translatable="yes">Search Repositories Error</property>
+    <property name="title" translatable="yes">Search Publisher Errors</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="transient_for">mainwindow</property>
     <signal name="delete_event" handler="on_remote_search_error_delete_event"/>
     <child>
@@ -4145,10 +4351,11 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="yalign">1</property>
                 <property name="stock">gtk-dialog-warning</property>
-                <property name="icon_size">5</property>
+                <property name="icon-size">5</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -4161,7 +4368,7 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">Search failed on the following repositories:</property>
+                    <property name="label" translatable="yes">Search errors with the following publishers:</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
                   </widget>
@@ -4175,6 +4382,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="padding">5</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -4181,8 +4389,8 @@
           <widget class="GtkScrolledWindow" id="scrolledwindow6">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <widget class="GtkTextView" id="api_search_error_text">
                 <property name="visible">True</property>
@@ -4197,10 +4405,10 @@
         </child>
         <child>
           <widget class="GtkCheckButton" id="api_search_checkbox">
+            <property name="label" translatable="yes">Do not notify me about these publishers again.</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="label" translatable="yes">Do not notify me about these repositories again.</property>
-            <property name="response_id">0</property>
+            <property name="receives_default">False</property>
             <property name="draw_indicator">True</property>
             <signal name="toggled" handler="on_api_search_checkbox_toggled"/>
           </widget>
@@ -4212,17 +4420,21 @@
         <child>
           <widget class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <widget class="GtkButton" id="api_search_button">
+                <property name="label" translatable="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_api_search_button_clicked"/>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
           </widget>
           <packing>
@@ -4235,8 +4447,8 @@
   </widget>
   <widget class="GtkDialog" id="ua_completed_dialog">
     <property name="border_width">5</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
     <property name="transient_for">mainwindow</property>
     <property name="has_separator">False</property>
     <signal name="close" handler="on_ua_dialog_close"/>
@@ -4265,7 +4477,7 @@
                       <widget class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="stock">gtk-dialog-info</property>
-                        <property name="icon_size">6</property>
+                        <property name="icon-size">6</property>
                       </widget>
                     </child>
                   </widget>
@@ -4272,6 +4484,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -4296,6 +4509,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -4312,11 +4526,10 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
+                                <property name="relief">none</property>
                                 <property name="focus_on_click">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="response_id">0</property>
                                 <property name="uri">http://www.opensolaris.org</property>
                                 <signal name="clicked" handler="on_ua_completed_linkbutton_clicked"/>
                               </widget>
@@ -4348,21 +4561,22 @@
         <child internal-child="action_area">
           <widget class="GtkHButtonBox" id="dialog-action_area3">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <placeholder/>
             </child>
             <child>
               <widget class="GtkButton" id="ua_complete_close_button">
+                <property name="label" translatable="yes">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_ua_complete_close_button_clicked"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -4369,7 +4583,8 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </widget>