Implemented "MAILER" field. Added arbitrary field support.

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

	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
	backend/ebook/e-card-types.h, backend/ebook/e-card.c,
	backend/ebook/e-card.h: Implemented "MAILER" field.  Added
	arbitrary field support.

	* contact-editor/e-contact-editor-categories.c: Fixed a warning.

svn path=/trunk/; revision=3117

1 files changed, 55 insertions, 42 deletions

diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
index 855747777d..9566248387 100644
--- a/addressbook/backend/ebook/e-card-simple.h
+++ b/addressbook/backend/ebook/e-card-simple.h
@@ -131,54 +131,67 @@ struct _ECardSimple {
 struct _ECardSimpleClass {
 	GtkObjectClass parent_class;
 };
+
+typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
 	       
-ECardSimple    	     *e_card_simple_new            (ECard *card);
-char           	     *e_card_simple_get_id         (ECardSimple *simple);
-void           	      e_card_simple_set_id         (ECardSimple *simple,
-						    const gchar *character);
-char           	     *e_card_simple_get_vcard      (ECardSimple *simple);
-	       	     
-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);
-	       					    
-ECardSimpleType	      e_card_simple_type           (ECardSimple          *simple,
-						    ECardSimpleField      field);
-const char     	     *e_card_simple_get_name       (ECardSimple          *simple,
-						    ECardSimpleField      field);
-const char     	     *e_card_simple_get_short_name (ECardSimple          *simple,
-						    ECardSimpleField      field);
+ECardSimple    	     *e_card_simple_new               (ECard *card);
+char           	     *e_card_simple_get_id            (ECardSimple *simple);
+void           	      e_card_simple_set_id            (ECardSimple *simple,
+						       const gchar *character);
+char           	     *e_card_simple_get_vcard         (ECardSimple *simple);
+	       	     				      
+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);
+	       					       
+ECardSimpleType	      e_card_simple_type              (ECardSimple          *simple,
+						       ECardSimpleField      field);
+const char     	     *e_card_simple_get_name          (ECardSimple          *simple,
+						       ECardSimpleField      field);
+const char     	     *e_card_simple_get_short_name    (ECardSimple          *simple,
+						       ECardSimpleField      field);
 
 
 /* Use these only if building lists of specific types.  It should be
  * easier to use the above if you consider a phone field to be the
  * same as any other field.
  */
-const ECardPhone     *e_card_simple_get_phone      (ECardSimple          *simple,
-						    ECardSimplePhoneId    id);
-const char           *e_card_simple_get_email      (ECardSimple          *simple,
-						    ECardSimpleEmailId    id);
-const ECardAddrLabel *e_card_simple_get_address    (ECardSimple          *simple,
-						    ECardSimpleAddressId  id);
-void                  e_card_simple_set_phone      (ECardSimple          *simple,
-						    ECardSimplePhoneId    id,
-						    const ECardPhone     *phone);
-void                  e_card_simple_set_email      (ECardSimple          *simple,
-						    ECardSimpleEmailId    id,
-						    const char           *email);
-void                  e_card_simple_set_address    (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardAddrLabel *address);
-						   
-void                  e_card_simple_sync_card      (ECardSimple *simple);
-
-/* Standard Gtk function */
-GtkType               e_card_simple_get_type       (void);
+const ECardPhone     *e_card_simple_get_phone         (ECardSimple          *simple,
+						       ECardSimplePhoneId    id);
+const char           *e_card_simple_get_email         (ECardSimple          *simple,
+						       ECardSimpleEmailId    id);
+const ECardAddrLabel *e_card_simple_get_address       (ECardSimple          *simple,
+						       ECardSimpleAddressId  id);
+void                  e_card_simple_set_phone         (ECardSimple          *simple,
+						       ECardSimplePhoneId    id,
+						       const ECardPhone     *phone);
+void                  e_card_simple_set_email         (ECardSimple          *simple,
+						       ECardSimpleEmailId    id,
+						       const char           *email);
+void                  e_card_simple_set_address       (ECardSimple          *simple,
+						       ECardSimpleAddressId  id,
+						       const ECardAddrLabel *address);
+
+void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,
+						       ECardSimpleArbitraryCallback *callback,
+						       gpointer                      closure);
+const ECardArbitrary *e_card_simple_get_arbitrary     (ECardSimple          *simple,
+						       const char           *key);
+/* Any of these except key can be NULL */	      
+void                  e_card_simple_set_arbitrary     (ECardSimple          *simple,
+						       const char           *key,
+						       const char           *type,
+						       const char           *value);
+						      
+void                  e_card_simple_sync_card         (ECardSimple *simple);
+
+/* Standard Gtk function */			      
+GtkType               e_card_simple_get_type          (void);
 
 #endif /* ! __E_CARD_SIMPLE_H__ */