From 653cfffc0e00dfb59b36813c1b45c53d3f773c65 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Tue, 21 Oct 2003 18:49:34 +0000
Subject: Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965
---
 addressbook/gui/contact-editor/e-contact-editor-address.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addressbook/gui/contact-editor/e-contact-editor-address.h')

diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
index 7faab47a4f..c20f020152 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtkdialog.h>
 #include <glade/glade.h>
-#include <ebook/e-card.h>
+#include <ebook/e-contact.h>
 
 G_BEGIN_DECLS
 
@@ -49,8 +49,10 @@ struct _EContactEditorAddress
 {
 	GtkDialog parent;
 	
+#if notyet
 	/* item specific fields */
 	ECardDeliveryAddress *address;
+#endif
 
 	guint editable : 1;
 
@@ -63,7 +65,7 @@ struct _EContactEditorAddressClass
 };
 
 
-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);
+GtkWidget *e_contact_editor_address_new(/* XXX not yet const ECardDeliveryAddress *name*/);
 GType      e_contact_editor_address_get_type (void);
 
 G_END_DECLS
-- 
cgit v1.2.3