From f699f9902b5e374070e8dd2c0fe43028f8dfb89f Mon Sep 17 00:00:00 2001
From: Christopher James Lahey <clahey@ximian.com>
Date: Tue, 5 Jun 2001 23:49:59 +0000
Subject: Copy dates as they come in.

2001-06-05  Christopher James Lahey  <clahey@ximian.com>

	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come
	in.

	* backend/pas/pas-backend-file.c
	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,
	pas_backend_file_process_remove_card,
	pas_backend_file_process_modify_card,
	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,
	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using
	them.
	(pas_backend_file_build_all_cards_list): Reindented.

	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits
	with a custom widget that creates an EDateEdit.

	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead
	of a GnomeDateEdit.

svn path=/trunk/; revision=10125
---
 addressbook/backend/ebook/e-card.c                 |  14 +-
 addressbook/backend/pas/pas-backend-file.c         |  62 ++--
 addressbook/contact-editor/contact-editor.glade    | 387 +++++++--------------
 addressbook/contact-editor/e-contact-editor.c      | 121 ++++---
 .../gui/contact-editor/contact-editor.glade        | 387 +++++++--------------
 addressbook/gui/contact-editor/e-contact-editor.c  | 121 ++++---
 6 files changed, 462 insertions(+), 630 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 55b91e26d7..59fa211d39 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -1688,7 +1688,12 @@ e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		break;
 	case ARG_BIRTH_DATE:
 		g_free(card->bday);
-		card->bday = GTK_VALUE_POINTER(*arg);
+		if (GTK_VALUE_POINTER (*arg)) {
+			card->bday = g_new (ECardDate, 1);
+			memcpy (card->bday, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
+		} else {
+			card->bday = NULL;
+		}
 		break;
 	case ARG_URL:
 		g_free(card->url);
@@ -1732,7 +1737,12 @@ e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
 		break;
 	case ARG_ANNIVERSARY:
 		g_free(card->anniversary);
-		card->anniversary = GTK_VALUE_POINTER(*arg);
+		if (GTK_VALUE_POINTER (*arg)) {
+			card->anniversary = g_new (ECardDate, 1);
+			memcpy (card->anniversary, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
+		} else {
+			card->anniversary = NULL;
+		}
 		break;
 	case ARG_MAILER:
 		g_free(card->mailer);
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 0c0cd5c7db..222f72b74b 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -597,6 +597,7 @@ pas_backend_file_changes_foreach_key (const char *key, gpointer user_data)
 	int     db_error = 0;
 	
 	string_to_dbt (key, &id_dbt);
+	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
 	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
 	
 	if (db_error == 1) {
@@ -621,6 +622,9 @@ pas_backend_file_changes (PASBackendFile  	      *bf,
 	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
 	PASBackendFileChangeContext *ctx = cnstview->change_context;
 
+	memset (&id_dbt, 0, sizeof (id_dbt));
+	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
+
 	if (!bf->priv->loaded)
 		return;
 
@@ -805,6 +809,7 @@ pas_backend_file_process_remove_card (PASBackend *backend,
 	char          *vcard_string;
 
 	string_to_dbt (req->id, &id_dbt);
+	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
 
 	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
 	if (0 != db_error) {
@@ -865,6 +870,7 @@ pas_backend_file_process_modify_card (PASBackend *backend,
 	id = e_card_get_id(card);
 
 	string_to_dbt (id, &id_dbt);	
+	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
 
 	/* get the old ecard - the one that's presently in the db */
 	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
@@ -929,43 +935,45 @@ static void
 pas_backend_file_build_all_cards_list(PASBackend *backend,
 				      PASBackendFileCursorPrivate *cursor_data)
 {
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  DBC            *dbc;
-	  int            db_error;
-	  DBT  id_dbt, vcard_dbt;
+	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
+	DB             *db = bf->priv->file_db;
+	DBC            *dbc;
+	int            db_error;
+	DBT  id_dbt, vcard_dbt;
   
-	  cursor_data->elements = NULL;
+	cursor_data->elements = NULL;
 
-	  db_error = db->cursor (db, NULL, &dbc, 0);
+	db_error = db->cursor (db, NULL, &dbc, 0);
 
-	  if (db_error != 0) {
-		  g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	  }
+	if (db_error != 0) {
+		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
+	}
 
-	  db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
+	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
+	memset (&id_dbt, 0, sizeof (id_dbt));
+	db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
 
-	  while (db_error == 0) {
+	while (db_error == 0) {
 
-		  /* don't include the version in the list of cards */
-		  if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		      || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
+		/* don't include the version in the list of cards */
+		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
+		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
 
-			  cursor_data->elements = g_list_append(cursor_data->elements,
-								g_strdup(vcard_dbt.data));
+			cursor_data->elements = g_list_append(cursor_data->elements,
+							      g_strdup(vcard_dbt.data));
 
-		  }
+		}
 
-		  db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
+		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
 
-	  }
+	}
 
-	  if (db_error != DB_NOTFOUND) {
-		  g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	  }
-	  else {
-		  cursor_data->num_elements = g_list_length (cursor_data->elements);
-	  }
+	if (db_error != DB_NOTFOUND) {
+		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
+	}
+	else {
+		cursor_data->num_elements = g_list_length (cursor_data->elements);
+	}
 }
 
 static void
@@ -1290,6 +1298,7 @@ pas_backend_file_get_vcard (PASBook *book, const char *id)
 	db = bf->priv->file_db;
 
 	string_to_dbt (id, &id_dbt);
+	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
 
 	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
 	if (db_error == 0) {
@@ -1341,6 +1350,7 @@ pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)
 	gboolean ret_val = TRUE;
 
 	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
+	memset (&version_dbt, 0, sizeof (version_dbt));
 
 	db_error = db->get (db, NULL, &version_name_dbt, &version_dbt, 0);
 	if (db_error == 0) {
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index c6afe583f5..af5d17d954 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -15,19 +15,12 @@
   <output_support_files>False</output_support_files>
   <output_build_files>False</output_build_files>
   <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
 </project>
 
 <widget>
   <class>GnomeDialog</class>
   <name>dialog2</name>
   <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
   <visible>False</visible>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
@@ -42,7 +35,6 @@
     <class>GtkVBox</class>
     <child_name>GnomeDialog:vbox</child_name>
     <name>dialog-vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
     <homogeneous>False</homogeneous>
     <spacing>4</spacing>
     <child>
@@ -51,10 +43,51 @@
       <fill>True</fill>
     </child>
 
+    <widget>
+      <class>GtkHButtonBox</class>
+      <child_name>GnomeDialog:action_area</child_name>
+      <name>dialog-action_area2</name>
+      <layout_style>GTK_BUTTONBOX_END</layout_style>
+      <spacing>8</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>
+	<pack>GTK_PACK_END</pack>
+      </child>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button28</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button29</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button30</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+      </widget>
+    </widget>
+
     <widget>
       <class>GtkTable</class>
       <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
       <rows>2</rows>
       <columns>2</columns>
       <homogeneous>False</homogeneous>
@@ -69,7 +102,6 @@
       <widget>
 	<class>GtkEntry</class>
 	<name>entry2</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<can_focus>True</can_focus>
 	<editable>True</editable>
 	<text_visible>True</text_visible>
@@ -94,7 +126,6 @@
       <widget>
 	<class>GtkVBox</class>
 	<name>vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<homogeneous>False</homogeneous>
 	<spacing>2</spacing>
 	<child>
@@ -116,9 +147,9 @@
 	  <class>GtkButton</class>
 	  <name>button31</name>
 	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Add</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -130,9 +161,9 @@
 	  <class>GtkButton</class>
 	  <name>button32</name>
 	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Delete</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -145,7 +176,6 @@
 	<class>GtkScrolledWindow</class>
 	<name>scrolledwindow1</name>
 	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
 	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
 	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
 	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -168,7 +198,6 @@
 	<widget>
 	  <class>GtkCList</class>
 	  <name>clist1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <columns>1</columns>
 	  <column_widths>80</column_widths>
@@ -180,7 +209,6 @@
 	    <class>GtkLabel</class>
 	    <child_name>CList:title</child_name>
 	    <name>label20</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Phone Types</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -192,12 +220,39 @@
 	</widget>
       </widget>
     </widget>
+  </widget>
+</widget>
+
+<widget>
+  <class>GnomeDialog</class>
+  <name>dialog-add-phone</name>
+  <visible>False</visible>
+  <title>New phone type</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>False</allow_grow>
+  <auto_shrink>False</auto_shrink>
+  <auto_close>False</auto_close>
+  <hide_on_close>False</hide_on_close>
+
+  <widget>
+    <class>GtkVBox</class>
+    <child_name>GnomeDialog:vbox</child_name>
+    <name>vbox2</name>
+    <homogeneous>False</homogeneous>
+    <spacing>8</spacing>
+    <child>
+      <padding>4</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
 
     <widget>
       <class>GtkHButtonBox</class>
       <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
+      <name>hbuttonbox1</name>
       <layout_style>GTK_BUTTONBOX_END</layout_style>
       <spacing>8</spacing>
       <child_min_width>85</child_min_width>
@@ -213,67 +268,27 @@
 
       <widget>
 	<class>GtkButton</class>
-	<name>button28</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<cxx_use_heap>True</cxx_use_heap>
+	<name>button43</name>
 	<can_default>True</can_default>
+	<has_default>True</has_default>
 	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+	<label>Add</label>
+	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
       </widget>
 
       <widget>
 	<class>GtkButton</class>
-	<name>button30</name>
-	<cxx_use_heap>True</cxx_use_heap>
+	<name>button44</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
       </widget>
     </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
 
     <widget>
       <class>GtkFrame</class>
       <name>frame-add-phone</name>
       <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
       <label>New phone type</label>
       <label_xalign>0</label_xalign>
       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -287,7 +302,6 @@
 	<class>GtkAlignment</class>
 	<name>alignment9</name>
 	<border_width>9</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
 	<xalign>0.5</xalign>
 	<yalign>0.5</yalign>
 	<xscale>1</xscale>
@@ -296,7 +310,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <has_focus>True</has_focus>
 	  <editable>True</editable>
@@ -306,52 +319,12 @@
 	</widget>
       </widget>
     </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</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>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
   </widget>
 </widget>
 
 <widget>
   <class>GnomeApp</class>
   <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
   <visible>False</visible>
   <title>Contact Editor</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
@@ -366,7 +339,6 @@
     <class>GnomeDock</class>
     <child_name>GnomeApp:dock</child_name>
     <name>dock1</name>
-    <cxx_use_heap>True</cxx_use_heap>
     <allow_floating>True</allow_floating>
     <child>
       <padding>0</padding>
@@ -378,7 +350,6 @@
       <class>GtkNotebook</class>
       <child_name>GnomeDock:contents</child_name>
       <name>notebook-contact-editor</name>
-      <cxx_use_heap>True</cxx_use_heap>
       <can_focus>True</can_focus>
       <show_tabs>True</show_tabs>
       <show_border>True</show_border>
@@ -392,7 +363,6 @@
 	<class>GtkTable</class>
 	<name>table-contact-editor-general</name>
 	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
 	<rows>14</rows>
 	<columns>8</columns>
 	<homogeneous>False</homogeneous>
@@ -402,7 +372,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -427,7 +396,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -452,7 +420,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -477,7 +444,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -504,7 +470,6 @@
 	  <name>text-address</name>
 	  <width>1</width>
 	  <height>1</height>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text></text>
@@ -527,9 +492,9 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Full Name...</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>3</right_attach>
@@ -549,7 +514,6 @@
 	<widget>
 	  <class>GtkAccelLabel</class>
 	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>File As:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -576,7 +540,6 @@
 	<widget>
 	  <class>GtkAccelLabel</class>
 	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Web page address:</label>
 	  <justify>GTK_JUSTIFY_LEFT</justify>
 	  <wrap>False</wrap>
@@ -603,7 +566,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -626,7 +588,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -637,7 +599,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -660,7 +621,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -671,7 +632,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -694,7 +654,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -705,7 +665,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -728,7 +687,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -739,7 +698,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>4</left_attach>
 	    <right_attach>8</right_attach>
@@ -759,7 +717,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -782,7 +739,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -793,7 +750,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <has_default>True</has_default>
 	  <can_focus>True</can_focus>
 	  <has_focus>True</has_focus>
@@ -820,7 +776,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-jobtitle</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -845,7 +800,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -870,7 +824,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-email1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -895,7 +848,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -920,7 +872,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>4</right_attach>
@@ -940,7 +891,6 @@
 	<widget>
 	  <class>GtkCombo</class>
 	  <name>combo-file-as</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <value_in_list>False</value_in_list>
 	  <ok_if_empty>True</ok_if_empty>
 	  <case_sensitive>True</case_sensitive>
@@ -966,7 +916,6 @@
 	    <class>GtkEntry</class>
 	    <child_name>GtkCombo:entry</child_name>
 	    <name>entry-file-as</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -978,7 +927,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>4</right_attach>
@@ -998,7 +946,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0</yalign>
 	  <xscale>1</xscale>
@@ -1021,7 +968,6 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-htmlmail</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Wants to receive _HTML mail</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
@@ -1031,7 +977,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -1054,7 +999,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -1065,7 +1010,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1084,7 +1028,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Business</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1098,7 +1041,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1117,7 +1059,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Home</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1132,7 +1073,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1151,7 +1091,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Business _Fax</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1166,7 +1105,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1185,7 +1123,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Mobile</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
@@ -1200,7 +1137,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
@@ -1219,7 +1155,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Primary Email</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1234,7 +1169,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox-business</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1253,7 +1187,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>B_usiness</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1268,7 +1201,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0</xalign>
 	  <yalign>0</yalign>
 	  <xscale>0</xscale>
@@ -1291,7 +1223,6 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-mailingaddress</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <visible>False</visible>
 	    <label>_This is the mailing address</label>
 	    <active>False</active>
@@ -1302,7 +1233,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>4</right_attach>
@@ -1322,7 +1252,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>4</left_attach>
 	    <right_attach>8</right_attach>
@@ -1342,7 +1271,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment-contacts</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1365,16 +1293,15 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>C_ontacts...</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
 
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1397,7 +1324,6 @@
 	  <widget>
 	    <class>GtkEntry</class>
 	    <name>entry-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -1409,7 +1335,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1432,7 +1357,6 @@
 	  <widget>
 	    <class>GtkEntry</class>
 	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -1444,7 +1368,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment16</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1467,16 +1390,15 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>Ca_tegories...</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
 
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>3</right_attach>
@@ -1495,7 +1417,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-jobtitle</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Job title:</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1510,7 +1431,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>malehead.png</string1>
 	  <string2></string2>
@@ -1536,7 +1456,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>cellphone.png</string1>
 	  <string2></string2>
@@ -1562,7 +1481,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>envelope.png</string1>
 	  <string2></string2>
@@ -1588,7 +1506,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>house.png</string1>
 	  <string2></string2>
@@ -1614,7 +1531,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>evolution-contacts-plain.png</string1>
 	  <string2></string2>
@@ -1640,7 +1556,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>briefcase.png</string1>
 	  <string2></string2>
@@ -1666,7 +1581,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>globe.png</string1>
 	  <string2></string2>
@@ -1692,7 +1606,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Company:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1720,9 +1633,9 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fulladdr</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Address...</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>7</right_attach>
@@ -1744,7 +1657,6 @@
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
 	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<label>General</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
@@ -1758,7 +1670,6 @@
 	<class>GtkTable</class>
 	<name>table-contact-editor-details</name>
 	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
 	<rows>9</rows>
 	<columns>6</columns>
 	<homogeneous>False</homogeneous>
@@ -1768,7 +1679,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Department:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1796,7 +1706,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Office:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1824,7 +1733,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Profession:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1852,7 +1760,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Nickname:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1880,7 +1787,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Spouse:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1908,7 +1814,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Birthday:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1935,7 +1840,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Assistant's name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1963,7 +1867,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Manager's Name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1991,7 +1894,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Anni_versary:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -2018,7 +1920,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2043,7 +1944,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2068,7 +1968,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2093,7 +1992,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2118,7 +2016,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2140,60 +2037,9 @@
 	  </child>
 	</widget>
 
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2218,7 +2064,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2243,7 +2088,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>6</right_attach>
@@ -2263,7 +2107,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-comments</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>No_tes:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -2290,7 +2133,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>6</right_attach>
@@ -2310,7 +2152,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>briefcase.png</string1>
 	  <string2></string2>
@@ -2336,7 +2177,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>malehead.png</string1>
 	  <string2></string2>
@@ -2362,7 +2202,6 @@
 	<widget>
 	  <class>GtkScrolledWindow</class>
 	  <name>scrolledwindow2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
 	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
 	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -2385,7 +2224,6 @@
 	  <widget>
 	    <class>GtkText</class>
 	    <name>text-comments</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text></text>
@@ -2395,7 +2233,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>globe.png</string1>
 	  <string2></string2>
@@ -2417,13 +2254,58 @@
 	    <yfill>True</yfill>
 	  </child>
 	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>dateedit-anniversary</name>
+	  <creation_function>e_contact_editor_create_date</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Tue, 05 Jun 2001 02:36:32 GMT</last_modification_time>
+	  <child>
+	    <left_attach>4</left_attach>
+	    <right_attach>6</right_attach>
+	    <top_attach>5</top_attach>
+	    <bottom_attach>6</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>dateedit-birthday</name>
+	  <creation_function>e_contact_editor_create_date</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Tue, 05 Jun 2001 02:36:27 GMT</last_modification_time>
+	  <child>
+	    <left_attach>4</left_attach>
+	    <right_attach>6</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
       </widget>
 
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
 	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<label>Details</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
@@ -2439,7 +2321,6 @@
     <class>GnomeAppBar</class>
     <child_name>GnomeApp:appbar</child_name>
     <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
     <has_progress>True</has_progress>
     <has_status>True</has_status>
     <child>
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index f4ebc9c68d..e9ad99283f 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -28,7 +28,6 @@
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktext.h>
 #include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomeui/gnome-dateedit.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <bonobo/bonobo-ui-container.h>
@@ -39,9 +38,12 @@
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-unicode.h>
 
+#include <e-util/e-categories-master-list-wombat.h>
+
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/printing/e-contact-print-envelope.h"
 #include "e-util/e-gui-utils.h"
+#include "widgets/misc/e-dateedit.h"
 
 #include "e-contact-editor.h"
 #include "e-contact-editor-address.h"
@@ -592,6 +594,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 	GnomeDialog *dialog;
 	int result;
 	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
+	ECategoriesMasterList *ecml;
 	if (entry && GTK_IS_ENTRY(entry))
 		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
 	else if (editor->card)
@@ -599,9 +602,12 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 			       "categories", &categories,
 			       NULL);
 	dialog = GNOME_DIALOG(e_categories_new(categories));
+	ecml = e_categories_master_list_wombat_new ();
 	gtk_object_set(GTK_OBJECT(dialog),
 		       "header", _("This contact belongs to these categories:"),
+		       "ecml", ecml,
 		       NULL);
+	gtk_object_unref (GTK_OBJECT (ecml));
 	gtk_widget_show(GTK_WIDGET(dialog));
 	result = gnome_dialog_run (dialog);
 	g_free (categories);
@@ -1973,30 +1979,29 @@ fill_in_info(EContactEditor *editor)
 		editor->name = e_card_name_copy(name);
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			EDateEdit *dateedit;
+			dateedit = E_DATE_EDIT(widget);
+			if (anniversary)
+				e_date_edit_set_date (dateedit,
+						      anniversary->year,
+						      anniversary->month,
+						      anniversary->day);
+			else
+				e_date_edit_set_time (dateedit, -1);
 		}
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			EDateEdit *dateedit;
+			dateedit = E_DATE_EDIT(widget);
+			if (bday)
+				e_date_edit_set_date (dateedit,
+						      bday->year,
+						      bday->month,
+						      bday->day);
+			else
+				e_date_edit_set_time (dateedit, -1);
 		}
 
 		set_fields(editor);
@@ -2052,10 +2057,8 @@ extract_info(EContactEditor *editor)
 {
 	ECard *card = editor->card;
 	if (card) {
-		ECardDate *anniversary;
-		ECardDate *bday;
-		struct tm time_struct;
-		time_t time_val;
+		ECardDate anniversary;
+		ECardDate bday;
 		int i;
 		GtkWidget *widget;
 		GList *list;
@@ -2087,31 +2090,35 @@ extract_info(EContactEditor *editor)
 				       NULL);
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			if (e_date_edit_get_date (E_DATE_EDIT (widget),
+						  &anniversary.year,
+						  &anniversary.month,
+						  &anniversary.day)) {
+				g_print ("%d %d %d\n", anniversary.year, anniversary.month, anniversary.day);
+				gtk_object_set(GTK_OBJECT(card),
+					       "anniversary", &anniversary,
+					       NULL);
+			} else
+				gtk_object_set(GTK_OBJECT(card),
+					       "anniversary", NULL,
+					       NULL);
 		}
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			if (e_date_edit_get_date (E_DATE_EDIT (widget),
+						  &bday.year,
+						  &bday.month,
+						  &bday.day)) {
+				g_print ("%d %d %d\n", bday.year, bday.month, bday.day);
+				gtk_object_set(GTK_OBJECT(card),
+					       "birth_date", &bday,
+					       NULL);
+			} else
+				gtk_object_set(GTK_OBJECT(card),
+					       "birth_date", NULL,
+					       NULL);
 		}
 	}
 }
@@ -2127,3 +2134,21 @@ e_contact_editor_raise (EContactEditor *editor)
 {
 	gdk_window_raise (GTK_WIDGET (editor->app)->window);
 }
+
+GtkWidget *
+e_contact_editor_create_date(gchar *name,
+			     gchar *string1, gchar *string2,
+			     gint int1, gint int2);
+
+GtkWidget *
+e_contact_editor_create_date(gchar *name,
+			     gchar *string1, gchar *string2,
+			     gint int1, gint int2)
+{
+	GtkWidget *widget = e_date_edit_new ();
+	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),
+					   TRUE);
+	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);
+	e_date_edit_set_time (E_DATE_EDIT (widget), -1);
+	return widget;
+}
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index c6afe583f5..af5d17d954 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -15,19 +15,12 @@
   <output_support_files>False</output_support_files>
   <output_build_files>False</output_build_files>
   <backup_source_files>False</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
 </project>
 
 <widget>
   <class>GnomeDialog</class>
   <name>dialog2</name>
   <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
   <visible>False</visible>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
@@ -42,7 +35,6 @@
     <class>GtkVBox</class>
     <child_name>GnomeDialog:vbox</child_name>
     <name>dialog-vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
     <homogeneous>False</homogeneous>
     <spacing>4</spacing>
     <child>
@@ -51,10 +43,51 @@
       <fill>True</fill>
     </child>
 
+    <widget>
+      <class>GtkHButtonBox</class>
+      <child_name>GnomeDialog:action_area</child_name>
+      <name>dialog-action_area2</name>
+      <layout_style>GTK_BUTTONBOX_END</layout_style>
+      <spacing>8</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>
+	<pack>GTK_PACK_END</pack>
+      </child>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button28</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button29</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button30</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+      </widget>
+    </widget>
+
     <widget>
       <class>GtkTable</class>
       <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
       <rows>2</rows>
       <columns>2</columns>
       <homogeneous>False</homogeneous>
@@ -69,7 +102,6 @@
       <widget>
 	<class>GtkEntry</class>
 	<name>entry2</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<can_focus>True</can_focus>
 	<editable>True</editable>
 	<text_visible>True</text_visible>
@@ -94,7 +126,6 @@
       <widget>
 	<class>GtkVBox</class>
 	<name>vbox1</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<homogeneous>False</homogeneous>
 	<spacing>2</spacing>
 	<child>
@@ -116,9 +147,9 @@
 	  <class>GtkButton</class>
 	  <name>button31</name>
 	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Add</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -130,9 +161,9 @@
 	  <class>GtkButton</class>
 	  <name>button32</name>
 	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Delete</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -145,7 +176,6 @@
 	<class>GtkScrolledWindow</class>
 	<name>scrolledwindow1</name>
 	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
 	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
 	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
 	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -168,7 +198,6 @@
 	<widget>
 	  <class>GtkCList</class>
 	  <name>clist1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <columns>1</columns>
 	  <column_widths>80</column_widths>
@@ -180,7 +209,6 @@
 	    <class>GtkLabel</class>
 	    <child_name>CList:title</child_name>
 	    <name>label20</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Phone Types</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -192,12 +220,39 @@
 	</widget>
       </widget>
     </widget>
+  </widget>
+</widget>
+
+<widget>
+  <class>GnomeDialog</class>
+  <name>dialog-add-phone</name>
+  <visible>False</visible>
+  <title>New phone type</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>False</allow_grow>
+  <auto_shrink>False</auto_shrink>
+  <auto_close>False</auto_close>
+  <hide_on_close>False</hide_on_close>
+
+  <widget>
+    <class>GtkVBox</class>
+    <child_name>GnomeDialog:vbox</child_name>
+    <name>vbox2</name>
+    <homogeneous>False</homogeneous>
+    <spacing>8</spacing>
+    <child>
+      <padding>4</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
 
     <widget>
       <class>GtkHButtonBox</class>
       <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
+      <name>hbuttonbox1</name>
       <layout_style>GTK_BUTTONBOX_END</layout_style>
       <spacing>8</spacing>
       <child_min_width>85</child_min_width>
@@ -213,67 +268,27 @@
 
       <widget>
 	<class>GtkButton</class>
-	<name>button28</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<cxx_use_heap>True</cxx_use_heap>
+	<name>button43</name>
 	<can_default>True</can_default>
+	<has_default>True</has_default>
 	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+	<label>Add</label>
+	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
       </widget>
 
       <widget>
 	<class>GtkButton</class>
-	<name>button30</name>
-	<cxx_use_heap>True</cxx_use_heap>
+	<name>button44</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
       </widget>
     </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
 
     <widget>
       <class>GtkFrame</class>
       <name>frame-add-phone</name>
       <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
       <label>New phone type</label>
       <label_xalign>0</label_xalign>
       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -287,7 +302,6 @@
 	<class>GtkAlignment</class>
 	<name>alignment9</name>
 	<border_width>9</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
 	<xalign>0.5</xalign>
 	<yalign>0.5</yalign>
 	<xscale>1</xscale>
@@ -296,7 +310,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <has_focus>True</has_focus>
 	  <editable>True</editable>
@@ -306,52 +319,12 @@
 	</widget>
       </widget>
     </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</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>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
   </widget>
 </widget>
 
 <widget>
   <class>GnomeApp</class>
   <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
   <visible>False</visible>
   <title>Contact Editor</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
@@ -366,7 +339,6 @@
     <class>GnomeDock</class>
     <child_name>GnomeApp:dock</child_name>
     <name>dock1</name>
-    <cxx_use_heap>True</cxx_use_heap>
     <allow_floating>True</allow_floating>
     <child>
       <padding>0</padding>
@@ -378,7 +350,6 @@
       <class>GtkNotebook</class>
       <child_name>GnomeDock:contents</child_name>
       <name>notebook-contact-editor</name>
-      <cxx_use_heap>True</cxx_use_heap>
       <can_focus>True</can_focus>
       <show_tabs>True</show_tabs>
       <show_border>True</show_border>
@@ -392,7 +363,6 @@
 	<class>GtkTable</class>
 	<name>table-contact-editor-general</name>
 	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
 	<rows>14</rows>
 	<columns>8</columns>
 	<homogeneous>False</homogeneous>
@@ -402,7 +372,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -427,7 +396,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -452,7 +420,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -477,7 +444,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-phone4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -504,7 +470,6 @@
 	  <name>text-address</name>
 	  <width>1</width>
 	  <height>1</height>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text></text>
@@ -527,9 +492,9 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Full Name...</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>3</right_attach>
@@ -549,7 +514,6 @@
 	<widget>
 	  <class>GtkAccelLabel</class>
 	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>File As:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -576,7 +540,6 @@
 	<widget>
 	  <class>GtkAccelLabel</class>
 	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Web page address:</label>
 	  <justify>GTK_JUSTIFY_LEFT</justify>
 	  <wrap>False</wrap>
@@ -603,7 +566,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -626,7 +588,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -637,7 +599,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -660,7 +621,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -671,7 +632,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -694,7 +654,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -705,7 +665,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -728,7 +687,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -739,7 +698,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>4</left_attach>
 	    <right_attach>8</right_attach>
@@ -759,7 +717,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -782,7 +739,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -793,7 +750,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <has_default>True</has_default>
 	  <can_focus>True</can_focus>
 	  <has_focus>True</has_focus>
@@ -820,7 +776,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-jobtitle</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -845,7 +800,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -870,7 +824,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-email1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -895,7 +848,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -920,7 +872,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>4</right_attach>
@@ -940,7 +891,6 @@
 	<widget>
 	  <class>GtkCombo</class>
 	  <name>combo-file-as</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <value_in_list>False</value_in_list>
 	  <ok_if_empty>True</ok_if_empty>
 	  <case_sensitive>True</case_sensitive>
@@ -966,7 +916,6 @@
 	    <class>GtkEntry</class>
 	    <child_name>GtkCombo:entry</child_name>
 	    <name>entry-file-as</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -978,7 +927,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>4</right_attach>
@@ -998,7 +946,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0</yalign>
 	  <xscale>1</xscale>
@@ -1021,7 +968,6 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-htmlmail</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Wants to receive _HTML mail</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
@@ -1031,7 +977,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -1054,7 +999,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -1065,7 +1010,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1084,7 +1028,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Business</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1098,7 +1041,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1117,7 +1059,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone2</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Home</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1132,7 +1073,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1151,7 +1091,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone3</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Business _Fax</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1166,7 +1105,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1185,7 +1123,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-phone4</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Mobile</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
@@ -1200,7 +1137,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
@@ -1219,7 +1155,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-email1</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>Primary Email</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1234,7 +1169,6 @@
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox-business</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>6</right_attach>
@@ -1253,7 +1187,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-address</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>B_usiness</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1268,7 +1201,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0</xalign>
 	  <yalign>0</yalign>
 	  <xscale>0</xscale>
@@ -1291,7 +1223,6 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-mailingaddress</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <visible>False</visible>
 	    <label>_This is the mailing address</label>
 	    <active>False</active>
@@ -1302,7 +1233,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>4</right_attach>
@@ -1322,7 +1252,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>4</left_attach>
 	    <right_attach>8</right_attach>
@@ -1342,7 +1271,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment-contacts</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1365,16 +1293,15 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>C_ontacts...</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
 
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1397,7 +1324,6 @@
 	  <widget>
 	    <class>GtkEntry</class>
 	    <name>entry-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -1409,7 +1335,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1432,7 +1357,6 @@
 	  <widget>
 	    <class>GtkEntry</class>
 	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -1444,7 +1368,6 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment16</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
@@ -1467,16 +1390,15 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-categories</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>Ca_tegories...</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	  </widget>
 	</widget>
 
 	<widget>
 	  <class>GtkEventBox</class>
 	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>3</right_attach>
@@ -1495,7 +1417,6 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-jobtitle</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Job title:</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1510,7 +1431,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>malehead.png</string1>
 	  <string2></string2>
@@ -1536,7 +1456,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>cellphone.png</string1>
 	  <string2></string2>
@@ -1562,7 +1481,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>envelope.png</string1>
 	  <string2></string2>
@@ -1588,7 +1506,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>house.png</string1>
 	  <string2></string2>
@@ -1614,7 +1531,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>evolution-contacts-plain.png</string1>
 	  <string2></string2>
@@ -1640,7 +1556,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom6</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>briefcase.png</string1>
 	  <string2></string2>
@@ -1666,7 +1581,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>globe.png</string1>
 	  <string2></string2>
@@ -1692,7 +1606,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-company</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Company:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1720,9 +1633,9 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fulladdr</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Address...</label>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	  <child>
 	    <left_attach>5</left_attach>
 	    <right_attach>7</right_attach>
@@ -1744,7 +1657,6 @@
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
 	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<label>General</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
@@ -1758,7 +1670,6 @@
 	<class>GtkTable</class>
 	<name>table-contact-editor-details</name>
 	<border_width>7</border_width>
-	<cxx_use_heap>True</cxx_use_heap>
 	<rows>9</rows>
 	<columns>6</columns>
 	<homogeneous>False</homogeneous>
@@ -1768,7 +1679,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Department:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1796,7 +1706,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Office:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1824,7 +1733,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Profession:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1852,7 +1760,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Nickname:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1880,7 +1787,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Spouse:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1908,7 +1814,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Birthday:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1935,7 +1840,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Assistant's name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1963,7 +1867,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Manager's Name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1991,7 +1894,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Anni_versary:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -2018,7 +1920,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2043,7 +1944,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-department</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2068,7 +1968,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-office</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2093,7 +1992,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-profession</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2118,7 +2016,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-nickname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2140,60 +2037,9 @@
 	  </child>
 	</widget>
 
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2218,7 +2064,6 @@
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>entry-manager</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -2243,7 +2088,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>6</right_attach>
@@ -2263,7 +2107,6 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label-comments</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>No_tes:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -2290,7 +2133,6 @@
 	<widget>
 	  <class>GtkHSeparator</class>
 	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>6</right_attach>
@@ -2310,7 +2152,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>briefcase.png</string1>
 	  <string2></string2>
@@ -2336,7 +2177,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>malehead.png</string1>
 	  <string2></string2>
@@ -2362,7 +2202,6 @@
 	<widget>
 	  <class>GtkScrolledWindow</class>
 	  <name>scrolledwindow2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
 	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
 	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -2385,7 +2224,6 @@
 	  <widget>
 	    <class>GtkText</class>
 	    <name>text-comments</name>
-	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text></text>
@@ -2395,7 +2233,6 @@
 	<widget>
 	  <class>Custom</class>
 	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
 	  <creation_function>e_create_image_widget</creation_function>
 	  <string1>globe.png</string1>
 	  <string2></string2>
@@ -2417,13 +2254,58 @@
 	    <yfill>True</yfill>
 	  </child>
 	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>dateedit-anniversary</name>
+	  <creation_function>e_contact_editor_create_date</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Tue, 05 Jun 2001 02:36:32 GMT</last_modification_time>
+	  <child>
+	    <left_attach>4</left_attach>
+	    <right_attach>6</right_attach>
+	    <top_attach>5</top_attach>
+	    <bottom_attach>6</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>dateedit-birthday</name>
+	  <creation_function>e_contact_editor_create_date</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Tue, 05 Jun 2001 02:36:27 GMT</last_modification_time>
+	  <child>
+	    <left_attach>4</left_attach>
+	    <right_attach>6</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
       </widget>
 
       <widget>
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
 	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
 	<label>Details</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
@@ -2439,7 +2321,6 @@
     <class>GnomeAppBar</class>
     <child_name>GnomeApp:appbar</child_name>
     <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
     <has_progress>True</has_progress>
     <has_status>True</has_status>
     <child>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index f4ebc9c68d..e9ad99283f 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -28,7 +28,6 @@
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktext.h>
 #include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomeui/gnome-dateedit.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <bonobo/bonobo-ui-container.h>
@@ -39,9 +38,12 @@
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-unicode.h>
 
+#include <e-util/e-categories-master-list-wombat.h>
+
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/printing/e-contact-print-envelope.h"
 #include "e-util/e-gui-utils.h"
+#include "widgets/misc/e-dateedit.h"
 
 #include "e-contact-editor.h"
 #include "e-contact-editor-address.h"
@@ -592,6 +594,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 	GnomeDialog *dialog;
 	int result;
 	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
+	ECategoriesMasterList *ecml;
 	if (entry && GTK_IS_ENTRY(entry))
 		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
 	else if (editor->card)
@@ -599,9 +602,12 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 			       "categories", &categories,
 			       NULL);
 	dialog = GNOME_DIALOG(e_categories_new(categories));
+	ecml = e_categories_master_list_wombat_new ();
 	gtk_object_set(GTK_OBJECT(dialog),
 		       "header", _("This contact belongs to these categories:"),
+		       "ecml", ecml,
 		       NULL);
+	gtk_object_unref (GTK_OBJECT (ecml));
 	gtk_widget_show(GTK_WIDGET(dialog));
 	result = gnome_dialog_run (dialog);
 	g_free (categories);
@@ -1973,30 +1979,29 @@ fill_in_info(EContactEditor *editor)
 		editor->name = e_card_name_copy(name);
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			EDateEdit *dateedit;
+			dateedit = E_DATE_EDIT(widget);
+			if (anniversary)
+				e_date_edit_set_date (dateedit,
+						      anniversary->year,
+						      anniversary->month,
+						      anniversary->day);
+			else
+				e_date_edit_set_time (dateedit, -1);
 		}
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			EDateEdit *dateedit;
+			dateedit = E_DATE_EDIT(widget);
+			if (bday)
+				e_date_edit_set_date (dateedit,
+						      bday->year,
+						      bday->month,
+						      bday->day);
+			else
+				e_date_edit_set_time (dateedit, -1);
 		}
 
 		set_fields(editor);
@@ -2052,10 +2057,8 @@ extract_info(EContactEditor *editor)
 {
 	ECard *card = editor->card;
 	if (card) {
-		ECardDate *anniversary;
-		ECardDate *bday;
-		struct tm time_struct;
-		time_t time_val;
+		ECardDate anniversary;
+		ECardDate bday;
 		int i;
 		GtkWidget *widget;
 		GList *list;
@@ -2087,31 +2090,35 @@ extract_info(EContactEditor *editor)
 				       NULL);
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			if (e_date_edit_get_date (E_DATE_EDIT (widget),
+						  &anniversary.year,
+						  &anniversary.month,
+						  &anniversary.day)) {
+				g_print ("%d %d %d\n", anniversary.year, anniversary.month, anniversary.day);
+				gtk_object_set(GTK_OBJECT(card),
+					       "anniversary", &anniversary,
+					       NULL);
+			} else
+				gtk_object_set(GTK_OBJECT(card),
+					       "anniversary", NULL,
+					       NULL);
 		}
 
 		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
+		if (widget && E_IS_DATE_EDIT(widget)) {
+			if (e_date_edit_get_date (E_DATE_EDIT (widget),
+						  &bday.year,
+						  &bday.month,
+						  &bday.day)) {
+				g_print ("%d %d %d\n", bday.year, bday.month, bday.day);
+				gtk_object_set(GTK_OBJECT(card),
+					       "birth_date", &bday,
+					       NULL);
+			} else
+				gtk_object_set(GTK_OBJECT(card),
+					       "birth_date", NULL,
+					       NULL);
 		}
 	}
 }
@@ -2127,3 +2134,21 @@ e_contact_editor_raise (EContactEditor *editor)
 {
 	gdk_window_raise (GTK_WIDGET (editor->app)->window);
 }
+
+GtkWidget *
+e_contact_editor_create_date(gchar *name,
+			     gchar *string1, gchar *string2,
+			     gint int1, gint int2);
+
+GtkWidget *
+e_contact_editor_create_date(gchar *name,
+			     gchar *string1, gchar *string2,
+			     gint int1, gint int2)
+{
+	GtkWidget *widget = e_date_edit_new ();
+	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),
+					   TRUE);
+	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);
+	e_date_edit_set_time (E_DATE_EDIT (widget), -1);
+	return widget;
+}
-- 
cgit v1.2.3