cleaned up mail-config.glade to remove the notebook tab for the accounts_tab

svn path=/trunk/; revision=17373

1 files changed, 100 insertions, 257 deletions

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index acc414b65e..2084e9d2d4 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2497,310 +2497,153 @@ Kerberos
   <auto_shrink>False</auto_shrink>
 
   <widget>
-    <class>GtkNotebook</class>
-    <name>toplevel_notebook</name>
-    <can_focus>True</can_focus>
-    <show_tabs>True</show_tabs>
-    <show_border>True</show_border>
-    <tab_pos>GTK_POS_TOP</tab_pos>
-    <scrollable>False</scrollable>
-    <tab_hborder>2</tab_hborder>
-    <tab_vborder>2</tab_vborder>
-    <popup_enable>False</popup_enable>
+    <class>GtkHBox</class>
+    <name>toplevel</name>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+
+    <widget>
+      <class>Custom</class>
+      <name>etableMailAccounts</name>
+      <creation_function>mail_accounts_etable_new</creation_function>
+      <int1>0</int1>
+      <int2>0</int2>
+      <last_modification_time>Thu, 28 Mar 2002 21:15:54 GMT</last_modification_time>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
+    </widget>
 
     <widget>
-      <class>GtkHBox</class>
-      <name>toplevel</name>
+      <class>GtkVBox</class>
+      <name>vboxMailFunctions</name>
       <homogeneous>False</homogeneous>
       <spacing>0</spacing>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>True</fill>
+      </child>
 
       <widget>
-	<class>Custom</class>
-	<name>etableMailAccounts</name>
-	<creation_function>mail_accounts_etable_new</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Thu, 28 Mar 2002 21:15:54 GMT</last_modification_time>
+	<class>GtkLabel</class>
+	<name>lblMailSpacer</name>
+	<label>
+</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
 	<child>
 	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
+	  <expand>False</expand>
+	  <fill>False</fill>
 	</child>
       </widget>
 
       <widget>
-	<class>GtkVBox</class>
-	<name>vboxMailFunctions</name>
-	<homogeneous>False</homogeneous>
+	<class>GtkVButtonBox</class>
+	<name>vbuttonboxMailAccounts</name>
+	<layout_style>GTK_BUTTONBOX_START</layout_style>
 	<spacing>0</spacing>
+	<child_min_width>85</child_min_width>
+	<child_min_height>27</child_min_height>
+	<child_ipad_x>7</child_ipad_x>
+	<child_ipad_y>0</child_ipad_y>
 	<child>
 	  <padding>0</padding>
 	  <expand>False</expand>
-	  <fill>True</fill>
+	  <fill>False</fill>
 	</child>
 
 	<widget>
-	  <class>GtkLabel</class>
-	  <name>lblMailSpacer</name>
-	  <label>
-</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonboxMailAccounts</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdAccountAdd</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdAccountEdit</name>
-	    <sensitive>False</sensitive>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Edit</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdAccountDelete</name>
-	    <sensitive>False</sensitive>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Delete</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	  <class>GtkButton</class>
+	  <name>cmdAccountAdd</name>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>_Add</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
 	<widget>
-	  <class>GtkLabel</class>
-	  <name>label421</name>
-	  <label>
-</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
+	  <class>GtkButton</class>
+	  <name>cmdAccountEdit</name>
+	  <sensitive>False</sensitive>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>_Edit</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
 	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonboxMailExtras</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdAccountDefault</name>
-	    <sensitive>False</sensitive>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>De_fault</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdAccountAble</name>
-	    <sensitive>False</sensitive>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>E_nable</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	  <class>GtkButton</class>
+	  <name>cmdAccountDelete</name>
+	  <sensitive>False</sensitive>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>_Delete</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
       </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>lblMailAccounts</name>
-      <label>Mail Accounts</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hboxNews</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
 
       <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledNewsServers</name>
-	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+	<class>GtkLabel</class>
+	<name>label421</name>
+	<label>
+</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
 	<child>
 	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
+	  <expand>False</expand>
+	  <fill>False</fill>
 	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clistNews</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>lblNewsServers</name>
-	    <label>News Servers</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
       </widget>
 
       <widget>
-	<class>GtkVBox</class>
-	<name>vboxNewsFunctions</name>
-	<homogeneous>False</homogeneous>
+	<class>GtkVButtonBox</class>
+	<name>vbuttonboxMailExtras</name>
+	<layout_style>GTK_BUTTONBOX_START</layout_style>
 	<spacing>0</spacing>
+	<child_min_width>85</child_min_width>
+	<child_min_height>27</child_min_height>
+	<child_ipad_x>7</child_ipad_x>
+	<child_ipad_y>0</child_ipad_y>
 	<child>
 	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
+	  <expand>True</expand>
+	  <fill>True</fill>
 	</child>
 
 	<widget>
-	  <class>GtkLabel</class>
-	  <name>labelNewsSpacer</name>
-	  <label>
-</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
+	  <class>GtkButton</class>
+	  <name>cmdAccountDefault</name>
+	  <sensitive>False</sensitive>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>De_fault</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
 	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonboxNewsServers</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsAdd</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsEdit</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Edit</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdNewsDelete</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Delete</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
+	  <class>GtkButton</class>
+	  <name>cmdAccountAble</name>
+	  <sensitive>False</sensitive>
+	  <can_default>True</can_default>
+	  <can_focus>True</can_focus>
+	  <label>E_nable</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
       </widget>
     </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <child_name>Notebook:tab</child_name>
-      <name>lblNewsServers</name>
-      <label>News Servers</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-    </widget>
   </widget>
 </widget>