Saving progress. Lots of changes. Things are a bit broken at the moment.

svn path=/branches/kill-bonobo/; revision=36260

6 files changed, 533 insertions, 176 deletions

diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 99a875d278..c39598f516 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES =										\
 	-I$(top_srcdir)/addressbook/gui/contact-editor	\
 	-I$(top_srcdir)/addressbook/gui/merging		\
 	-I$(top_srcdir)/addressbook/gui/component	\
+	-I$(top_srcdir)/addressbook/util		\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/shell				\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -54,6 +55,8 @@ libeabwidgets_la_SOURCES =			\
 	e-addressbook-table-adapter.h		\
 	e-addressbook-model.c			\
 	e-addressbook-model.h			\
+	e-addressbook-selector.c		\
+	e-addressbook-selector.h		\
 	e-addressbook-view.c			\
 	e-addressbook-view.h			\
 	gal-view-minicard.c			\
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 345a4e9c8b..95452113e8 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -8,7 +8,6 @@
 #include "eab-marshal.h"
 #include "e-addressbook-reflow-adapter.h"
 #include "e-addressbook-model.h"
-#include "e-addressbook-view.h"
 #include "eab-gui-util.h"
 
 #include "e-minicard.h"
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c
new file mode 100644
index 0000000000..e071e948f4
--- /dev/null
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -0,0 +1,376 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-addressbook-selector.c
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "e-addressbook-selector.h"
+
+#include <eab-book-util.h>
+#include <eab-contact-merging.h>
+
+#define E_ADDRESSBOOK_SELECTOR_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorPrivate))
+
+typedef struct _MergeContext MergeContext;
+
+struct _EAddressbookSelectorPrivate {
+	gint dummy_value;
+};
+
+struct _MergeContext {
+	EBook *source_book;
+	EBook *target_book;
+
+	EContact *current_contact;
+	GList *remaining_contacts;
+	guint pending_removals;
+
+	gint remove_from_source : 1;
+	gint copy_done          : 1;
+};
+
+enum {
+	DND_TARGET_TYPE_VCARD,
+	DND_TARGET_TYPE_SOURCE_VCARD
+};
+
+static GtkTargetEntry drag_types[] = {
+	{ "text/x-vcard", 0, DND_TARGET_TYPE_VCARD },
+	{ "text/x-source-vcard", 0, DND_TARGET_TYPE_SOURCE_VCARD }
+};
+
+static gpointer parent_class;
+
+static void
+merge_context_next (MergeContext *merge_context)
+{
+	GList *list;
+
+	list = merge_context->remaining_contacts;
+	merge_context->current_contact = list->data;
+	list = g_list_delete_link (list, list);
+	merge_context->remaining_contacts = list;
+}
+
+static MergeContext *
+merge_context_new (EBook *source_book,
+                   EBook *target_book,
+                   GList *contact_list)
+{
+	MergeContext *merge_context;
+
+	merge_context = g_slice_new0 (MergeContext);
+	merge_context->source_book = source_book;
+	merge_context->target_book = target_book;
+	merge_context->remaining_contacts = contact_list;
+	merge_context_next (merge_context);
+
+	return merge_context;
+}
+
+static void
+merge_context_free (MergeContext *merge_context)
+{
+	if (merge_context->source_book != NULL)
+		g_object_unref (merge_context->source_book);
+
+	if (merge_context->target_book != NULL)
+		g_object_unref (merge_context->target_book);
+
+	g_slice_free (MergeContext, merge_context);
+}
+
+static void
+addressbook_selector_removed_cb (EBook *book,
+                                 EBookStatus status,
+                                 MergeContext *merge_context)
+{
+	merge_context->pending_removals--;
+
+	if (merge_context->remaining_contacts != NULL)
+		return;
+
+	if (merge_context->pending_removals > 0)
+		return;
+
+	merge_context_free (merge_context);
+}
+
+static void
+addressbook_selector_merge_next_cb (EBook *book,
+                                    EBookStatus status,
+                                    const gchar *id,
+                                    MergeContext *merge_context)
+{
+	if (merge_context->remove_from_source && status == E_BOOK_ERROR_OK) {
+		/* Remove previous contact from source. */
+		e_book_async_remove_contact (
+			merge_context->source_book,
+			merge_context->current_contact,
+			(EBookCallback) addressbook_selector_removed_cb,
+			merge_context);
+		merge_context->pending_removals++;
+	}
+
+	g_object_unref (merge_context->current_contact);
+
+	if (merge_context->remaining_contacts != NULL) {
+		merge_context_next (merge_context);
+		eab_merging_book_add_contact (
+			merge_context->target_book,
+			merge_context->current_contact,
+			(EBookIdCallback) addressbook_selector_merge_next_cb,
+			merge_context);
+
+	} else if (merge_context->pending_removals == 0)
+		merge_context_free (merge_context);
+}
+
+static void
+addressbook_selector_drag_leave (GtkWidget *widget,
+                                 GdkDragContext *context,
+                                 guint time_)
+{
+	GtkTreeView *tree_view;
+	GtkTreeViewDropPosition pos;
+
+	tree_view = GTK_TREE_VIEW (widget);
+	pos = GTK_TREE_VIEW_DROP_BEFORE;
+
+	gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos);
+}
+
+static gboolean
+addressbook_selector_drag_motion (GtkWidget *widget,
+                                  GdkDragContext *context,
+                                  gint x,
+                                  gint y,
+                                  guint time_)
+{
+	GtkTreeView *tree_view;
+	GtkTreeModel *model;
+	GtkTreePath *path = NULL;
+	GtkTreeIter iter;
+	GtkTreeViewDropPosition pos;
+	GdkDragAction action = 0;
+	gpointer object;
+
+	tree_view = GTK_TREE_VIEW (widget);
+	model = gtk_tree_view_get_model (tree_view);
+
+	if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
+		goto exit;
+
+	if (!gtk_tree_model_get_iter (model, &iter, path))
+		goto exit;
+
+	gtk_tree_model_get (model, &iter, 0, &object, -1);
+
+	if (!E_IS_SOURCE (object) || e_source_get_readonly (object))
+		goto exit;
+
+	gtk_tree_view_set_drag_dest_row (
+		tree_view, path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
+
+	pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
+	gtk_tree_view_set_drag_dest_row (tree_view, path, pos);
+
+	if (context->actions & GDK_ACTION_MOVE)
+		action = GDK_ACTION_MOVE;
+	else
+		action = context->suggested_action;
+
+exit:
+	if (path != NULL)
+		gtk_tree_path_free (path);
+
+	if (object != NULL)
+		g_object_ref (object);
+
+	gdk_drag_status (context, action, GDK_CURRENT_TIME);
+
+	return TRUE;
+}
+
+static gboolean
+addressbook_selector_drag_drop (GtkWidget *widget,
+                                GdkDragContext *context,
+                                gint x,
+                                gint y,
+                                guint time_)
+{
+	GtkTreeView *tree_view;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	gboolean drop_zone;
+	gboolean valid;
+	gpointer object;
+
+	tree_view = GTK_TREE_VIEW (widget);
+	model = gtk_tree_view_get_model (tree_view);
+
+	if (!gtk_tree_view_get_path_at_pos (
+		tree_view, x, y, &path, NULL, NULL, NULL))
+		return FALSE;
+
+	valid = gtk_tree_model_get_iter (model, &iter, path);
+	gtk_tree_path_free (path);
+	g_return_val_if_fail (valid, FALSE);
+
+	gtk_tree_model_get (model, &iter, 0, &object, -1);
+	drop_zone = !E_IS_SOURCE_GROUP (object);
+	g_object_unref (object);
+
+	return drop_zone;
+}
+
+static void
+addressbook_selector_drag_data_received (GtkWidget *widget,
+                                         GdkDragContext *context,
+                                         gint x,
+                                         gint y,
+                                         GtkSelectionData *selection_data,
+                                         guint info,
+                                         guint time_)
+{
+	MergeContext *merge_context;
+	GtkTreeView *tree_view;
+	GtkTreeModel *model;
+	GtkTreePath *path = NULL;
+	GtkTreeIter iter;
+	EBook *source_book;
+	EBook *target_book;
+	GList *list;
+	const gchar *string;
+	gboolean remove_from_source;
+	gboolean success = FALSE;
+	gpointer object;
+
+	tree_view = GTK_TREE_VIEW (widget);
+	model = gtk_tree_view_get_model (tree_view);
+
+	string = (gchar *) selection_data->data;
+	remove_from_source = (context->action == GDK_ACTION_MOVE);
+
+	if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL))
+		goto exit;
+
+	if (!gtk_tree_model_get_iter (model, &iter, path))
+		goto exit;
+
+	gtk_tree_model_get (model, &iter, 0, &object, -1);
+
+	if (!E_IS_SOURCE (object) || e_source_get_readonly (object))
+		goto exit;
+
+	target_book = e_book_new (object, NULL);
+	if (target_book == NULL)
+		goto exit;
+
+	e_book_open (target_book, FALSE, NULL);
+
+	eab_book_and_contact_list_from_string (string, &source_book, &list);
+	if (list == NULL)
+		goto exit;
+
+	/* XXX Get the currently selected EBook. */
+
+	merge_context = merge_context_new (source_book, target_book, list);
+	merge_context->remove_from_source = remove_from_source;
+
+	eab_merging_book_add_contact (
+		target_book, merge_context->current_contact,
+		(EBookIdCallback) addressbook_selector_merge_next_cb,
+		merge_context);
+
+	success = TRUE;
+
+exit:
+	if (path)
+		gtk_tree_path_free (path);
+
+	if (object)
+		g_object_unref (object);
+
+	gtk_drag_finish (context, success, remove_from_source, time_);
+}
+
+static void
+addressbook_selector_class_init (EAddressbookSelectorClass *class)
+{
+	GtkWidgetClass *widget_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EAddressbookSelectorPrivate));
+
+	widget_class = GTK_WIDGET_CLASS (class);
+	widget_class->drag_leave = addressbook_selector_drag_leave;
+	widget_class->drag_motion = addressbook_selector_drag_motion;
+	widget_class->drag_drop = addressbook_selector_drag_drop;
+	widget_class->drag_data_received = addressbook_selector_drag_data_received;
+}
+
+static void
+addressbook_selector_init (EAddressbookSelector *selector)
+{
+	selector->priv = E_ADDRESSBOOK_SELECTOR_GET_PRIVATE (selector);
+
+	gtk_drag_dest_set (
+		GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL,
+		drag_types, G_N_ELEMENTS (drag_types),
+		GDK_ACTION_COPY | GDK_ACTION_MOVE);
+}
+
+GType
+e_addressbook_selector_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		const GTypeInfo type_info = {
+			sizeof (EAddressbookSelectorClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) addressbook_selector_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (EAddressbookSelector),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) addressbook_selector_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			E_TYPE_SOURCE_SELECTOR, "EAddressbookSelector",
+			&type_info, 0);
+	}
+
+	return type;
+}
+
+GtkWidget *
+e_addressbook_selector_new (ESourceList *source_list)
+{
+	g_return_val_if_fail (E_IS_SOURCE_LIST (source_list), NULL);
+
+	return g_object_new (
+		E_TYPE_ADDRESSBOOK_SELECTOR,
+		"source-list", source_list, NULL);
+}
diff --git a/addressbook/gui/widgets/e-addressbook-selector.h b/addressbook/gui/widgets/e-addressbook-selector.h
new file mode 100644
index 0000000000..f78442601d
--- /dev/null
+++ b/addressbook/gui/widgets/e-addressbook-selector.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-addressbook-selector.h
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef E_ADDRESSBOOK_SELECTOR_H
+#define E_ADDRESSBOOK_SELECTOR_H
+
+#include <libedataserver/e-source-list.h>
+#include <libedataserverui/e-source-selector.h>
+
+/* Standard GObject macros */
+#define E_TYPE_ADDRESSBOOK_SELECTOR \
+	(e_addressbook_selector_get_type ())
+#define E_ADDRESSBOOK_SELECTOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelector))
+#define E_ADDRESSBOOK_SELECTOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorClass))
+#define E_IS_ADDRESSBOOK_SELECTOR(obj) \
+	(E_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_ADDRESSBOOK_SELECTOR))
+#define E_IS_ADDRESSBOOK_SELECTOR_CLASS(cls) \
+	(E_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_ADDRESSBOOK_SELECTOR))
+#define E_ADDRESSBOOK_SELECTOR_GET_CLASS(obj) \
+	(E_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EAddressbookSelector EAddressbookSelector;
+typedef struct _EAddressbookSelectorClass EAddressbookSelectorClass;
+typedef struct _EAddressbookSelectorPrivate EAddressbookSelectorPrivate;
+
+struct _EAddressbookSelector {
+	ESourceSelector parent;
+	EAddressbookSelectorPrivate *priv;
+};
+
+struct _EAddressbookSelectorClass {
+	ESourceSelectorClass parent_class;
+};
+
+GType		e_addressbook_selector_get_type	(void);
+GtkWidget *	e_addressbook_selector_new	(ESourceList *source_list);
+
+G_END_DECLS
+
+#endif /* E_ADDRESSBOOK_SELECTOR_H */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index ecae7ed8c3..d44898ba1a 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -156,10 +156,10 @@ enum {
 
 #if 0
 static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Name begins with"), ESB_FULL_NAME, ESB_ITEMTYPE_RADIO },
-	{ N_("Email begins with"), ESB_EMAIL, ESB_ITEMTYPE_RADIO },
-	{ N_("Any field contains"), ESB_ANY, ESB_ITEMTYPE_RADIO },
-	{ NULL, -1, 0 }
+	{ N_("Name begins with"), ESB_FULL_NAME },
+	{ N_("Email begins with"), ESB_EMAIL },
+	{ N_("Any field contains"), ESB_ANY },
+	{ NULL, -1 }
 };
 #endif
 
@@ -293,7 +293,7 @@ eab_view_init (EABView *eav)
 	eav->displayed_contact = -1;
 
 	eav->view_instance = NULL;
-	eav->view_menus = NULL;
+	/*eav->view_menus = NULL;*/
 	eav->current_view = NULL;
 	eav->uic = NULL;
 
@@ -343,10 +343,10 @@ eab_view_dispose (GObject *object)
 		eav->view_instance = NULL;
 	}
 
-	if (eav->view_menus) {
+	/*if (eav->view_menus) {
 		g_object_unref (eav->view_menus);
 		eav->view_menus = NULL;
-	}
+	}*/
 
 	if (eav->clipboard_contacts) {
 		g_list_foreach (eav->clipboard_contacts, (GFunc)g_object_unref, NULL);
@@ -541,72 +541,6 @@ writable_status (GtkObject *object, gboolean writable, EABView *eav)
 }
 
 static void
-init_collection (void)
-{
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-	char *addressbookdir;
-	char *etspecfile;
-
-	if (collection == NULL) {
-		collection = gal_view_collection_new();
-
-		gal_view_collection_set_title (collection, _("Address Book"));
-
-		galview = gnome_util_prepend_user_home("/.evolution/addressbook/views");
-		addressbookdir = g_build_filename (EVOLUTION_GALVIEWSDIR,
-						   "addressbook",
-						   NULL);
-		gal_view_collection_set_storage_directories
-			(collection,
-			 addressbookdir,
-			 galview);
-		g_free(addressbookdir);
-		g_free(galview);
-
-		spec = e_table_specification_new();
-		etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
-					       "e-addressbook-view.etspec",
-					       NULL);
-		if (!e_table_specification_load_from_file (spec, etspecfile))
-			g_error ("Unable to load ETable specification file "
-				 "for address book");
-		g_free (etspecfile);
-
-		factory = gal_view_factory_etable_new (spec);
-		g_object_unref (spec);
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-		factory = gal_view_factory_minicard_new();
-		gal_view_collection_add_factory (collection, factory);
-		g_object_unref (factory);
-
-		gal_view_collection_load(collection);
-	}
-}
-
-static void
-set_view_preview (EABView *view)
-{
-	/* XXX this should use the addressbook's global gconf client */
-	GConfClient *gconf_client;
-	gboolean state;
-
-	gconf_client = gconf_client_get_default();
-	state = gconf_client_get_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", NULL);
-	bonobo_ui_component_set_prop (view->uic,
-				      "/commands/ContactsViewPreview",
-				      "state",
-				      state ? "1" : "0", NULL);
-
-	eab_view_show_contact_preview (view, state);
-
-	g_object_unref (gconf_client);
-}
-
-static void
 display_view(GalViewInstance *instance,
 	     GalView *view,
 	     gpointer data)
@@ -623,48 +557,24 @@ display_view(GalViewInstance *instance,
 	address_view->current_view = view;
 
 	set_paned_position (address_view);
-	set_view_preview (address_view);
-}
-
-static void
-view_preview(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
-{
-	/* XXX this should use the addressbook's global gconf client */
-	GConfClient *gconf_client;
-	EABView *view = EAB_VIEW (data);
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	gconf_client = gconf_client_get_default();
-	gconf_client_set_bool(gconf_client, "/apps/evolution/addressbook/display/show_preview", state[0] != '0', NULL);
-
-	eab_view_show_contact_preview(view, state[0] != '0');
-
-	g_object_unref (gconf_client);
 }
 
 static void
 setup_menus (EABView *view)
 {
 	if (view->book && view->view_instance == NULL) {
-		init_collection ();
 		view->view_instance = gal_view_instance_new (collection, e_book_get_uri (view->book));
 	}
 
 	if (view->view_instance && view->uic) {
-		view->view_menus = gal_view_menus_new(view->view_instance);
-		gal_view_menus_apply(view->view_menus, view->uic, NULL);
+		/*view->view_menus = gal_view_menus_new(view->view_instance);
+		gal_view_menus_apply(view->view_menus, view->uic, NULL);*/
 
 		display_view (view->view_instance, gal_view_instance_get_current_view (view->view_instance), view);
 
 		g_signal_connect(view->view_instance, "display_view",
 				 G_CALLBACK (display_view), view);
 	}
-
-	bonobo_ui_component_add_listener(view->uic, "ContactsViewPreview", view_preview, view);
-
-	set_view_preview (view);
 }
 
 static void
@@ -1635,8 +1545,6 @@ eab_view_setup_menus (EABView *view,
 	g_return_if_fail (uic != NULL);
 	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
 
-	init_collection ();
-
 	view->uic = uic;
 
 	setup_menus (view);
@@ -1660,12 +1568,12 @@ eab_view_discard_menus (EABView *view)
 	g_return_if_fail (view != NULL);
 	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
 
-	if (view->view_menus) {
+	/*if (view->view_menus) {
 		gal_view_menus_unmerge (view->view_menus, NULL);
 
 		g_object_unref (view->view_menus);
 		view->view_menus = NULL;
-	}
+	}*/
 
 	if (view->view_instance) {
 		g_object_unref (view->view_instance);
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 2303d6b06f..af5d50a78f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -17,8 +17,8 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __EAB_VIEW_H__
-#define __EAB_VIEW_H__
+#ifndef EAB_VIEW_H
+#define EAB_VIEW_H
 
 #include <gtk/gtk.h>
 #include <bonobo/bonobo-ui-component.h>
@@ -26,29 +26,33 @@
 #include <libebook/e-book.h>
 #include "e-addressbook-model.h"
 #include "eab-contact-display.h"
-#include "widgets/menus/gal-view-menus.h"
 #include "misc/e-search-bar.h"
 #include "misc/e-filter-bar.h"
 
+/* Standard GObject macros */
+#define E_TYPE_AB_VIEW \
+	(eab_view_get_type ())
+#define EAB_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_AB_VIEW, EABView))
+#define EAB_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_AB_VIEW, EABViewClass))
+#define E_IS_ADDRESSBOOK_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_AB_VIEW))
+#define E_IS_ADDRESSBOOK_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((obj), E_TYPE_AB_VIEW))
+#define E_ADDRESSBOOK_VIEW_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_AB_VIEW, EABViewClass))
+
 G_BEGIN_DECLS
 
 struct _EABMenu;
 struct _EABMenuTargetSelect;
 
-/* EABView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TYPE_AB_VIEW                          (eab_view_get_type ())
-#define EAB_VIEW(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_AB_VIEW, EABView))
-#define EAB_VIEW_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_AB_VIEW, EABViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_AB_VIEW))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_AB_VIEW))
-
 typedef enum {
 	EAB_VIEW_NONE, /* initialized to this */
 	EAB_VIEW_MINICARD,
@@ -56,11 +60,10 @@ typedef enum {
 } EABViewType;
 
 
-typedef struct _EABView       EABView;
-typedef struct _EABViewClass  EABViewClass;
+typedef struct _EABView EABView;
+typedef struct _EABViewClass EABViewClass;
 
-struct _EABView
-{
+struct _EABView {
 	GtkVBox parent;
 
 	/* item specific fields */
@@ -87,7 +90,7 @@ struct _EABView
 
 	/* Menus handler and the view instance */
 	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
+	/*GalViewMenus *view_menus;*/
 	GalView *current_view;
 	BonoboUIComponent *uic;
 
@@ -98,64 +101,66 @@ struct _EABView
 	FilterRule  *search_rule;
 };
 
-struct _EABViewClass
-{
+struct _EABViewClass {
 	GtkVBoxClass parent_class;
 
-	/*
-	 * Signals
-	 */
+	/* Signals */
 	void (*status_message)        (EABView *view, const gchar *message);
 	void (*search_result)         (EABView *view, EBookViewStatus status);
 	void (*folder_bar_message)    (EABView *view, const gchar *message);
 	void (*command_state_change)  (EABView *view);
 };
 
-GtkWidget *eab_view_new                 (void);
-GType      eab_view_get_type            (void);
-
-void       eab_view_show_contact_preview (EABView *view, gboolean show);
-
-void       eab_view_setup_menus         (EABView  *view,
-					 BonoboUIComponent *uic);
-void       eab_view_discard_menus       (EABView  *view);
-
-RuleContext *eab_view_peek_search_context (EABView *view);
-FilterRule  *eab_view_peek_search_rule    (EABView *view);
-
-void       eab_view_save_as             (EABView  *view, gboolean all);
-void       eab_view_view                (EABView  *view);
-void       eab_view_send                (EABView  *view);
-void       eab_view_send_to             (EABView  *view);
-void       eab_view_print               (EABView  *view,
-                                         GtkPrintOperationAction action);
-void       eab_view_delete_selection    (EABView  *view, gboolean is_delete);
-void       eab_view_cut                 (EABView  *view);
-void       eab_view_copy                (EABView  *view);
-void       eab_view_paste               (EABView  *view);
-void       eab_view_select_all          (EABView  *view);
-void       eab_view_show_all            (EABView  *view);
-void       eab_view_stop                (EABView  *view);
-void       eab_view_copy_to_folder      (EABView  *view, gboolean all);
-void       eab_view_move_to_folder      (EABView  *view, gboolean all);
-
-gboolean   eab_view_can_create          (EABView  *view);
-gboolean   eab_view_can_print           (EABView  *view);
-gboolean   eab_view_can_save_as         (EABView  *view);
-gboolean   eab_view_can_view            (EABView  *view);
-gboolean   eab_view_can_send            (EABView  *view);
-gboolean   eab_view_can_send_to         (EABView  *view);
-gboolean   eab_view_can_delete          (EABView  *view);
-gboolean   eab_view_can_cut             (EABView  *view);
-gboolean   eab_view_can_copy            (EABView  *view);
-gboolean   eab_view_can_paste           (EABView  *view);
-gboolean   eab_view_can_select_all      (EABView  *view);
-gboolean   eab_view_can_stop            (EABView  *view);
-gboolean   eab_view_can_copy_to_folder  (EABView  *view);
-gboolean   eab_view_can_move_to_folder  (EABView  *view);
-
-struct _EABMenuTargetSelect *eab_view_get_menu_target (EABView *view, struct _EABMenu *menu);
+GType		eab_view_get_type		(void);
+GtkWidget *	eab_view_new			(void);
+void		eab_view_show_contact_preview	(EABView *view,
+						 gboolean show);
+void		eab_view_setup_menus		(EABView *view,
+						 BonoboUIComponent *uic);
+void		eab_view_discard_menus		(EABView *view);
+
+RuleContext *	eab_view_peek_search_context	(EABView *view);
+FilterRule *	eab_view_peek_search_rule	(EABView *view);
+
+void		eab_view_save_as		(EABView *view,
+						 gboolean all);
+void		eab_view_view			(EABView *view);
+void		eab_view_send			(EABView *view);
+void		eab_view_send_to		(EABView *view);
+void		eab_view_print			(EABView *view,
+						 GtkPrintOperationAction action);
+void		eab_view_delete_selection	(EABView *view,
+						 gboolean is_delete);
+void		eab_view_cut			(EABView *view);
+void		eab_view_copy			(EABView *view);
+void		eab_view_paste			(EABView *view);
+void		eab_view_select_all		(EABView *view);
+void		eab_view_show_all		(EABView *view);
+void		eab_view_stop			(EABView *view);
+void		eab_view_copy_to_folder		(EABView *view,
+						 gboolean all);
+void		eab_view_move_to_folder		(EABView *view,
+						 gboolean all);
+
+gboolean	eab_view_can_create		(EABView *view);
+gboolean	eab_view_can_print		(EABView *view);
+gboolean	eab_view_can_save_as		(EABView *view);
+gboolean	eab_view_can_view		(EABView *view);
+gboolean	eab_view_can_send		(EABView *view);
+gboolean	eab_view_can_send_to		(EABView *view);
+gboolean	eab_view_can_delete		(EABView *view);
+gboolean	eab_view_can_cut		(EABView *view);
+gboolean	eab_view_can_copy		(EABView *view);
+gboolean	eab_view_can_paste		(EABView *view);
+gboolean	eab_view_can_select_all		(EABView *view);
+gboolean	eab_view_can_stop		(EABView *view);
+gboolean	eab_view_can_copy_to_folder	(EABView *view);
+gboolean	eab_view_can_move_to_folder	(EABView *view);
+
+struct _EABMenuTargetSelect *
+		eab_view_get_menu_target	(EABView *view,
+						 struct _EABMenu *menu);
 
 G_END_DECLS
 
-#endif /* __EAB_VIEW_H__ */
+#endif /* EAB_VIEW_H */