Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965

1 files changed, 7 insertions, 6 deletions

diff --git a/addressbook/backend/pas/pas-backend-card-sexp.h b/addressbook/backend/pas/pas-backend-card-sexp.h
index eb7c7c6641..7efb697fb0 100644
--- a/addressbook/backend/pas/pas-backend-card-sexp.h
+++ b/addressbook/backend/pas/pas-backend-card-sexp.h
@@ -26,7 +26,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <ebook/e-card.h>
+#include <ebook/e-contact.h>
+#include <pas/pas-types.h>
 
 #define PAS_TYPE_BACKEND_CARD_SEXP        (pas_backend_card_sexp_get_type ())
 #define PAS_BACKEND_CARD_SEXP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), PAS_TYPE_BACKEND_CARD_SEXP, PASBackendCardSExp))
@@ -37,19 +38,19 @@
 
 typedef struct _PASBackendCardSExpPrivate PASBackendCardSExpPrivate;
 
-typedef struct {
+struct _PASBackendCardSExp {
 	GObject parent_object;
 	PASBackendCardSExpPrivate *priv;
-} PASBackendCardSExp;
+};
 
-typedef struct {
+struct _PASBackendCardSExpClass {
 	GObjectClass parent_class;
-} PASBackendCardSExpClass;
+};
 
 PASBackendCardSExp *pas_backend_card_sexp_new      (const char *text);
 GType               pas_backend_card_sexp_get_type (void);
 
 gboolean            pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard);
-gboolean            pas_backend_card_sexp_match_ecard (PASBackendCardSExp *sexp, ECard *ecard);
+gboolean            pas_backend_card_sexp_match_contact (PASBackendCardSExp *sexp, EContact *contact);
 
 #endif /* __PAS_BACKEND_CARD_SEXP_H__ */