Change the initial dialog visibility to FALSE so the contact editor

2000-10-17  Iain Holmes  <iain@helixcode.com>

        * contact-editor/contact-editor.glade: Change the initial dialog
        visibility to FALSE
        so the contact editor doesn't flash when it appears.

2000-10-16  Iain Holmes  <iain@helixcode.com>

        * gui/component/select-names/e-select-names-manager.c
        (e_select_names_manager_activate_dialog): Only allow one dialog
        per manager.

svn path=/trunk/; revision=5986

4 files changed, 435 insertions, 182 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 50815a10eb..7df3700a39 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-17  Iain Holmes  <iain@helixcode.com>
+
+	* contact-editor/contact-editor.glade: Change the initial dialog 
+	visibility to FALSE
+	so the contact editor doesn't flash when it appears.
+
+2000-10-16  Iain Holmes  <iain@helixcode.com>
+
+	* gui/component/select-names/e-select-names-manager.c 
+	(e_select_names_manager_activate_dialog): Only allow one dialog
+	per manager.
+
 2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
 
 	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a
diff --git a/addressbook/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
index 6db6d21c6f..5d49fd06ff 100644
--- a/addressbook/contact-editor/contact-editor.glade
+++ b/addressbook/contact-editor/contact-editor.glade
@@ -15,6 +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>
   <output_translatable_strings>True</output_translatable_strings>
   <translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
 </project>
@@ -23,6 +29,7 @@
   <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>
@@ -37,6 +44,7 @@
     <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>
@@ -46,50 +54,9 @@
     </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>
@@ -104,6 +71,7 @@
       <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>
@@ -128,6 +96,7 @@
       <widget>
 	<class>GtkVBox</class>
 	<name>vbox1</name>
+	<cxx_use_heap>True</cxx_use_heap>
 	<homogeneous>False</homogeneous>
 	<spacing>2</spacing>
 	<child>
@@ -149,6 +118,7 @@
 	  <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>
 	  <child>
@@ -162,6 +132,7 @@
 	  <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>
 	  <child>
@@ -176,6 +147,7 @@
 	<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>
@@ -198,6 +170,7 @@
 	<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>
@@ -209,6 +182,7 @@
 	    <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>
@@ -220,39 +194,12 @@
 	</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>hbuttonbox1</name>
+      <name>dialog-action_area2</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>
@@ -268,27 +215,67 @@
 
       <widget>
 	<class>GtkButton</class>
-	<name>button43</name>
+	<name>button28</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>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>
 
       <widget>
 	<class>GtkButton</class>
-	<name>button44</name>
+	<name>button29</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<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>
+	<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>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>
@@ -302,6 +289,7 @@
 	<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>
@@ -310,6 +298,7 @@
 	<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>
@@ -319,12 +308,53 @@
 	</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>
   <position>GTK_WIN_POS_NONE</position>
@@ -338,6 +368,7 @@
     <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>
@@ -349,6 +380,7 @@
       <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>
@@ -362,6 +394,7 @@
 	<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>
@@ -371,6 +404,7 @@
 	<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>
@@ -395,6 +429,7 @@
 	<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>
@@ -419,6 +454,7 @@
 	<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>
@@ -443,6 +479,7 @@
 	<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>
@@ -469,6 +506,7 @@
 	  <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>
@@ -491,6 +529,7 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fullname</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Full Name...</label>
 	  <child>
@@ -512,6 +551,7 @@
 	<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>
@@ -538,6 +578,7 @@
 	<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>
@@ -564,6 +605,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment3</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -586,6 +628,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-email1</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -596,6 +639,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment5</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -618,6 +662,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone4</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -628,6 +673,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment7</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -650,6 +696,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone2</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -660,6 +707,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment8</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -682,6 +730,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone1</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -692,6 +741,7 @@
 	<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>
@@ -711,6 +761,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment6</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -733,6 +784,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone3</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -743,6 +795,7 @@
 	<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>
@@ -769,6 +822,7 @@
 	<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>
@@ -793,6 +847,7 @@
 	<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>
@@ -817,6 +872,7 @@
 	<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>
@@ -841,6 +897,7 @@
 	<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>
@@ -865,6 +922,7 @@
 	<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>
@@ -884,6 +942,7 @@
 	<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>
@@ -909,6 +968,7 @@
 	    <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>
@@ -920,6 +980,7 @@
 	<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>
@@ -939,6 +1000,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment10</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0</yalign>
 	  <xscale>1</xscale>
@@ -961,6 +1023,7 @@
 	  <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>
@@ -970,6 +1033,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment4</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -992,6 +1056,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-address</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -1002,6 +1067,7 @@
 	<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>
@@ -1020,6 +1086,7 @@
 	  <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>
@@ -1033,6 +1100,7 @@
 	<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>
@@ -1051,6 +1119,7 @@
 	  <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>
@@ -1065,6 +1134,7 @@
 	<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>
@@ -1083,6 +1153,7 @@
 	  <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>
@@ -1097,6 +1168,7 @@
 	<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>
@@ -1115,6 +1187,7 @@
 	  <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>
@@ -1129,6 +1202,7 @@
 	<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>
@@ -1147,6 +1221,7 @@
 	  <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>
@@ -1161,6 +1236,7 @@
 	<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>
@@ -1179,6 +1255,7 @@
 	  <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>
@@ -1193,6 +1270,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment2</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0</xalign>
 	  <yalign>0</yalign>
 	  <xscale>0</xscale>
@@ -1215,6 +1293,7 @@
 	  <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>
@@ -1225,6 +1304,7 @@
 	<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>
@@ -1244,6 +1324,7 @@
 	<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>
@@ -1263,6 +1344,7 @@
 	<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>
@@ -1285,6 +1367,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-contacts</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>C_ontacts...</label>
 	  </widget>
@@ -1293,6 +1376,7 @@
 	<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>
@@ -1315,6 +1399,7 @@
 	  <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>
@@ -1326,6 +1411,7 @@
 	<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>
@@ -1348,6 +1434,7 @@
 	  <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>
@@ -1359,6 +1446,7 @@
 	<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>
@@ -1381,6 +1469,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-categories</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>Ca_tegories...</label>
 	  </widget>
@@ -1389,6 +1478,7 @@
 	<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>
@@ -1407,6 +1497,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label34</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Job title:</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1421,6 +1512,7 @@
 	<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>
@@ -1446,6 +1538,7 @@
 	<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>
@@ -1471,6 +1564,7 @@
 	<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>
@@ -1496,6 +1590,7 @@
 	<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>
@@ -1521,6 +1616,7 @@
 	<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.png</string1>
 	  <string2></string2>
@@ -1546,6 +1642,7 @@
 	<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>
@@ -1571,6 +1668,7 @@
 	<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>
@@ -1596,6 +1694,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label35</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Company:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1623,6 +1722,7 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fulladdr</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Address...</label>
 	  <child>
@@ -1646,6 +1746,7 @@
 	<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>
@@ -1659,6 +1760,7 @@
 	<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>
@@ -1668,6 +1770,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label21</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Department:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1695,6 +1798,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label22</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Office:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1722,6 +1826,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label23</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Profession:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1749,6 +1854,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label24</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Nickname:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1776,6 +1882,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label25</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Spouse:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1803,6 +1910,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label31</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Birthday:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1829,6 +1937,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label30</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Assistant's name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1856,6 +1965,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label29</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Manager's Name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1883,6 +1993,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label32</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Anni_versary:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1909,6 +2020,7 @@
 	<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>
@@ -1933,6 +2045,7 @@
 	<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>
@@ -1957,6 +2070,7 @@
 	<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>
@@ -1981,6 +2095,7 @@
 	<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>
@@ -2005,6 +2120,7 @@
 	<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>
@@ -2029,6 +2145,7 @@
 	<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>
@@ -2053,6 +2170,7 @@
 	<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>
@@ -2077,6 +2195,7 @@
 	<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>
@@ -2101,6 +2220,7 @@
 	<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>
@@ -2125,6 +2245,7 @@
 	<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>
@@ -2144,6 +2265,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label33</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>No_tes:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -2170,6 +2292,7 @@
 	<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>
@@ -2189,6 +2312,7 @@
 	<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>
@@ -2214,6 +2338,7 @@
 	<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>
@@ -2239,6 +2364,7 @@
 	<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>
@@ -2261,6 +2387,7 @@
 	  <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>
@@ -2270,6 +2397,7 @@
 	<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>
@@ -2297,6 +2425,7 @@
 	<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>
@@ -2312,6 +2441,7 @@
     <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/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index c4c7440270..55c5ae1608 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -114,7 +114,6 @@ e_select_names_manager_destroy (GtkObject *object)
 	
 	manager = E_SELECT_NAMES_MANAGER (object);
 
-	g_hash_table_destroy (manager->id_to_names);
 	gtk_object_unref(GTK_OBJECT(manager->sections));
 	gtk_object_unref(GTK_OBJECT(manager->entries));
 }
@@ -209,7 +208,6 @@ entry_free(void *ent, void *data)
 static void
 e_select_names_manager_init (ESelectNamesManager *manager)
 {
-	manager->id_to_names = g_hash_table_new (g_str_hash, g_str_equal);
 	manager->sections = e_list_new(section_copy, section_free, manager);
 	manager->entries  = e_list_new(entry_copy, entry_free, manager);
 }
@@ -318,48 +316,31 @@ e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *m
 	gnome_dialog_close(GNOME_DIALOG(dialog));
 }
 
-static void
-remove_id_from_table (GtkWidget *names,
-		      ESelectNamesManager *manager)
-{
-	char *id;
-
-	id = gtk_object_get_data (GTK_OBJECT (names), "section-id");
-	g_hash_table_remove (manager->id_to_names, id);
-	g_free (id);
-}
-
 void                          e_select_names_manager_activate_dialog           (ESelectNamesManager *manager,
 										const char *id)
 {
-	ESelectNames *names;
 	EIterator *iterator;
 	
-	names = g_hash_table_lookup (manager->id_to_names, id);
-
-	if (names) {
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (names)));
-		gdk_window_show (GTK_WIDGET (names)->window);
-		gdk_window_raise (GTK_WIDGET (names)->window);
+	if (manager->names) {
+		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
+		gdk_window_show (GTK_WIDGET (manager->names)->window);
+		gdk_window_raise (GTK_WIDGET (manager->names)->window);
 	} else {
-		char *id_dup;
-		names = E_SELECT_NAMES (e_select_names_new ());
+		manager->names = E_SELECT_NAMES (e_select_names_new ());
 
 		iterator = e_list_get_iterator(manager->sections);
 		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
 			const ESelectNamesManagerSection *section = e_iterator_get(iterator);
 			ESelectNamesModel *newmodel = e_select_names_model_duplicate(section->model);
-			e_select_names_add_section(names, section->id, section->title, newmodel);
+			e_select_names_add_section(manager->names, section->id, section->title, newmodel);
 			gtk_object_unref(GTK_OBJECT(newmodel));
 		}
-		gtk_signal_connect(GTK_OBJECT(names), "clicked",
+		gtk_signal_connect(GTK_OBJECT(manager->names), "clicked",
 				   GTK_SIGNAL_FUNC(e_select_names_clicked), manager);
-		id_dup = g_strdup (id);
-		gtk_object_set_data(GTK_OBJECT(names), "section-id", id_dup);
-		g_hash_table_insert (manager->id_to_names, id_dup, names);
-		gtk_signal_connect(GTK_OBJECT(names), "destroy",
-				   GTK_SIGNAL_FUNC(remove_id_from_table), manager);
-		gtk_widget_show(GTK_WIDGET(names));
+		gtk_signal_connect(GTK_OBJECT(manager->names), "destroy",
+				   GTK_SIGNAL_FUNC(gtk_widget_destroyed), 
+				   &manager->names);
+		gtk_widget_show(GTK_WIDGET(manager->names));
 	}
 }
 
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 6db6d21c6f..5d49fd06ff 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -15,6 +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>
   <output_translatable_strings>True</output_translatable_strings>
   <translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
 </project>
@@ -23,6 +29,7 @@
   <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>
@@ -37,6 +44,7 @@
     <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>
@@ -46,50 +54,9 @@
     </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>
@@ -104,6 +71,7 @@
       <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>
@@ -128,6 +96,7 @@
       <widget>
 	<class>GtkVBox</class>
 	<name>vbox1</name>
+	<cxx_use_heap>True</cxx_use_heap>
 	<homogeneous>False</homogeneous>
 	<spacing>2</spacing>
 	<child>
@@ -149,6 +118,7 @@
 	  <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>
 	  <child>
@@ -162,6 +132,7 @@
 	  <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>
 	  <child>
@@ -176,6 +147,7 @@
 	<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>
@@ -198,6 +170,7 @@
 	<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>
@@ -209,6 +182,7 @@
 	    <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>
@@ -220,39 +194,12 @@
 	</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>hbuttonbox1</name>
+      <name>dialog-action_area2</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>
@@ -268,27 +215,67 @@
 
       <widget>
 	<class>GtkButton</class>
-	<name>button43</name>
+	<name>button28</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>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>
 
       <widget>
 	<class>GtkButton</class>
-	<name>button44</name>
+	<name>button29</name>
+	<cxx_use_heap>True</cxx_use_heap>
+	<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>
+	<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>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>
@@ -302,6 +289,7 @@
 	<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>
@@ -310,6 +298,7 @@
 	<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>
@@ -319,12 +308,53 @@
 	</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>
   <position>GTK_WIN_POS_NONE</position>
@@ -338,6 +368,7 @@
     <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>
@@ -349,6 +380,7 @@
       <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>
@@ -362,6 +394,7 @@
 	<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>
@@ -371,6 +404,7 @@
 	<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>
@@ -395,6 +429,7 @@
 	<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>
@@ -419,6 +454,7 @@
 	<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>
@@ -443,6 +479,7 @@
 	<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>
@@ -469,6 +506,7 @@
 	  <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>
@@ -491,6 +529,7 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fullname</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Full Name...</label>
 	  <child>
@@ -512,6 +551,7 @@
 	<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>
@@ -538,6 +578,7 @@
 	<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>
@@ -564,6 +605,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment3</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -586,6 +628,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-email1</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -596,6 +639,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment5</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -618,6 +662,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone4</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -628,6 +673,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment7</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -650,6 +696,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone2</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -660,6 +707,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment8</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -682,6 +730,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone1</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -692,6 +741,7 @@
 	<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>
@@ -711,6 +761,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment6</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -733,6 +784,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-phone3</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -743,6 +795,7 @@
 	<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>
@@ -769,6 +822,7 @@
 	<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>
@@ -793,6 +847,7 @@
 	<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>
@@ -817,6 +872,7 @@
 	<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>
@@ -841,6 +897,7 @@
 	<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>
@@ -865,6 +922,7 @@
 	<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>
@@ -884,6 +942,7 @@
 	<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>
@@ -909,6 +968,7 @@
 	    <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>
@@ -920,6 +980,7 @@
 	<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>
@@ -939,6 +1000,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment10</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0.5</xalign>
 	  <yalign>0</yalign>
 	  <xscale>1</xscale>
@@ -961,6 +1023,7 @@
 	  <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>
@@ -970,6 +1033,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment4</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>0</xscale>
@@ -992,6 +1056,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-address</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 
 	    <widget>
 	      <class>Placeholder</class>
@@ -1002,6 +1067,7 @@
 	<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>
@@ -1020,6 +1086,7 @@
 	  <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>
@@ -1033,6 +1100,7 @@
 	<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>
@@ -1051,6 +1119,7 @@
 	  <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>
@@ -1065,6 +1134,7 @@
 	<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>
@@ -1083,6 +1153,7 @@
 	  <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>
@@ -1097,6 +1168,7 @@
 	<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>
@@ -1115,6 +1187,7 @@
 	  <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>
@@ -1129,6 +1202,7 @@
 	<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>
@@ -1147,6 +1221,7 @@
 	  <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>
@@ -1161,6 +1236,7 @@
 	<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>
@@ -1179,6 +1255,7 @@
 	  <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>
@@ -1193,6 +1270,7 @@
 	<widget>
 	  <class>GtkAlignment</class>
 	  <name>alignment2</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <xalign>0</xalign>
 	  <yalign>0</yalign>
 	  <xscale>0</xscale>
@@ -1215,6 +1293,7 @@
 	  <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>
@@ -1225,6 +1304,7 @@
 	<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>
@@ -1244,6 +1324,7 @@
 	<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>
@@ -1263,6 +1344,7 @@
 	<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>
@@ -1285,6 +1367,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-contacts</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>C_ontacts...</label>
 	  </widget>
@@ -1293,6 +1376,7 @@
 	<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>
@@ -1315,6 +1399,7 @@
 	  <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>
@@ -1326,6 +1411,7 @@
 	<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>
@@ -1348,6 +1434,7 @@
 	  <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>
@@ -1359,6 +1446,7 @@
 	<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>
@@ -1381,6 +1469,7 @@
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button-categories</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 	    <can_focus>True</can_focus>
 	    <label>Ca_tegories...</label>
 	  </widget>
@@ -1389,6 +1478,7 @@
 	<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>
@@ -1407,6 +1497,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label34</name>
+	    <cxx_use_heap>True</cxx_use_heap>
 	    <label>_Job title:</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
@@ -1421,6 +1512,7 @@
 	<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>
@@ -1446,6 +1538,7 @@
 	<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>
@@ -1471,6 +1564,7 @@
 	<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>
@@ -1496,6 +1590,7 @@
 	<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>
@@ -1521,6 +1616,7 @@
 	<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.png</string1>
 	  <string2></string2>
@@ -1546,6 +1642,7 @@
 	<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>
@@ -1571,6 +1668,7 @@
 	<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>
@@ -1596,6 +1694,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label35</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Company:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1623,6 +1722,7 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>button-fulladdr</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <can_focus>True</can_focus>
 	  <label>_Address...</label>
 	  <child>
@@ -1646,6 +1746,7 @@
 	<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>
@@ -1659,6 +1760,7 @@
 	<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>
@@ -1668,6 +1770,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label21</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Department:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1695,6 +1798,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label22</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Office:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1722,6 +1826,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label23</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Profession:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1749,6 +1854,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label24</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Nickname:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1776,6 +1882,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label25</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Spouse:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1803,6 +1910,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label31</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Birthday:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1829,6 +1937,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label30</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Assistant's name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1856,6 +1965,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label29</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>_Manager's Name:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1883,6 +1993,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label32</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>Anni_versary:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -1909,6 +2020,7 @@
 	<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>
@@ -1933,6 +2045,7 @@
 	<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>
@@ -1957,6 +2070,7 @@
 	<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>
@@ -1981,6 +2095,7 @@
 	<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>
@@ -2005,6 +2120,7 @@
 	<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>
@@ -2029,6 +2145,7 @@
 	<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>
@@ -2053,6 +2170,7 @@
 	<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>
@@ -2077,6 +2195,7 @@
 	<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>
@@ -2101,6 +2220,7 @@
 	<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>
@@ -2125,6 +2245,7 @@
 	<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>
@@ -2144,6 +2265,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label33</name>
+	  <cxx_use_heap>True</cxx_use_heap>
 	  <label>No_tes:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
@@ -2170,6 +2292,7 @@
 	<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>
@@ -2189,6 +2312,7 @@
 	<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>
@@ -2214,6 +2338,7 @@
 	<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>
@@ -2239,6 +2364,7 @@
 	<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>
@@ -2261,6 +2387,7 @@
 	  <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>
@@ -2270,6 +2397,7 @@
 	<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>
@@ -2297,6 +2425,7 @@
 	<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>
@@ -2312,6 +2441,7 @@
     <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>