Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965

1 files changed, 39 insertions, 44 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 57cfe6f729..35f9d0e87f 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -1,37 +1,34 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_MODEL_H_
-#define _E_ADDRESSBOOK_MODEL_H_
+#ifndef _EAB_MODEL_H_
+#define _EAB_MODEL_H_
 
 #include <glib.h>
 #include <glib-object.h>
-#include "addressbook/backend/ebook/e-book.h"
+#include "addressbook/backend/ebook/e-book-async.h"
 #include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
 
-#define E_TYPE_ADDRESSBOOK_MODEL        (e_addressbook_model_get_type ())
-#define E_ADDRESSBOOK_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModel))
-#define E_ADDRESSBOOK_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelClass))
-#define E_IS_ADDRESSBOOK_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_MODEL))
-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_MODEL))
+#define EAB_TYPE_MODEL                  (eab_model_get_type ())
+#define EAB_MODEL(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_MODEL, EABModel))
+#define EAB_MODEL_CLASS(k)              (G_TYPE_CHECK_CLASS_CAST((k), EAB_TYPE_MODEL, EABModelClass))
+#define E_IS_ADDRESSBOOK_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EAB_TYPE_MODEL))
+#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EAB_TYPE_MODEL))
 
-typedef struct _EAddressbookModel EAddressbookModel;
-typedef struct _EAddressbookModelClass EAddressbookModelClass;
+typedef struct _EABModel EABModel;
+typedef struct _EABModelClass EABModelClass;
 
-struct _EAddressbookModel {
+struct _EABModel {
 	GObject parent;
 
 	/* item specific fields */
 	EBook *book;
-	char *query;
+	EBookQuery *query;
 	EBookView *book_view;
 
-	int get_view_idle;
-
-	ECard **data;
+	EContact **data;
 	int data_count;
 	int allocated_count;
 
-	int create_card_id, remove_card_id, modify_card_id;
+	int create_contact_id, remove_contact_id, modify_contact_id;
 	int status_message_id, writable_status_id, sequence_complete_id;
 	int backend_died_id;
 
@@ -42,44 +39,42 @@ struct _EAddressbookModel {
 };
 
 
-struct _EAddressbookModelClass {
+struct _EABModelClass {
 	GObjectClass parent_class;
 
 	/*
 	 * Signals
 	 */
-	void (*writable_status)    (EAddressbookModel *model, gboolean writable);
-	void (*search_started)     (EAddressbookModel *model);
-	void (*search_result)      (EAddressbookModel *model, EBookViewStatus status);
-	void (*status_message)     (EAddressbookModel *model, const gchar *message);
-	void (*folder_bar_message) (EAddressbookModel *model, const gchar *message);
-	void (*card_added)         (EAddressbookModel *model, gint index, gint count);
-	void (*card_removed)       (EAddressbookModel *model, gint index);
-	void (*card_changed)       (EAddressbookModel *model, gint index);
-	void (*model_changed)      (EAddressbookModel *model);
-	void (*stop_state_changed) (EAddressbookModel *model);
-	void (*backend_died)       (EAddressbookModel *model);
+	void (*writable_status)    (EABModel *model, gboolean writable);
+	void (*search_started)     (EABModel *model);
+	void (*search_result)      (EABModel *model, EBookViewStatus status);
+	void (*status_message)     (EABModel *model, const gchar *message);
+	void (*folder_bar_message) (EABModel *model, const gchar *message);
+	void (*contact_added)      (EABModel *model, gint index, gint count);
+	void (*contact_removed)    (EABModel *model, gint index);
+	void (*contact_changed)    (EABModel *model, gint index);
+	void (*model_changed)      (EABModel *model);
+	void (*stop_state_changed) (EABModel *model);
+	void (*backend_died)       (EABModel *model);
 };
 
 
-GType              e_addressbook_model_get_type                  (void);
-EAddressbookModel *e_addressbook_model_new                       (void);
+GType              eab_model_get_type                  (void);
+EABModel          *eab_model_new                       (void);
 
 /* Returns object with ref count of 1. */
-ECard             *e_addressbook_model_get_card                  (EAddressbookModel *model,
-								  int                row);
-const ECard       *e_addressbook_model_peek_card                 (EAddressbookModel *model,
-								  int                row);
-EBook             *e_addressbook_model_get_ebook                 (EAddressbookModel *model);
+EContact          *eab_model_get_contact               (EABModel *model,
+							int                row);
+EBook             *eab_model_get_ebook                 (EABModel *model);
 
-void               e_addressbook_model_stop                      (EAddressbookModel *model);
-gboolean           e_addressbook_model_can_stop                  (EAddressbookModel *model);
+void               eab_model_stop                      (EABModel *model);
+gboolean           eab_model_can_stop                  (EABModel *model);
 
-void               e_addressbook_model_force_folder_bar_message  (EAddressbookModel *model);
+void               eab_model_force_folder_bar_message  (EABModel *model);
 
-int                e_addressbook_model_card_count                (EAddressbookModel *model);
-ECard             *e_addressbook_model_card_at                   (EAddressbookModel *model,
-								  int                index);
-gboolean           e_addressbook_model_editable                  (EAddressbookModel *model);
+int                eab_model_contact_count             (EABModel *model);
+const EContact    *eab_model_contact_at                (EABModel *model,
+							int                index);
+gboolean           eab_model_editable                  (EABModel *model);
 
-#endif /* _E_ADDRESSBOOK_MODEL_H_ */
+#endif /* _EAB_MODEL_H_ */