Index: gok.glade2
===================================================================
RCS file: /cvs/gnome/gok/gok.glade2,v
retrieving revision 1.8
diff -u -r1.8 gok.glade2
--- gok.glade2	13 May 2003 15:56:04 -0000	1.8
+++ gok.glade2	27 May 2003 14:43:34 -0000
@@ -558,7 +558,7 @@
 			<widget class="GtkHButtonBox" id="hbuttonbox5">
 			  <property name="visible">True</property>
 			  <property name="layout_style">GTK_BUTTONBOX_END</property>
-			  <property name="spacing">0</property>
+			  <property name="spacing">6</property>
 
 			  <child>
 			    <widget class="GtkButton" id="buttonAddAction">
@@ -825,8 +825,8 @@
 		      <property name="xpad">12</property>
 		      <property name="ypad">0</property>
 		      <accessibility>
-			<atkrelation target="radiobuttonTypeSwitch" type="label-for"/>
 			<atkrelation target="radiobuttonTypeValuator" type="label-for"/>
+			<atkrelation target="radiobuttonTypeSwitch" type="label-for"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1943,7 +1943,7 @@
 			<widget class="GtkHButtonBox" id="hbuttonbox4">
 			  <property name="visible">True</property>
 			  <property name="layout_style">GTK_BUTTONBOX_END</property>
-			  <property name="spacing">0</property>
+			  <property name="spacing">6</property>
 
 			  <child>
 			    <widget class="GtkButton" id="buttonAddFeedback">
@@ -2939,7 +2939,7 @@
 	<widget class="GtkHButtonBox" id="hboxStockButtons">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">6</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
Index: gok/interface.c
===================================================================
RCS file: /cvs/gnome/gok/gok/interface.c,v
retrieving revision 1.32
diff -u -r1.32 interface.c
--- gok/interface.c	13 May 2003 15:56:05 -0000	1.32
+++ gok/interface.c	27 May 2003 14:43:35 -0000
@@ -439,6 +439,7 @@
   gtk_widget_show (hbuttonbox5);
   gtk_box_pack_start (GTK_BOX (vbox30), hbuttonbox5, FALSE, FALSE, 0);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox5), GTK_BUTTONBOX_END);
+  gtk_box_set_spacing (GTK_BOX (hbuttonbox5), 6);
 
   buttonAddAction = gtk_button_new ();
   gtk_widget_show (buttonAddAction);
@@ -892,6 +893,7 @@
   gtk_widget_show (hbuttonbox4);
   gtk_box_pack_start (GTK_BOX (vbox37), hbuttonbox4, TRUE, TRUE, 0);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox4), GTK_BUTTONBOX_END);
+  gtk_box_set_spacing (GTK_BOX (hbuttonbox4), 6);
 
   buttonAddFeedback = gtk_button_new ();
   gtk_widget_show (buttonAddFeedback);
@@ -1196,6 +1198,7 @@
   gtk_widget_show (hboxStockButtons);
   gtk_box_pack_start (GTK_BOX (vboxSettings), hboxStockButtons, TRUE, TRUE, 0);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hboxStockButtons), GTK_BUTTONBOX_END);
+  gtk_box_set_spacing (GTK_BOX (hboxStockButtons), 6);
 
   g_signal_connect ((gpointer) dialogSettings, "delete_event",
                     G_CALLBACK (on_dialogSettings_delete_event),
@@ -1348,8 +1351,8 @@
 
   atko = gtk_widget_get_accessible (labelActionType);
   tmp_relation_set = atk_object_ref_relation_set (atko);
-  labelActionType_relation_targets[0] = gtk_widget_get_accessible (radiobuttonTypeSwitch);
-  labelActionType_relation_targets[1] = gtk_widget_get_accessible (radiobuttonTypeValuator);
+  labelActionType_relation_targets[0] = gtk_widget_get_accessible (radiobuttonTypeValuator);
+  labelActionType_relation_targets[1] = gtk_widget_get_accessible (radiobuttonTypeSwitch);
   tmp_relationship = atk_relation_type_for_name ("label-for");
   tmp_relation = atk_relation_new (labelActionType_relation_targets, 2, tmp_relationship);
   atk_relation_set_add (tmp_relation_set, tmp_relation);
@@ -1613,7 +1616,6 @@
 static GnomeUIInfo menubar1_uiinfo[] =
 {
   GNOMEUIINFO_MENU_FILE_TREE (file1_menu_uiinfo),
-  GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_HELP_TREE (help1_menu_uiinfo),
   GNOMEUIINFO_END
 };
@@ -2571,8 +2573,7 @@
   GLADE_HOOKUP_OBJECT (windowEditor, file1_menu_uiinfo[3].widget, "save_as1");
   GLADE_HOOKUP_OBJECT (windowEditor, file1_menu_uiinfo[4].widget, "separator1");
   GLADE_HOOKUP_OBJECT (windowEditor, file1_menu_uiinfo[5].widget, "quit1");
-  GLADE_HOOKUP_OBJECT (windowEditor, menubar1_uiinfo[1].widget, "separator3");
-  GLADE_HOOKUP_OBJECT (windowEditor, menubar1_uiinfo[2].widget, "help1");
+  GLADE_HOOKUP_OBJECT (windowEditor, menubar1_uiinfo[1].widget, "help1");
   GLADE_HOOKUP_OBJECT (windowEditor, help1_menu_uiinfo[0].widget, "about1");
   GLADE_HOOKUP_OBJECT (windowEditor, vbox15, "vbox15");
   GLADE_HOOKUP_OBJECT (windowEditor, frame13, "frame13");
