Made a NULL callback just mean to not call back.

2000-05-07  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/e-book.c: Made a NULL callback just mean to not
	call back.

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
	Reordered fields.  Added a get_const function to get a constant
	string that persists until the simple is destroyed.

	* gui/component/Makefile.am: Added e-addressbook-model.c and
	e-addressbook-model.h and all of the libraries and includes that
	they are dependent on.

	* gui/component/addressbook-factory.c: Initialize e cursors.

	* gui/component/addressbook.c: Added inactive code to display an
	ETable view of the addressbook.

svn path=/trunk/; revision=2844

1 files changed, 38 insertions, 34 deletions

diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
index f0bb6cb541..1949518286 100644
--- a/addressbook/backend/ebook/e-card-simple.h
+++ b/addressbook/backend/ebook/e-card-simple.h
@@ -77,40 +77,40 @@ enum _ECardSimpleType {
 
 enum _ECardSimpleField {
 	E_CARD_SIMPLE_FIELD_FILE_AS,
-	E_CARD_SIMPLE_FIELD_FULL_NAME,
-	E_CARD_SIMPLE_FIELD_BIRTH_DATE,
-	E_CARD_SIMPLE_FIELD_URL,
-	E_CARD_SIMPLE_FIELD_ORG,
-	E_CARD_SIMPLE_FIELD_ORG_UNIT,
-	E_CARD_SIMPLE_FIELD_OFFICE,
-	E_CARD_SIMPLE_FIELD_TITLE,
-	E_CARD_SIMPLE_FIELD_ROLE,
-	E_CARD_SIMPLE_FIELD_MANAGER,
-	E_CARD_SIMPLE_FIELD_ASSISTANT,
-	E_CARD_SIMPLE_FIELD_NICKNAME,
-	E_CARD_SIMPLE_FIELD_SPOUSE,
-	E_CARD_SIMPLE_FIELD_ANNIVERSARY,
-	E_CARD_SIMPLE_FIELD_FBURL,
-	E_CARD_SIMPLE_FIELD_NOTE,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
-	E_CARD_SIMPLE_FIELD_PHONE_CAR,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
-	E_CARD_SIMPLE_FIELD_PHONE_ISDN,
-	E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-	E_CARD_SIMPLE_FIELD_PHONE_OTHER,
-	E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-	E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_ADDRESS_HOME,
-	E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,
-	E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
-	E_CARD_SIMPLE_FIELD_EMAIL,
-	E_CARD_SIMPLE_FIELD_EMAIL_2,
-	E_CARD_SIMPLE_FIELD_EMAIL_3,
-	E_CARD_SIMPLE_FIELD_LAST
+        E_CARD_SIMPLE_FIELD_FULL_NAME,
+        E_CARD_SIMPLE_FIELD_EMAIL,
+        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
+        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
+        E_CARD_SIMPLE_FIELD_PHONE_HOME,
+        E_CARD_SIMPLE_FIELD_ORG,
+        E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,
+        E_CARD_SIMPLE_FIELD_ADDRESS_HOME,
+        E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
+        E_CARD_SIMPLE_FIELD_PHONE_CAR,
+        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
+        E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
+        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
+        E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
+        E_CARD_SIMPLE_FIELD_PHONE_ISDN,
+        E_CARD_SIMPLE_FIELD_PHONE_OTHER,
+        E_CARD_SIMPLE_FIELD_PHONE_PAGER,
+        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
+        E_CARD_SIMPLE_FIELD_EMAIL_2,
+        E_CARD_SIMPLE_FIELD_EMAIL_3,
+        E_CARD_SIMPLE_FIELD_URL,
+        E_CARD_SIMPLE_FIELD_ORG_UNIT,
+        E_CARD_SIMPLE_FIELD_OFFICE,
+        E_CARD_SIMPLE_FIELD_TITLE,
+        E_CARD_SIMPLE_FIELD_ROLE,
+        E_CARD_SIMPLE_FIELD_MANAGER,
+        E_CARD_SIMPLE_FIELD_ASSISTANT,
+        E_CARD_SIMPLE_FIELD_NICKNAME,
+        E_CARD_SIMPLE_FIELD_SPOUSE,
+        E_CARD_SIMPLE_FIELD_NOTE,
+        E_CARD_SIMPLE_FIELD_FBURL,
+        E_CARD_SIMPLE_FIELD_ANNIVERSARY,
+        E_CARD_SIMPLE_FIELD_BIRTH_DATE,
+        E_CARD_SIMPLE_FIELD_LAST
 };
 
 typedef struct _ECardSimple ECardSimple;
@@ -120,6 +120,8 @@ struct _ECardSimple {
 	GtkObject object;
 	ECard *card;
 
+	GList *temp_fields;
+
 	ECardPhone *phone[E_CARD_SIMPLE_PHONE_ID_LAST];
 	char *email[E_CARD_SIMPLE_EMAIL_ID_LAST];
 	ECardAddrLabel *address[E_CARD_SIMPLE_ADDRESS_ID_LAST];
@@ -139,6 +141,8 @@ ECardSimple    	     *e_card_simple_duplicate      (ECardSimple *simple);
 	       	     
 char     	     *e_card_simple_get            (ECardSimple          *simple,
 						    ECardSimpleField      field);
+const char     	     *e_card_simple_get_const      (ECardSimple          *simple,
+						    ECardSimpleField      field);
 void           	      e_card_simple_set            (ECardSimple          *simple,
 						    ECardSimpleField      field,
 						    const char           *data);