1 files changed, 9 insertions, 65 deletions

diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index a6f2fda3cc..8afba26b45 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -38,71 +38,16 @@ typedef enum {
 } PASOperation;
 
 typedef struct {
-	PASOperation op;
-	char *id;
-	char *vcard;
-} PASCreateCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *id;
-} PASRemoveCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *vcard;
-} PASModifyCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *id;
-} PASGetVCardRequest;
-
-typedef struct {
-	PASOperation op;
-	char *search;
-} PASGetCursorRequest;
-
-typedef struct {
-	PASOperation op;
-	char *search;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-} PASGetBookViewRequest;
-
-typedef struct {
-	PASOperation op;
-	char *change_id;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-} PASGetChangesRequest;
-
-typedef struct {
-	PASOperation op;
-} PASCheckConnectionRequest;
-
-typedef struct {
-	PASOperation op;
-	char *user;
-        char *passwd;
-	char *auth_method;
-} PASAuthenticateUserRequest;
-
-typedef struct {
-	PASOperation op;
-} PASGetSupportedFieldsRequest;
-
-typedef union {
 	PASOperation               op;
-
-	PASCreateCardRequest       create;
-	PASRemoveCardRequest       remove;
-	PASModifyCardRequest       modify;
-	PASGetVCardRequest         get_vcard;
-	PASGetCursorRequest        get_cursor;
-	PASGetBookViewRequest      get_book_view;
-	PASGetChangesRequest       get_changes;
-	PASCheckConnectionRequest  check_connection;
-	PASAuthenticateUserRequest auth_user;
-	PASGetSupportedFieldsRequest get_supported_fields;
+	char                      *id;
+	char                      *vcard;
+	char                      *search;
+	char                      *change_id;
+	char                      *user;
+        char                      *passwd;
+	char                      *auth_method;
+	GNOME_Evolution_Addressbook_BookViewListener listener;
+	GNOME_Evolution_Addressbook_stringlist fields;
 } PASRequest;
 
 struct _PASBook {
@@ -126,7 +71,6 @@ PASBackend             *pas_book_get_backend            (PASBook
 GNOME_Evolution_Addressbook_BookListener  pas_book_get_listener           (PASBook                           *book);
 int                     pas_book_check_pending          (PASBook                           *book);
 PASRequest             *pas_book_pop_request            (PASBook                           *book);
-void                    pas_book_free_request           (PASRequest                        *request);
 void                    pas_book_respond_open           (PASBook                           *book,
 							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
 void                    pas_book_respond_create         (PASBook                           *book,