[smuxi: 19/26] Frontend-GNOME: upgrade to Glade 3.8



commit 5c7718b5e3788c4801ba5d0fcf1a2fe62fcda383
Author: Mirco Bauer <meebey meebey net>
Date:   Mon Oct 5 10:18:54 2015 +0200

    Frontend-GNOME: upgrade to Glade 3.8

 glade/smuxi-frontend-gnome.glade |  784 ++++++++++++++++++++++++++++----------
 1 files changed, 587 insertions(+), 197 deletions(-)
---
diff --git a/glade/smuxi-frontend-gnome.glade b/glade/smuxi-frontend-gnome.glade
index d7890f2..5701f89 100644
--- a/glade/smuxi-frontend-gnome.glade
+++ b/glade/smuxi-frontend-gnome.glade
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
-  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkDialog" id="PreferencesDialog">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Smuxi Preferences</property>
     <property name="default_width">700</property>
     <property name="default_height">600</property>
@@ -11,10 +12,73 @@
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="DialogActionArea">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <widget class="GtkButton" id="ApplyButton">
+                <property name="label">gtk-apply</property>
+                <property name="response_id">-10</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="OKButton">
+                <property name="label">gtk-ok</property>
+                <property name="response_id">-5</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="CancelButton">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <widget class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">10</property>
             <child>
               <widget class="GtkScrolledWindow" id="MenuScrolledWindow">
@@ -35,6 +99,7 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -46,75 +111,95 @@
                 <child>
                   <widget class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
                     <property name="spacing">10</property>
                     <child>
                       <widget class="GtkFrame" id="frame13">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <widget class="GtkAlignment" id="alignment11">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <widget class="GtkTable" id="table1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="n_rows">5</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">5</property>
                                 <property name="row_spacing">5</property>
                                 <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
                                   <widget class="GtkEntry" id="ConnectionNicknamesEntry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip" translatable="yes">The nickname to use. You can 
specify extra nicknames (separated by spaces) which will be used as fallbacks when the first choice is not 
available. By default $nick_ and $nick__ will be used as fallbacks.</property>
-                                    <property name="invisible_char">&#x2022;</property>
-                                    <signal name="changed" handler="_OnChanged"/>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkEntry" id="ConnectionUsernameEntry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x2022;</property>
-                                    <signal name="changed" handler="_OnChanged"/>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <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>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkEntry" id="ConnectionRealnameEntry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x2022;</property>
-                                    <signal name="changed" handler="_OnChanged"/>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkHBox" id="hbox13">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkLabel" id="label7">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Nickname(s):</property>
                                       </widget>
                                       <packing>
@@ -126,8 +211,11 @@
                                     <child>
                                       <widget class="GtkFixed" id="fixed31">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -140,9 +228,11 @@
                                 <child>
                                   <widget class="GtkHBox" id="hbox14">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkLabel" id="ConnectionUsernameLabel">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Username:</property>
                                       </widget>
                                       <packing>
@@ -154,8 +244,11 @@
                                     <child>
                                       <widget class="GtkFixed" id="fixed32">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -170,9 +263,11 @@
                                 <child>
                                   <widget class="GtkHBox" id="hbox15">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkLabel" id="label35">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Realname:</property>
                                       </widget>
                                       <packing>
@@ -184,8 +279,11 @@
                                     <child>
                                       <widget class="GtkFixed" id="fixed33">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -200,6 +298,7 @@
                                 <child>
                                   <widget class="GtkLabel" id="EncodingLabel">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Encoding:</property>
                                   </widget>
@@ -207,14 +306,15 @@
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkComboBox" id="EncodingComboBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="button_sensitivity">on</property>
-                                    <signal name="changed" handler="_OnChanged"/>
+                                    <signal name="changed" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -232,7 +332,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="_OnChanged"/>
+                                    <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -250,6 +350,7 @@
                         <child>
                           <widget class="GtkLabel" id="label6">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
@@ -260,21 +361,25 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkFrame" id="NetworkProxyFrame">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <widget class="GtkAlignment" id="alignment10">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <widget class="GtkTable" id="table8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">5</property>
@@ -282,6 +387,7 @@
                                 <child>
                                   <widget class="GtkLabel" id="label21">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Type:</property>
                                   </widget>
@@ -292,6 +398,7 @@
                                 <child>
                                   <widget class="GtkLabel" id="label22">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Host:</property>
                                   </widget>
@@ -304,8 +411,9 @@
                                 <child>
                                   <widget class="GtkComboBox" id="ProxyTypeComboBox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="button_sensitivity">on</property>
-                                    <signal name="changed" handler="_OnChanged"/>
+                                    <signal name="changed" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -315,6 +423,7 @@
                                 <child>
                                   <widget class="GtkLabel" id="label24">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Username:</property>
                                   </widget>
@@ -327,6 +436,7 @@
                                 <child>
                                   <widget class="GtkLabel" id="label31">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Password:</property>
                                   </widget>
@@ -339,25 +449,34 @@
                                 <child>
                                   <widget class="GtkHBox" id="hbox11">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <widget class="GtkEntry" id="ProxyHostEntry">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">&#x2022;</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <property name="invisible_char">•</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkHBox" id="hbox20">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="spacing">5</property>
                                         <child>
                                           <widget class="GtkLabel" id="label32">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Port:</property>
                                           </widget>
                                           <packing>
@@ -370,10 +489,14 @@
                                           <widget class="GtkSpinButton" id="ProxyPortSpinButton">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="invisible_char">&#x2022;</property>
+                                            <property name="invisible_char">•</property>
                                             <property name="width_chars">5</property>
-                                            <property name="adjustment">0 0 65535 1 10 10</property>
-                                            <signal name="changed" handler="_OnChanged"/>
+                                            <property name="primary_icon_activatable">False</property>
+                                            <property name="secondary_icon_activatable">False</property>
+                                            <property name="primary_icon_sensitive">True</property>
+                                            <property name="secondary_icon_sensitive">True</property>
+                                            <property name="adjustment">0 0 65535 1 10 0</property>
+                                            <signal name="changed" handler="_OnChanged" swapped="no"/>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
@@ -384,6 +507,7 @@
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -400,8 +524,12 @@
                                   <widget class="GtkEntry" id="ProxyUsernameEntry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x2022;</property>
-                                    <signal name="changed" handler="_OnChanged"/>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -413,15 +541,22 @@
                                 <child>
                                   <widget class="GtkHBox" id="hbox30">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <widget class="GtkEntry" id="ProxyPasswordEntry">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">&#x2022;</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <property name="invisible_char">•</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
@@ -432,7 +567,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
@@ -455,6 +590,7 @@
                         <child>
                           <widget class="GtkLabel" id="label20">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Network 
Proxy&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
@@ -465,34 +601,39 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkFrame" id="GlobalCommandsFrame">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <widget class="GtkAlignment" id="alignment12">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <widget class="GtkVBox" id="vbox2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="border_width">5</property>
-                                <property name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <widget class="GtkVBox" id="vbox3">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkHBox" id="hbox2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label37">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">On Connect 
Commands:</property>
                                           </widget>
                                           <packing>
@@ -504,8 +645,11 @@
                                         <child>
                                           <widget class="GtkFixed" id="fixed18">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -534,24 +678,30 @@
                                         </child>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </widget>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkVBox" id="vbox4">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkHBox" id="hbox3">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label43">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">On Startup 
Commands:</property>
                                           </widget>
                                           <packing>
@@ -563,8 +713,11 @@
                                         <child>
                                           <widget class="GtkFixed" id="fixed19">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -593,11 +746,15 @@
                                         </child>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </widget>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -608,6 +765,7 @@
                         <child>
                           <widget class="GtkLabel" id="label36">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt;Global 
Commands&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
@@ -617,6 +775,8 @@
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -625,6 +785,7 @@
                 <child>
                   <widget class="GtkLabel" id="label44">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">C_onnection</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">Notebook</property>
@@ -642,21 +803,24 @@
                     <child>
                       <widget class="GtkVBox" id="vbox10">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
-                        <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <widget class="GtkFrame" id="frame14">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment19">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkTable" id="table5">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">6</property>
                                     <property name="n_columns">2</property>
@@ -665,9 +829,11 @@
                                     <child>
                                       <widget class="GtkHBox" id="hbox7">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label33">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Timestamp 
Format:</property>
                                           </widget>
                                           <packing>
@@ -679,8 +845,11 @@
                                         <child>
                                           <widget class="GtkFixed" id="fixed25">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -693,9 +862,11 @@
                                     <child>
                                       <widget class="GtkHBox" id="hbox8">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label39">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Buffer 
Lines:</property>
                                           </widget>
                                           <packing>
@@ -707,8 +878,11 @@
                                         <child>
                                           <widget class="GtkFixed" id="fixed26">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -723,9 +897,11 @@
                                     <child>
                                       <widget class="GtkHBox" id="hbox9">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label40">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Engine Buffer 
Lines:</property>
                                           </widget>
                                           <packing>
@@ -737,8 +913,11 @@
                                         <child>
                                           <widget class="GtkFixed" id="fixed27">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -755,18 +934,22 @@
                                         <property name="width_request">60</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                        <property name="adjustment">200 1 9999 1 10 10</property>
+                                        <property name="invisible_char">●</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">200 1 9999 1 10 0</property>
                                         <property name="climb_rate">1</property>
                                         <property name="numeric">True</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <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>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -774,18 +957,22 @@
                                         <property name="width_request">60</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                        <property name="adjustment">200 0 9999 1 10 10</property>
+                                        <property name="invisible_char">●</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">200 0 9999 1 10 0</property>
                                         <property name="climb_rate">1</property>
                                         <property name="numeric">True</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -802,19 +989,24 @@ tt = AM/PM
 dd = day
 MM = month
 yy/yyyy = year</property>
-                                        <property name="invisible_char">&#x25CF;</property>
+                                        <property name="invisible_char">●</property>
                                         <property name="text">HH:mm</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkComboBox" id="PersistencyTypeComboBox">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -826,6 +1018,7 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkLabel" id="label58">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Persistency 
Type:</property>
                                       </widget>
@@ -837,6 +1030,7 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkLabel" id="label64">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Volatile Buffer 
Lines:</property>
                                       </widget>
@@ -848,6 +1042,7 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkLabel" id="label65">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Persistent Buffer 
Lines:</property>
                                       </widget>
@@ -861,8 +1056,12 @@ yy/yyyy = year</property>
                                         <property name="width_request">60</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                        <property name="adjustment">200 0 10000 100 1000 10</property>
+                                        <property name="invisible_char">●</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">200 0 10000 100 1000 0</property>
                                         <property name="climb_rate">1</property>
                                         <property name="numeric">True</property>
                                       </widget>
@@ -871,7 +1070,7 @@ yy/yyyy = year</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -879,8 +1078,12 @@ yy/yyyy = year</property>
                                         <property name="width_request">60</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                        <property name="adjustment">50000 0 1000000000 100 1000 10</property>
+                                        <property name="invisible_char">●</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">50000 0 1000000000 100 1000 0</property>
                                         <property name="climb_rate">1</property>
                                         <property name="numeric">True</property>
                                       </widget>
@@ -889,7 +1092,7 @@ yy/yyyy = year</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                   </widget>
@@ -899,6 +1102,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Message 
Buffer&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -916,35 +1120,40 @@ yy/yyyy = year</property>
                         <child>
                           <widget class="GtkFrame" id="frame15">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment28">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkVBox" id="vbox14">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkCheckButton" id="StripColorsCheckButton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment16">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox17">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image2">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-cut</property>
                                                   </widget>
                                                   <packing>
@@ -956,6 +1165,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label47">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Strip 
Colors</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -982,19 +1192,22 @@ yy/yyyy = year</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment15">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox16">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image1">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-cut</property>
                                                   </widget>
                                                   <packing>
@@ -1006,6 +1219,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label46">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Strip 
Formattings</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -1033,19 +1247,22 @@ yy/yyyy = year</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment26">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox28">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image12">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-cut</property>
                                                   </widget>
                                                   <packing>
@@ -1057,6 +1274,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label60">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Strip 
UTF-8</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -1084,26 +1302,33 @@ yy/yyyy = year</property>
                                         <property name="receives_default">False</property>
                                         <property name="xalign">1</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkHBox" id="hbox31">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="spacing">2</property>
                                             <child>
                                               <widget class="GtkImage" id="image5">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="stock">gtk-execute</property>
                                               </widget>
                                               <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <widget class="GtkLabel" id="label34">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">Show Advanced 
Settings</property>
                                               </widget>
                                               <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -1123,6 +1348,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label50">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">&lt;b&gt;Advanced&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -1142,6 +1368,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkLabel" id="label1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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">General</property>
                       </widget>
@@ -1153,40 +1380,45 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkVBox" id="vbox5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="border_width">5</property>
-                        <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <widget class="GtkFrame" id="frame1">
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment4">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkVBox" id="vbox6">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkRadioButton" id="TabPositionRadioButtonTop">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment22">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox23">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image8">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-goto-top</property>
                                                   </widget>
                                                   <packing>
@@ -1198,6 +1430,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label53">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Top</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -1225,19 +1458,22 @@ yy/yyyy = year</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">TabPositionRadioButtonTop</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment23">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox24">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image9">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-goto-bottom</property>
                                                   </widget>
                                                   <packing>
@@ -1249,6 +1485,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label54">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" 
translatable="yes">Bottom</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -1277,19 +1514,22 @@ yy/yyyy = year</property>
                                         <property name="active">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">TabPositionRadioButtonTop</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment24">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox25">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image10">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-goto-first</property>
                                                   </widget>
                                                   <packing>
@@ -1301,6 +1541,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label55">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Left</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -1328,19 +1569,22 @@ yy/yyyy = year</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">TabPositionRadioButtonTop</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment25">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xscale">0</property>
                                             <property name="yscale">0</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox26">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="spacing">2</property>
                                                 <child>
                                                   <widget class="GtkImage" id="image11">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="stock">gtk-goto-last</property>
                                                   </widget>
                                                   <packing>
@@ -1352,6 +1596,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label56">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="label" 
translatable="yes">Right</property>
                                                     <property name="use_underline">True</property>
                                                   </widget>
@@ -1381,7 +1626,7 @@ yy/yyyy = year</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">TabPositionRadioButtonTop</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1396,6 +1641,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt; Tabs Position 
&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -1406,20 +1652,24 @@ yy/yyyy = year</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkFrame" id="frame4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment8">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkTable" id="table3">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="n_rows">4</property>
                                     <property name="n_columns">2</property>
                                     <property name="column_spacing">5</property>
@@ -1429,7 +1679,7 @@ yy/yyyy = year</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <signal name="color_set" handler="_OnChanged"/>
+                                        <signal name="color_set" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -1437,7 +1687,7 @@ yy/yyyy = year</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1445,7 +1695,7 @@ yy/yyyy = year</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <signal name="color_set" handler="_OnChanged"/>
+                                        <signal name="color_set" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -1453,7 +1703,7 @@ yy/yyyy = year</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1461,18 +1711,19 @@ yy/yyyy = year</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <signal name="color_set" handler="_OnChanged"/>
+                                        <signal name="color_set" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkLabel" id="label59">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Highlight</property>
                                       </widget>
@@ -1480,12 +1731,13 @@ yy/yyyy = year</property>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkLabel" id="label17">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Activity</property>
                                       </widget>
@@ -1493,23 +1745,25 @@ yy/yyyy = year</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkLabel" id="label16">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">No Activity</property>
                                       </widget>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkLabel" id="label18">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Join/Part/Mode</property>
                                       </widget>
@@ -1517,7 +1771,7 @@ yy/yyyy = year</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1525,7 +1779,7 @@ yy/yyyy = year</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <signal name="color_set" handler="_OnChanged"/>
+                                        <signal name="color_set" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -1533,7 +1787,7 @@ yy/yyyy = year</property>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                   </widget>
@@ -1543,6 +1797,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label15">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt; Tab Colors 
&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -1553,6 +1808,7 @@ yy/yyyy = year</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1566,6 +1822,7 @@ yy/yyyy = year</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -1576,10 +1833,11 @@ yy/yyyy = year</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="_OnChanged"/>
+                            <signal name="toggled" handler="_OnChanged" swapped="no"/>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -1591,6 +1849,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkLabel" id="label2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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">Tree</property>
                       </widget>
@@ -1603,20 +1862,23 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkFrame" id="frame3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
                         <property name="label_xalign">0</property>
                         <child>
                           <widget class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">12</property>
                             <child>
                               <widget class="GtkVBox" id="vbox7">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <widget class="GtkTable" id="table4">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="border_width">5</property>
                                     <property name="n_rows">3</property>
                                     <property name="n_columns">2</property>
@@ -1625,9 +1887,11 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkHBox" id="hbox4">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label13">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Completion 
Character:</property>
                                           </widget>
                                           <packing>
@@ -1639,8 +1903,11 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkFixed" id="fixed22">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1653,9 +1920,11 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkHBox" id="hbox5">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label14">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Command 
Character:</property>
                                           </widget>
                                           <packing>
@@ -1667,8 +1936,11 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkFixed" id="fixed23">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1683,9 +1955,11 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkHBox" id="hbox6">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label42">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Command History 
Size:</property>
                                           </widget>
                                           <packing>
@@ -1697,8 +1971,11 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkFixed" id="fixed24">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1715,17 +1992,21 @@ yy/yyyy = year</property>
                                         <property name="width_request">60</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="adjustment">30 1 9999 1 10 10</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="adjustment">30 1 9999 1 10 0</property>
                                         <property name="climb_rate">1</property>
                                         <property name="numeric">True</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1735,14 +2016,18 @@ yy/yyyy = year</property>
                                         <property name="can_focus">True</property>
                                         <property name="max_length">1</property>
                                         <property name="text">/</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <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>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
@@ -1752,12 +2037,16 @@ yy/yyyy = year</property>
                                         <property name="can_focus">True</property>
                                         <property name="max_length">1</property>
                                         <property name="text">:</property>
-                                        <signal name="changed" handler="_OnChanged"/>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                   </widget>
@@ -1775,7 +2064,7 @@ yy/yyyy = year</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="_OnChanged"/>
+                                    <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1790,6 +2079,7 @@ yy/yyyy = year</property>
                         <child>
                           <widget class="GtkLabel" id="label12">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">&lt;b&gt; Entry Field 
&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
@@ -1805,6 +2095,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkLabel" id="label3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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">Input</property>
                       </widget>
@@ -1817,20 +2108,23 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkVBox" id="vbox8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="border_width">5</property>
-                        <property name="orientation">vertical</property>
                         <child>
                           <widget class="GtkFrame" id="frame2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkTable" id="table6">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="n_rows">4</property>
                                     <property name="n_columns">2</property>
                                     <property name="column_spacing">2</property>
@@ -1843,7 +2137,7 @@ yy/yyyy = year</property>
                                         <property name="receives_default">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="right_attach">2</property>
@@ -1853,15 +2147,17 @@ yy/yyyy = year</property>
                                       <widget class="GtkFrame" id="frame9">
                                         <property name="width_request">152</property>
                                         <property name="height_request">96</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0</property>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment13">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="left_padding">12</property>
                                             <child>
                                               <widget class="GtkVBox" id="vbox17">
                                                 <property name="visible">True</property>
-                                                <property name="orientation">vertical</property>
+                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <widget class="GtkRadioButton" 
id="UserListPositionRadioButtonLeft">
                                                     <property name="visible">True</property>
@@ -1869,19 +2165,22 @@ yy/yyyy = year</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="active">True</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                     <child>
                                                       <widget class="GtkAlignment" id="alignment17">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
                                                         <property name="xscale">0</property>
                                                         <property name="yscale">0</property>
                                                         <child>
                                                           <widget class="GtkHBox" id="hbox18">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="spacing">2</property>
                                                             <child>
                                                             <widget class="GtkImage" id="image3">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="stock">gtk-goto-first</property>
                                                             </widget>
                                                             <packing>
@@ -1893,6 +2192,7 @@ yy/yyyy = year</property>
                                                             <child>
                                                             <widget class="GtkLabel" id="label48">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="label" 
translatable="yes">Left</property>
                                                             <property name="use_underline">True</property>
                                                             </widget>
@@ -1920,19 +2220,22 @@ yy/yyyy = year</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property 
name="group">UserListPositionRadioButtonLeft</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                     <child>
                                                       <widget class="GtkAlignment" id="alignment18">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
                                                         <property name="xscale">0</property>
                                                         <property name="yscale">0</property>
                                                         <child>
                                                           <widget class="GtkHBox" id="hbox19">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="spacing">2</property>
                                                             <child>
                                                             <widget class="GtkImage" id="image4">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="stock">gtk-goto-last</property>
                                                             </widget>
                                                             <packing>
@@ -1944,6 +2247,7 @@ yy/yyyy = year</property>
                                                             <child>
                                                             <widget class="GtkLabel" id="label49">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="label" 
translatable="yes">Right</property>
                                                             <property name="use_underline">True</property>
                                                             </widget>
@@ -1973,7 +2277,7 @@ yy/yyyy = year</property>
                                                     <property name="use_underline">True</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property 
name="group">UserListPositionRadioButtonLeft</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -1988,6 +2292,7 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkLabel" id="label38">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt; Person List 
Position &lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </widget>
@@ -2004,14 +2309,17 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkFrame" id="frame6">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0</property>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment2">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="left_padding">12</property>
                                             <child>
                                               <widget class="GtkHBox" id="hbox12">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <widget class="GtkCheckButton" 
id="OverrideFontCheckButton">
                                                     <property name="label" 
translatable="yes">Override</property>
@@ -2019,9 +2327,11 @@ yy/yyyy = year</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
@@ -2031,9 +2341,11 @@ yy/yyyy = year</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
-                                                    <signal name="font_set" handler="_OnChanged"/>
+                                                    <signal name="font_set" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
                                                     <property name="position">1</property>
                                                   </packing>
                                                 </child>
@@ -2044,6 +2356,7 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkLabel" id="label27">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt; Font 
&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </widget>
@@ -2061,15 +2374,17 @@ yy/yyyy = year</property>
                                     </child>
                                     <child>
                                       <widget class="GtkFrame" id="frame10">
+                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0</property>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment14">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="left_padding">12</property>
                                             <child>
                                               <widget class="GtkVBox" id="vbox15">
                                                 <property name="visible">True</property>
-                                                <property name="orientation">vertical</property>
+                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <widget class="GtkRadioButton" 
id="TopicPositionRadioButtonTop">
                                                     <property name="visible">True</property>
@@ -2077,19 +2392,22 @@ yy/yyyy = year</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="active">True</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                     <child>
                                                       <widget class="GtkAlignment" id="alignment21">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
                                                         <property name="xscale">0</property>
                                                         <property name="yscale">0</property>
                                                         <child>
                                                           <widget class="GtkHBox" id="hbox22">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="spacing">2</property>
                                                             <child>
                                                             <widget class="GtkImage" id="image7">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="stock">gtk-goto-top</property>
                                                             </widget>
                                                             <packing>
@@ -2101,6 +2419,7 @@ yy/yyyy = year</property>
                                                             <child>
                                                             <widget class="GtkLabel" id="label52">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="label" 
translatable="yes">Top</property>
                                                             <property name="use_underline">True</property>
                                                             </widget>
@@ -2128,19 +2447,22 @@ yy/yyyy = year</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property 
name="group">TopicPositionRadioButtonTop</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                     <child>
                                                       <widget class="GtkAlignment" id="alignment20">
                                                         <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
                                                         <property name="xscale">0</property>
                                                         <property name="yscale">0</property>
                                                         <child>
                                                           <widget class="GtkHBox" id="hbox21">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="spacing">2</property>
                                                             <child>
                                                             <widget class="GtkImage" id="image6">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="stock">gtk-goto-bottom</property>
                                                             </widget>
                                                             <packing>
@@ -2152,6 +2474,7 @@ yy/yyyy = year</property>
                                                             <child>
                                                             <widget class="GtkLabel" id="label51">
                                                             <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
                                                             <property name="label" 
translatable="yes">Bottom</property>
                                                             <property name="use_underline">True</property>
                                                             </widget>
@@ -2181,7 +2504,7 @@ yy/yyyy = year</property>
                                                     <property name="use_underline">True</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property 
name="group">TopicPositionRadioButtonTop</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -2196,6 +2519,7 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkLabel" id="label41">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt; Topic 
Position &lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </widget>
@@ -2212,14 +2536,17 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkFrame" id="frame5">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0</property>
                                         <child>
                                           <widget class="GtkAlignment" id="alignment1">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="left_padding">12</property>
                                             <child>
                                               <widget class="GtkTable" id="table7">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="n_rows">2</property>
                                                 <property name="n_columns">3</property>
                                                 <property name="column_spacing">5</property>
@@ -2227,6 +2554,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label25">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" 
translatable="yes">Foreground</property>
                                                   </widget>
@@ -2239,6 +2567,7 @@ yy/yyyy = year</property>
                                                 <child>
                                                   <widget class="GtkLabel" id="label26">
                                                     <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" 
translatable="yes">Background</property>
                                                   </widget>
@@ -2257,7 +2586,7 @@ yy/yyyy = year</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
                                                     <property name="color">#000000000000</property>
-                                                    <signal name="color_set" handler="_OnChanged"/>
+                                                    <signal name="color_set" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
                                                     <property name="left_attach">2</property>
@@ -2272,7 +2601,7 @@ yy/yyyy = year</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
                                                     <property name="color">#000000000000</property>
-                                                    <signal name="color_set" handler="_OnChanged"/>
+                                                    <signal name="color_set" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
                                                     <property name="left_attach">2</property>
@@ -2289,7 +2618,7 @@ yy/yyyy = year</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
                                                     <property name="x_options">GTK_FILL</property>
@@ -2302,7 +2631,7 @@ yy/yyyy = year</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="_OnChanged"/>
+                                                    <signal name="toggled" handler="_OnChanged" 
swapped="no"/>
                                                   </widget>
                                                   <packing>
                                                     <property name="top_attach">1</property>
@@ -2317,6 +2646,7 @@ yy/yyyy = year</property>
                                         <child>
                                           <widget class="GtkLabel" id="label23">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt; Color 
&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </widget>
@@ -2335,25 +2665,30 @@ yy/yyyy = year</property>
                                     <child>
                                       <widget class="GtkHBox" id="hbox29">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="spacing">5</property>
                                         <child>
                                           <widget class="GtkLabel" id="label29">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes" comments="This is a 
setting for character based line wrapping vs word based when showing messages">_Wrap Mode:</property>
                                             <property name="use_underline">True</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
+                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <widget class="GtkComboBox" id="WrapModeComboBox">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -2371,6 +2706,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label10">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt; Chat 
&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -2381,29 +2717,33 @@ yy/yyyy = year</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkFrame" id="frame11">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment27">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkVBox" id="vbox11">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="border_width">5</property>
-                                    <property name="orientation">vertical</property>
                                     <child>
                                       <widget class="GtkVBox" id="vbox12">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkLabel" id="label62">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Highlight 
words:</property>
                                           </widget>
@@ -2428,11 +2768,15 @@ yy/yyyy = year</property>
                                             </child>
                                           </widget>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
@@ -2444,7 +2788,7 @@ yy/yyyy = year</property>
                                         <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="_OnChanged"/>
+                                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
@@ -2459,6 +2803,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label61">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt; Highlighting 
&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -2468,6 +2813,8 @@ yy/yyyy = year</property>
                             </child>
                           </widget>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2479,6 +2826,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkLabel" id="label4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</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">Output</property>
                       </widget>
@@ -2491,22 +2839,24 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkVBox" id="vbox9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
-                        <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <widget class="GtkFrame" id="frame7">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment3">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkVBox" id="vbox13">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <widget class="GtkCheckButton" id="NotificationAreaIconCheckButton">
                                         <property name="label" translatable="yes">Enable</property>
@@ -2517,13 +2867,14 @@ yy/yyyy = year</property>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkVBox" id="vbox19">
                                         <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <widget class="GtkRadioButton" 
id="NotificationAreaIconRadioButtonAlways">
                                             <property name="label" translatable="yes">Show always</property>
@@ -2535,6 +2886,7 @@ yy/yyyy = year</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
+                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
@@ -2549,6 +2901,7 @@ yy/yyyy = year</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -2563,11 +2916,14 @@ yy/yyyy = year</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
+                                            <property name="fill">True</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
                                       </widget>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -2578,6 +2934,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label30">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt; Notification Area Icon 
&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -2588,17 +2945,20 @@ yy/yyyy = year</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkFrame" id="frame8">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment6">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="MessagingMenuCheckButton">
@@ -2607,7 +2967,7 @@ yy/yyyy = year</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="_OnChanged"/>
+                                    <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                 </child>
                               </widget>
@@ -2615,6 +2975,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label11">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Messaging 
Menu&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -2625,17 +2986,20 @@ yy/yyyy = year</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkFrame" id="frame12">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
                               <widget class="GtkAlignment" id="alignment9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
                                 <child>
                                   <widget class="GtkCheckButton" id="NotificationPopupsCheckButton">
@@ -2644,7 +3008,7 @@ yy/yyyy = year</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="_OnChanged"/>
+                                    <signal name="toggled" handler="_OnChanged" swapped="no"/>
                                   </widget>
                                 </child>
                               </widget>
@@ -2652,6 +3016,7 @@ yy/yyyy = year</property>
                             <child>
                               <widget class="GtkLabel" id="label19">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Notification 
Popups&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
@@ -2674,6 +3039,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkLabel" id="label28">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Notification</property>
                       </widget>
                       <packing>
@@ -2690,6 +3056,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label45">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Interface</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">Notebook</property>
@@ -2703,6 +3070,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkHBox" id="hbox27">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">5</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow3">
@@ -2719,14 +3087,16 @@ yy/yyyy = year</property>
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkVButtonBox" id="vbuttonbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="border_width">5</property>
-                        <property name="orientation">vertical</property>
                         <property name="layout_style">start</property>
                         <child>
                           <widget class="GtkButton" id="ServersAddButton">
@@ -2776,6 +3146,7 @@ yy/yyyy = year</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2787,6 +3158,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label57">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Servers</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">Notebook</property>
@@ -2800,6 +3172,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkEventBox" id="FilterListEventBox">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">5</property>
                     <child>
                       <placeholder/>
@@ -2812,6 +3185,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label63">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Filters</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">Notebook</property>
@@ -2825,6 +3199,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkTable" id="table2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="border_width">5</property>
                     <property name="n_rows">3</property>
                     <property name="n_columns">2</property>
@@ -2837,7 +3212,7 @@ yy/yyyy = year</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="_OnChanged"/>
+                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                       </widget>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
@@ -2847,6 +3222,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkFixed" id="fixed1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
@@ -2858,6 +3234,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkFixed" id="fixed2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
@@ -2871,6 +3248,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkFixed" id="fixed3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
@@ -2888,7 +3266,7 @@ yy/yyyy = year</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="_OnChanged"/>
+                        <signal name="toggled" handler="_OnChanged" swapped="no"/>
                       </widget>
                       <packing>
                         <property name="top_attach">1</property>
@@ -2900,6 +3278,7 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkHBox" id="hbox10">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <widget class="GtkButton" id="LoggingOpenButton">
                             <property name="label">gtk-open</property>
@@ -2909,14 +3288,19 @@ yy/yyyy = year</property>
                             <property name="use_stock">True</property>
                           </widget>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkFixed" id="fixed4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                           </widget>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -2936,6 +3320,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Logging</property>
                     <property name="use_underline">True</property>
                   </widget>
@@ -2947,27 +3332,49 @@ yy/yyyy = year</property>
                 </child>
               </widget>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </widget>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="ServerDialog">
+    <property name="can_focus">False</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Smuxi - Server</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="icon_name">gtk-preferences</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="spacing">5</property>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="DialogActionArea">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
+            <property name="can_focus">False</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">end</property>
             <child>
-              <widget class="GtkButton" id="ApplyButton">
-                <property name="label">gtk-apply</property>
-                <property name="response_id">-10</property>
+              <widget class="GtkButton" id="CancelButton1">
+                <property name="label">gtk-cancel</property>
+                <property name="response_id">-6</property>
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</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="use_stock">True</property>
               </widget>
               <packing>
@@ -2977,13 +3384,13 @@ yy/yyyy = year</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="OKButton">
+              <widget class="GtkButton" id="OKButton1">
                 <property name="label">gtk-ok</property>
                 <property name="response_id">-5</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</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="use_stock">True</property>
               </widget>
               <packing>
@@ -2992,52 +3399,23 @@ yy/yyyy = year</property>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkButton" id="CancelButton">
-                <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="ServerDialog">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Smuxi - Server</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">gtk-preferences</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <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="spacing">5</property>
         <child>
           <widget class="GtkVBox" id="vbox16">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="orientation">vertical</property>
             <child>
               <widget class="GtkTable" id="table2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="n_rows">6</property>
                 <property name="n_columns">2</property>
@@ -3046,12 +3424,17 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkHButtonBox" id="hbuttonbox2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <widget class="GtkEntry" id="PasswordEntry">
                         <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="visibility">False</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="secondary_icon_activatable">False</property>
+                        <property name="primary_icon_sensitive">True</property>
+                        <property name="secondary_icon_sensitive">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -3099,6 +3482,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label22">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <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="label" translatable="yes">Password:</property>
@@ -3113,6 +3497,10 @@ yy/yyyy = year</property>
                     <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="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -3124,6 +3512,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label21">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <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="label" translatable="yes">Username:</property>
@@ -3136,7 +3525,17 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkComboBoxEntry" id="NetworkComboBoxEntry">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <child internal-child="entry">
+                      <widget class="GtkEntry" id="comboboxentry-entry2">
+                        <property name="can_focus">False</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="secondary_icon_activatable">False</property>
+                        <property name="primary_icon_sensitive">True</property>
+                        <property name="secondary_icon_sensitive">True</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -3148,29 +3547,40 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkHBox" id="hbox10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
                       <widget class="GtkEntry" id="HostnameEntry">
                         <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="primary_icon_activatable">False</property>
+                        <property name="secondary_icon_activatable">False</property>
+                        <property name="primary_icon_sensitive">True</property>
+                        <property name="secondary_icon_sensitive">True</property>
                       </widget>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkHBox" id="hbox11">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">5</property>
                         <child>
                           <widget class="GtkLabel" id="label20">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</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">Port:</property>
                           </widget>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -3179,15 +3589,23 @@ yy/yyyy = year</property>
                             <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="adjustment">0 0 65535 1 10 10</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                            <property name="adjustment">0 0 65535 1 10 0</property>
                             <property name="numeric">True</property>
                           </widget>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -3202,6 +3620,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <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="label" translatable="yes">Protocol:</property>
@@ -3213,6 +3632,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkComboBox" id="ProtocolComboBox">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                   </widget>
                   <packing>
@@ -3223,6 +3643,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label19">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <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="label" translatable="yes">Network:</property>
@@ -3236,6 +3657,7 @@ yy/yyyy = year</property>
                 <child>
                   <widget class="GtkLabel" id="label11">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <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="label" translatable="yes">Hostname:</property>
@@ -3249,19 +3671,22 @@ yy/yyyy = year</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <widget class="GtkVBox" id="vbox18">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <widget class="GtkHBox" id="hbox20">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <widget class="GtkLabel" id="label24">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">On Connect Commands:</property>
                       </widget>
                       <packing>
@@ -3273,9 +3698,12 @@ yy/yyyy = year</property>
                     <child>
                       <widget class="GtkFixed" id="fixed2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                       </widget>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -3305,64 +3733,26 @@ yy/yyyy = year</property>
                     </child>
                   </widget>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="padding">5</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </widget>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <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">end</property>
-            <child>
-              <widget class="GtkButton" id="CancelButton1">
-                <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</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="use_stock">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="OKButton1">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</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="use_stock">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </widget>
     </child>
   </widget>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]