remove bonobo menus and cruft add ok/cancel buttons.

2004-06-04  Larry Ewing  <lewing@ximian.com>

	* gui/contact-list-editor/e-contact-list-editor.c: remove bonobo
	menus and cruft add ok/cancel buttons.

	* gui/contact-list-editor/e-contact-list-editor.h: add buttons for
	ok/cancel.

	* gui/contact-list-editor/contact-list-editor.glade: add fields for
	ok/cancel reparent to GtkDialog, other minor adjustments.

svn path=/trunk/; revision=26224

1 files changed, 50 insertions, 15 deletions

diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
index a1deb05bf3..5f0b8bfaf5 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.glade
@@ -2,24 +2,59 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
-<requires lib="gnome"/>
-<requires lib="bonobo"/>
 
-<widget class="GnomeApp" id="contact list editor">
-  <property name="title" translatable="yes">contact-list-editor</property>
+<widget class="GtkDialog" id="contact list editor">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">dialog1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="default_width">426</property>
-  <property name="default_height">304</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="enable_layout_config">True</property>
+  <property name="has_separator">True</property>
 
-  <child internal-child="dock">
-    <widget class="BonoboDock" id="dock1">
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
-      <property name="allow_floating">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancel-button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="ok-button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
 
       <child>
 	<widget class="GtkVBox" id="vbox8">
@@ -363,13 +398,13 @@
 	    </packing>
 	  </child>
 	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
       </child>
     </widget>
-    <packing>
-      <property name="padding">0</property>
-      <property name="expand">True</property>
-      <property name="fill">True</property>
-    </packing>
   </child>
 </widget>