diff --git a/plugins/cvs-plugin/anjuta-cvs-plugin.ui b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
index 58a9851..be48974 100644
--- a/plugins/cvs-plugin/anjuta-cvs-plugin.ui
+++ b/plugins/cvs-plugin/anjuta-cvs-plugin.ui
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">1</property>
     <property name="upper">10</property>
-    <property name="lower">0</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -24,6 +24,7 @@
   </object>
   <object class="GtkListStore" id="model2">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -45,7 +46,7 @@
         <property name="visible">True</property>
         <property name="border_width">10</property>
         <property name="label_xalign">0</property>
-        <property name="shadow_type">GTK_SHADOW_NONE</property>
+        <property name="shadow_type">none</property>
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
@@ -55,18 +56,6 @@
             <property name="column_spacing">10</property>
             <property name="row_spacing">10</property>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
@@ -74,7 +63,7 @@
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
-                <property name="y_options"/>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
@@ -84,7 +73,7 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options"/>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
@@ -102,14 +91,15 @@
                   </object>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"/>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="preferences_toggle:bool:1:0:cvs.ignorerc">
+                    <property name="label" translatable="yes">Ignore .cvsrc file (recommended)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Ignore .cvsrc file (recommended)</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -118,7 +108,7 @@
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"/>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
@@ -133,7 +123,7 @@
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"/>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
               </object>
@@ -144,6 +134,18 @@
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
         </child>
         <child type="label">
@@ -159,7 +161,7 @@
   <object class="GtkDialog" id="cvs_add">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Add file/directory</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -179,6 +181,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -186,10 +189,10 @@
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_add_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -216,9 +219,10 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="cvs_binary">
+                <property name="label" translatable="yes">File is binary</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">File is binary</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -236,32 +240,42 @@
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton1">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="okbutton1">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -274,7 +288,7 @@
   <object class="GtkDialog" id="cvs_remove">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Remove file/directory</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
@@ -294,6 +308,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -301,10 +316,10 @@
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_remove_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -352,32 +367,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button3">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button2">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -392,7 +417,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
     <property name="title" translatable="yes">CVS: Commit file/directory</property>
     <property name="default_width">500</property>
     <property name="default_height">300</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
@@ -412,6 +437,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -419,10 +445,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_commit_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -449,9 +475,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
             </child>
             <child>
               <object class="GtkCheckButton" id="cvs_commit_project">
+                <property name="label" translatable="yes">Whole project</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Whole project</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -478,15 +505,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <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="shadow_type">GTK_SHADOW_IN</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkTextView" id="cvs_commit_log">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="pixels_above_lines">6</property>
-                    <property name="wrap_mode">GTK_WRAP_WORD</property>
+                    <property name="wrap_mode">word</property>
                   </object>
                 </child>
               </object>
@@ -501,7 +528,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="label_yalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
@@ -523,25 +550,29 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="cvs_commit_revision">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">*</property>
                               </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_commit_norecurse">
+                            <property name="label" translatable="yes">Do not act recursively</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Do not act recursively</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -575,32 +606,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button4">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button5">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -614,7 +655,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Update file/directory</property>
     <property name="default_width">400</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox8">
         <property name="visible">True</property>
@@ -634,6 +675,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -641,10 +683,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_update_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -671,9 +713,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
             </child>
             <child>
               <object class="GtkCheckButton" id="cvs_update_project">
+                <property name="label" translatable="yes">Whole project</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Whole project</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -687,7 +730,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <object class="GtkFrame" id="frame3">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
@@ -697,9 +740,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkCheckButton" id="cvs_removedir">
+                            <property name="label" translatable="yes">Delete empty directories</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Delete empty directories</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -707,13 +751,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_createdir">
+                            <property name="label" translatable="yes">Create new directories</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Create new directories</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -726,9 +772,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_removesticky">
+                            <property name="label" translatable="yes">Reset sticky tags</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Reset sticky tags</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -740,9 +787,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_update_norecurse">
+                            <property name="label" translatable="yes">Do not act recursively</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Do not act recursively</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -764,13 +812,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="cvs_update_revision">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">*</property>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -805,32 +853,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="hbuttonbox3">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button6">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button7">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -849,9 +907,9 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
       <object class="GtkScrolledWindow" id="scrolledwindow2">
         <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="shadow_type">GTK_SHADOW_IN</property>
+        <property name="hscrollbar_policy">automatic</property>
+        <property name="vscrollbar_policy">automatic</property>
+        <property name="shadow_type">in</property>
         <child>
           <object class="GtkTextView" id="cvs_status_text">
             <property name="visible">True</property>
@@ -865,7 +923,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
   <object class="GtkDialog" id="cvs_status">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Status from file/directory</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox11">
         <property name="visible">True</property>
@@ -885,6 +943,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -892,10 +951,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_status_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -922,9 +981,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
             </child>
             <child>
               <object class="GtkCheckButton" id="cvs_status_project">
+                <property name="label" translatable="yes">Whole project</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Whole project</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -938,7 +998,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <object class="GtkFrame" id="frame4">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
@@ -948,22 +1008,25 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkCheckButton" id="cvs_status_verbose">
+                            <property name="label" translatable="yes">Be verbose</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Be verbose</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_status_norecurse">
+                            <property name="label" translatable="yes">Do not act recursively</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Do not act recursively</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -997,32 +1060,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="hbuttonbox4">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button8">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button9">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -1035,7 +1108,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
   <object class="GtkDialog" id="cvs_diff">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Diff file/directory</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox14">
         <property name="visible">True</property>
@@ -1055,6 +1128,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1062,10 +1136,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_diff_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -1092,9 +1166,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
             </child>
             <child>
               <object class="GtkCheckButton" id="cvs_diff_project">
+                <property name="label" translatable="yes">Whole project</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Whole project</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -1108,7 +1183,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <object class="GtkFrame" id="frame5">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment5">
                     <property name="visible">True</property>
@@ -1131,14 +1206,16 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_unified">
+                            <property name="label" translatable="yes">Unified format instead of context format</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Unified format instead of context format</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1160,13 +1237,13 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="cvs_diff_revision">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">*</property>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -1181,9 +1258,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_diff_norecurse">
+                            <property name="label" translatable="yes">Do not act recursively</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Do not act recursively</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1217,32 +1295,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="hbuttonbox5">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button10">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="button11">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -1256,7 +1344,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Log file/directory</property>
     <property name="default_width">400</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
@@ -1275,6 +1363,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1282,10 +1371,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEntry" id="cvs_logdialog_filename">
+                    <property name="width_request">260</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
-                    <property name="width_request">260</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -1312,9 +1401,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
             </child>
             <child>
               <object class="GtkCheckButton" id="cvs_logdialog_project">
+                <property name="label" translatable="yes">Whole project</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Whole project</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -1328,7 +1418,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
               <object class="GtkFrame" id="frame6">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment6">
                     <property name="visible">True</property>
@@ -1338,9 +1428,10 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkCheckButton" id="cvs_logdialog_verbose">
+                            <property name="label" translatable="yes">Be verbose</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Be verbose</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
@@ -1348,13 +1439,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="cvs_logdialog_norecurse">
+                            <property name="label" translatable="yes">Do not act recursively</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Do not act recursively</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1388,32 +1481,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton2">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="okbutton2">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
@@ -1426,7 +1529,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
   <object class="GtkDialog" id="cvs_import">
     <property name="border_width">10</property>
     <property name="title" translatable="yes">CVS: Import</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -1435,7 +1538,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
           <object class="GtkFrame" id="frame8">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <property name="shadow_type">none</property>
             <child>
               <object class="GtkAlignment" id="alignment8">
                 <property name="visible">True</property>
@@ -1457,7 +1560,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -1471,7 +1574,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -1485,7 +1588,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -1498,7 +1601,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -1511,7 +1614,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -1525,7 +1628,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                         <property name="top_attach">5</property>
                         <property name="bottom_attach">6</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -1544,14 +1647,14 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                       <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <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="shadow_type">GTK_SHADOW_IN</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTextView" id="cvs_import_log">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
+                            <property name="wrap_mode">word</property>
                           </object>
                         </child>
                       </object>
@@ -1566,7 +1669,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                       <object class="GtkEntry" id="cvs_module">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1581,7 +1683,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                       <object class="GtkEntry" id="cvs_cvsroot">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -1596,7 +1697,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                       <object class="GtkEntry" id="cvs_vendor">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
                         <property name="text">none</property>
                       </object>
                       <packing>
@@ -1612,7 +1712,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                       <object class="GtkEntry" id="cvs_release">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="invisible_char">*</property>
                         <property name="text">start</property>
                       </object>
                       <packing>
@@ -1644,7 +1743,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
           <object class="GtkFrame" id="frame7">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <property name="shadow_type">none</property>
             <child>
               <object class="GtkAlignment" id="alignment7">
                 <property name="visible">True</property>
@@ -1657,8 +1756,6 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                     <child>
                       <object class="GtkTable" id="table8">
                         <property name="visible">True</property>
-                        <property name="n_rows">1</property>
-                        <property name="n_columns">1</property>
                         <child>
                           <object class="GtkComboBox" id="cvs_server_type">
                             <property name="visible">True</property>
@@ -1671,14 +1768,15 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                             </child>
                           </object>
                           <packing>
-                            <property name="x_options"/>
-                            <property name="y_options"/>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1698,7 +1796,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -1709,7 +1807,7 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                           </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
@@ -1717,26 +1815,24 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="visibility">False</property>
-                            <property name="invisible_char">*</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="cvs_username">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">*</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"/>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
@@ -1763,32 +1859,42 @@ Pressing OK will delete the file from disk and from CVS. Of course the file won'
         <child internal-child="action_area">
           <object 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>
               <object class="GtkButton" id="cancelbutton3">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-cancel</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="okbutton3">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property name="label">gtk-ok</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <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>
       </object>
