Use -no-undefined on Linux too

There still left two things opened, search for KILL-BONOBO to find them.
One is in calendar's Makefile.am, one in composer.

18 files changed, 1133 insertions, 25 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index e48ef4619e..42b22639dc 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -65,9 +65,7 @@ libevolution_module_addressbook_la_LIBADD =						\
 	$(top_builddir)/widgets/text/libetext.la					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
 	$(top_builddir)/widgets/menus/libmenus.la					\
-	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la		\
 	$(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la	\
-	$(WIN32_BOOTSTRAP_LIBS)								\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index a267f09b13..681836f07b 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
-endif
-
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
@@ -30,7 +26,6 @@ libecontacteditor_la_SOURCES = 			\
 libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
 
 libecontacteditor_la_LIBADD =						\
-	$(WIN32_BOOTSTRAP_LIBS)						\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 8e287f3f3a..87fd18ca90 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la
-endif
-
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
@@ -25,7 +21,6 @@ libecontactlisteditor_la_SOURCES = 		\
 libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
 
 libecontactlisteditor_la_LIBADD =						\
-	$(WIN32_BOOTSTRAP_LIBS)							\
 	$(top_builddir)/addressbook/util/libeabutil.la				\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la	\
 	$(top_builddir)/widgets/table/libetable.la				\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 9e3affcb2f..45c0b0cba3 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -51,11 +51,22 @@ libeabwidgets_la_SOURCES =			\
 	gal-view-minicard.c			\
 	gal-view-minicard.h			\
 	gal-view-factory-minicard.c		\
-	gal-view-factory-minicard.h
+	gal-view-factory-minicard.h		\
+	a11y/ea-minicard.c			\
+	a11y/ea-minicard.h			\
+	a11y/ea-minicard-view.c			\
+	a11y/ea-minicard-view.h			\
+	a11y/ea-addressbook-view.c		\
+	a11y/ea-addressbook-view.h		\
+	a11y/ea-addressbook.c			\
+	a11y/ea-addressbook.h
 
 libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la
+	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/widgets/table/libetable.la		\
+	$(top_builddir)/widgets/menus/libmenus.la		\
+	$(top_builddir)/a11y/libevolution-a11y.la
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.c b/addressbook/gui/widgets/a11y/ea-addressbook-view.c
new file mode 100644
index 0000000000..eff7eb4044
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-addressbook-view.c
@@ -0,0 +1,123 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include <config.h>
+
+#include <glib/gi18n.h>
+#include "ea-addressbook-view.h"
+
+static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar* ea_ab_view_get_description (AtkObject *accessible);
+
+static void ea_ab_view_class_init (EAddressbookViewClass *class);
+
+static gpointer parent_class = NULL;
+
+GType
+ea_ab_view_get_type (void)
+{
+	static GType type = 0;
+	AtkObjectFactory *factory;
+	GTypeQuery query;
+	GType derived_atk_type;
+
+	if (!type) {
+		static  GTypeInfo tinfo =  {
+			sizeof (EAddressbookViewClass),
+			(GBaseInitFunc) NULL,  /* base_init */
+			(GBaseFinalizeFunc) NULL,  /* base_finalize */
+			(GClassInitFunc) ea_ab_view_class_init,
+			(GClassFinalizeFunc) NULL, /* class_finalize */
+			NULL,	/* class_data */
+			sizeof (EAddressbookView),
+			0,	/* n_preallocs */
+			(GInstanceInitFunc) NULL, /* instance init */
+			NULL	/* value table */
+		};
+
+		/*
+		 * Figure out the size of the class and instance
+		 * we are run-time deriving from (GailWidget, in this case) */
+
+		factory = atk_registry_get_factory (atk_get_default_registry (),
+						    GTK_TYPE_EVENT_BOX);
+		derived_atk_type = atk_object_factory_get_accessible_type (factory);
+		g_type_query (derived_atk_type, &query);
+
+		tinfo.class_size = query.class_size;
+		tinfo.instance_size = query.instance_size;
+
+		type = g_type_register_static (derived_atk_type,
+						"EaABView", &tinfo, 0);
+	}
+
+	return type;
+}
+
+static void
+ea_ab_view_class_init (EAddressbookViewClass *class)
+{
+	AtkObjectClass *atk_object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+
+	atk_object_class = ATK_OBJECT_CLASS (class);
+	atk_object_class->get_name = ea_ab_view_get_name;
+	atk_object_class->get_description = ea_ab_view_get_description;
+}
+
+static G_CONST_RETURN gchar*
+ea_ab_view_get_name (AtkObject *accessible)
+{
+	g_return_val_if_fail (EA_IS_AB_VIEW(accessible), NULL);
+	if (accessible->name)
+		return accessible->name;
+
+	return _("evolution address book");
+}
+
+static G_CONST_RETURN gchar*
+ea_ab_view_get_description (AtkObject *accessible)
+{
+	if (accessible->description)
+		return accessible->description;
+
+	return _("evolution address book");
+}
+
+AtkObject*
+ea_ab_view_new (GObject *obj)
+{
+	GObject *object;
+	AtkObject *accessible;
+
+	g_return_val_if_fail(obj != NULL, NULL);
+	g_return_val_if_fail (E_IS_ADDRESSBOOK_VIEW(obj), NULL);
+
+	object = g_object_new (EA_TYPE_AB_VIEW, NULL);
+
+	accessible = ATK_OBJECT (object);
+	atk_object_initialize (accessible, obj);
+	accessible->role = ATK_ROLE_CANVAS;
+
+	return accessible;
+}
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.h b/addressbook/gui/widgets/a11y/ea-addressbook-view.h
new file mode 100644
index 0000000000..86782ad737
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-addressbook-view.h
@@ -0,0 +1,62 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef __EA_ADDRESSBOOK_VIEW_H__
+#define __EA_ADDRESSBOOK_VIEW_H__
+
+#include <gtk/gtk.h>
+#include "e-addressbook-view.h"
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define EA_TYPE_AB_VIEW			(ea_ab_view_get_type ())
+#define EA_AB_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_AB_VIEW, EaABView))
+#define EA_AB_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_AB_VIEW, EaABViewClass))
+#define EA_IS_AB_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_AB_VIEW))
+#define EA_IS_AB_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_AB_VIEW))
+
+typedef struct _EaABView       EaABView;
+typedef struct _EaABViewClass  EaABViewClass;
+
+struct _EaABView
+{
+	GtkAccessible parent;
+};
+
+
+struct _EaABViewClass
+{
+	GtkAccessibleClass parent_class;
+};
+
+GType ea_ab_view_get_type (void);
+AtkObject* ea_ab_view_new(GObject *obj);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __EA_ADDRESSBOOK_VIEW_H__ */
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook.c b/addressbook/gui/widgets/a11y/ea-addressbook.c
new file mode 100644
index 0000000000..087c33a3c0
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-addressbook.c
@@ -0,0 +1,84 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include <text/e-text.h>
+#include "a11y/ea-factory.h"
+#include "ea-addressbook.h"
+#include "ea-minicard.h"
+#include "ea-minicard-view.h"
+#include "ea-addressbook-view.h"
+
+EA_FACTORY_GOBJECT (EA_TYPE_MINICARD, ea_minicard, ea_minicard_new)
+EA_FACTORY_GOBJECT (EA_TYPE_MINICARD_VIEW, ea_minicard_view, ea_minicard_view_new)
+EA_FACTORY_GOBJECT (EA_TYPE_AB_VIEW, ea_ab_view, ea_ab_view_new)
+
+static gboolean ea_addressbook_focus_watcher (GSignalInvocationHint *ihint,
+					      guint n_param_values,
+					      const GValue *param_values,
+					      gpointer data);
+
+void e_minicard_a11y_init (void)
+{
+	EA_SET_FACTORY (e_minicard_get_type (), ea_minicard);
+}
+
+void e_minicard_view_a11y_init (void)
+{
+	EA_SET_FACTORY (e_minicard_view_get_type (), ea_minicard_view);
+
+	if (atk_get_root ()) {
+		g_signal_add_emission_hook (g_signal_lookup ("event",
+					    e_minicard_get_type()),
+					    0, ea_addressbook_focus_watcher,
+					    NULL, (GDestroyNotify) NULL);
+	}
+}
+
+void eab_view_a11y_init (void)
+{
+	EA_SET_FACTORY (E_TYPE_ADDRESSBOOK_VIEW, ea_ab_view);
+}
+
+static gboolean
+ea_addressbook_focus_watcher (GSignalInvocationHint *ihint,
+			   guint n_param_values,
+			   const GValue *param_values,
+			   gpointer data)
+{
+	GObject *object;
+	GdkEvent *event;
+	AtkObject *ea_event = NULL;
+
+	object = g_value_get_object (param_values + 0);
+	event = g_value_get_boxed (param_values + 1);
+
+	if (E_IS_MINICARD (object)) {
+                GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object);
+		ea_event = atk_gobject_accessible_for_object (object);
+		if (event->type == GDK_FOCUS_CHANGE) {
+			if ((event->focus_change.in) && (E_IS_MINICARD (item->canvas->focused_item)))
+				atk_focus_tracker_notify (ea_event);
+		}
+	}
+
+	return TRUE;
+}
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook.h b/addressbook/gui/widgets/a11y/ea-addressbook.h
new file mode 100644
index 0000000000..337f467760
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-addressbook.h
@@ -0,0 +1,33 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+/* Evolution Accessibility
+*/
+
+#ifndef _EA_ADDRESSBOOK_H__
+#define _EA_ADDRESSBOOK_H__
+
+void eab_view_a11y_init (void);
+void e_minicard_view_a11y_init (void);
+void e_minicard_a11y_init (void);
+
+#endif /* _EA_ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.c b/addressbook/gui/widgets/a11y/ea-minicard-view.c
new file mode 100644
index 0000000000..aed11ed2ac
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.c
@@ -0,0 +1,413 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang < leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include <config.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "ea-minicard.h"
+#include "ea-minicard-view.h"
+#include "eab-gui-util.h"
+#include "e-addressbook-view.h"
+
+static const char * action_name[] = {
+	N_("New Contact"),
+	N_("New Contact List")
+};
+
+
+static G_CONST_RETURN gchar* ea_minicard_view_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar* ea_minicard_view_get_description (AtkObject *accessible);
+
+static void ea_minicard_view_class_init (EaMinicardViewClass *klass);
+
+static gint ea_minicard_view_get_n_children (AtkObject *obj);
+static AtkObject *ea_minicard_view_ref_child (AtkObject *obj, gint i);
+
+static AtkStateSet *ea_minicard_view_ref_state_set(AtkObject *obj);
+
+static void atk_selection_interface_init (AtkSelectionIface *iface);
+static gboolean selection_interface_add_selection (AtkSelection *selection,
+						   gint i);
+static gboolean selection_interface_clear_selection (AtkSelection *selection);
+static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
+						     gint i);
+static gint selection_interface_get_selection_count (AtkSelection *selection);
+static gboolean selection_interface_is_child_selected (AtkSelection *selection,
+						       gint i);
+
+static void atk_action_interface_init (AtkActionIface *iface);
+static gboolean atk_action_interface_do_action (AtkAction *iface, gint i);
+static gint atk_action_interface_get_n_action (AtkAction *iface);
+static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i);
+static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i);
+
+static gpointer parent_class = NULL;
+
+GType
+ea_minicard_view_get_type (void)
+{
+	static GType type = 0;
+	AtkObjectFactory *factory;
+	GTypeQuery query;
+	GType derived_atk_type;
+
+	if (!type) {
+		static  GTypeInfo tinfo =  {
+			sizeof (EaMinicardViewClass),
+			(GBaseInitFunc) NULL,  /* base_init */
+			(GBaseFinalizeFunc) NULL,  /* base_finalize */
+			(GClassInitFunc) ea_minicard_view_class_init,
+			(GClassFinalizeFunc) NULL, /* class_finalize */
+			NULL,	   /* class_data */
+			sizeof (EaMinicardView),
+			0,	     /* n_preallocs */
+			(GInstanceInitFunc) NULL, /* instance init */
+			NULL /* value table */
+		};
+
+		static const GInterfaceInfo atk_selection_info = {
+			(GInterfaceInitFunc) atk_selection_interface_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
+
+		static const GInterfaceInfo atk_action_info = {
+			(GInterfaceInitFunc) atk_action_interface_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
+
+		/*
+		 * Figure out the size of the class and instance
+		 * we are run-time deriving from (GailWidget, in this case) */
+
+		factory = atk_registry_get_factory (atk_get_default_registry (),
+							GNOME_TYPE_CANVAS_GROUP);
+		derived_atk_type = atk_object_factory_get_accessible_type (factory);
+		g_type_query (derived_atk_type, &query);
+
+		tinfo.class_size = query.class_size;
+		tinfo.instance_size = query.instance_size;
+
+		type = g_type_register_static (derived_atk_type,
+						"EaMinicardView", &tinfo, 0);
+		g_type_add_interface_static (type, ATK_TYPE_SELECTION,
+					     &atk_selection_info);
+		g_type_add_interface_static (type, ATK_TYPE_ACTION,
+					     &atk_action_info);
+
+	}
+
+	return type;
+}
+
+static void
+ea_minicard_view_class_init (EaMinicardViewClass *klass)
+{
+	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
+
+	parent_class = g_type_class_peek_parent (klass);
+
+	class->get_name = ea_minicard_view_get_name;
+	class->get_description = ea_minicard_view_get_description;
+	class->ref_state_set = ea_minicard_view_ref_state_set;
+	class->get_n_children = ea_minicard_view_get_n_children;
+	class->ref_child = ea_minicard_view_ref_child;
+}
+
+static G_CONST_RETURN gchar*
+ea_minicard_view_get_name (AtkObject *accessible)
+{
+	EReflow *reflow;
+	gchar *string;
+	EMinicardView *card_view;
+	EBook *book = NULL;
+	const gchar *source_name;
+
+	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
+
+	reflow = E_REFLOW(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
+
+	if (!reflow)
+		return NULL;
+
+	/* Get the current name of minicard view*/
+	card_view = E_MINICARD_VIEW (reflow);
+	g_object_get (card_view->adapter, "book", &book, NULL);
+	g_return_val_if_fail (E_IS_BOOK (book), NULL);
+	source_name = e_source_peek_name (e_book_get_source (book));
+	if (!source_name)
+		source_name="";
+
+	string = g_strdup_printf (ngettext ("current address book folder %s has %d card",
+	                          "current address book folder %s has %d cards",
+	                          reflow->count), source_name, reflow->count);
+
+	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string);
+	g_free (string);
+	g_object_unref(book);
+	return accessible->name;
+}
+
+static G_CONST_RETURN gchar*
+ea_minicard_view_get_description (AtkObject *accessible)
+{
+	g_return_val_if_fail (EA_IS_MINICARD_VIEW(accessible), NULL);
+	if (accessible->description)
+		return accessible->description;
+
+	return _("evolution address book");
+}
+
+AtkObject*
+ea_minicard_view_new (GObject *obj)
+{
+	GObject *object;
+	AtkObject *accessible;
+
+	g_return_val_if_fail (E_IS_MINICARD_VIEW(obj), NULL);
+	object = g_object_new (EA_TYPE_MINICARD_VIEW, NULL);
+	accessible = ATK_OBJECT (object);
+	atk_object_initialize (accessible, obj);
+	accessible->role = ATK_ROLE_PANEL;
+	return accessible;
+}
+
+static gint
+ea_minicard_view_get_n_children (AtkObject *accessible)
+{
+	EReflow *reflow;
+
+	gint child_num = 0;
+
+	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), -1);
+
+	reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible)));
+
+	if (!reflow)
+		return -1;
+
+	child_num = reflow->count;
+
+	return child_num;
+}
+
+static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj)
+{
+	AtkStateSet *state_set = NULL;
+	GObject *gobj = NULL;
+
+	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+	if( !state_set )
+		state_set = atk_state_set_new ();
+
+	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
+	if( !gobj )
+		return state_set;
+
+	atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
+	atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
+	atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
+
+	return state_set;
+}
+
+static AtkObject *
+ea_minicard_view_ref_child (AtkObject *accessible, gint index)
+{
+	EReflow *reflow;
+	gint child_num;
+	AtkObject *atk_object = NULL;
+	EMinicard *card = NULL;
+
+	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
+
+	child_num = atk_object_get_n_accessible_children (accessible);
+	if (child_num <= 0 || index < 0 || index >= child_num)
+		return NULL;
+
+	reflow = E_REFLOW (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
+	if (!reflow)
+		return NULL;
+	if (!reflow->items )
+		return NULL;
+		/* a minicard */
+	if (index < child_num) {
+		card = E_MINICARD (reflow->items[index]);
+		atk_object = atk_gobject_accessible_for_object (G_OBJECT (card));
+	} else {
+		return NULL;
+	}
+
+	g_object_ref (atk_object);
+		return atk_object;
+}
+
+/* atkselection interface */
+
+static void
+atk_selection_interface_init (AtkSelectionIface *iface)
+{
+	g_return_if_fail (iface != NULL);
+
+	iface->add_selection = selection_interface_add_selection;
+	iface->clear_selection = selection_interface_clear_selection;
+	iface->ref_selection = selection_interface_ref_selection;
+	iface->get_selection_count = selection_interface_get_selection_count;
+	iface->is_child_selected = selection_interface_is_child_selected;
+}
+
+static gboolean
+selection_interface_add_selection (AtkSelection *selection, gint i)
+{
+	AtkGObjectAccessible *atk_gobj= NULL;
+	EReflow *reflow = NULL;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
+	reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj));
+
+	if (!reflow)
+		return FALSE;
+
+	selection_interface_clear_selection (selection);
+	e_selection_model_select_single_row (reflow->selection, i);
+
+	return TRUE;
+}
+
+static gboolean
+selection_interface_clear_selection (AtkSelection *selection)
+{
+	AtkGObjectAccessible *atk_gobj = NULL;
+	EReflow *reflow = NULL;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
+	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
+
+	if( !reflow )
+		return FALSE;
+
+	e_selection_model_clear (reflow->selection);
+
+	return TRUE;
+}
+
+static AtkObject*
+selection_interface_ref_selection (AtkSelection *selection, gint i)
+{
+	return ea_minicard_view_ref_child (ATK_OBJECT (selection), i);
+}
+
+static gint
+selection_interface_get_selection_count (AtkSelection *selection)
+{
+	AtkGObjectAccessible *atk_gobj = NULL;
+	EReflow *reflow = NULL;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
+	reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj));
+
+	if (!reflow )
+		return FALSE;
+
+	return e_selection_model_selected_count (reflow->selection);
+}
+
+static gboolean
+selection_interface_is_child_selected (AtkSelection *selection, gint i)
+{
+	AtkGObjectAccessible *atk_gobj = NULL;
+	EReflow *reflow = NULL;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
+	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
+
+	if( !reflow )
+		return FALSE;
+
+	return e_selection_model_is_row_selected (reflow->selection, i);
+}
+
+static void atk_action_interface_init (AtkActionIface *iface)
+{
+	g_return_if_fail (iface != NULL);
+
+	iface->do_action = atk_action_interface_do_action;
+	iface->get_n_actions = atk_action_interface_get_n_action;
+	iface->get_description = atk_action_interface_get_description;
+	iface->get_name = atk_action_interface_get_name;
+}
+
+static gboolean atk_action_interface_do_action (AtkAction *action, gint i)
+{
+	gboolean return_value = TRUE;
+	EMinicardView *card_view;
+
+	AtkGObjectAccessible *atk_gobj= NULL;
+        EReflow *reflow = NULL;
+
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
+	reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj));
+
+	if (reflow == NULL)
+		return FALSE;
+
+	card_view = E_MINICARD_VIEW (reflow);
+
+	switch (i) {
+		case 0:
+		/* New Contact */
+			e_minicard_view_create_contact (card_view);
+			break;
+		case 1:
+		/* New Contact List */
+			e_minicard_view_create_contact_list (card_view);
+			break;
+		default:
+                	return_value = FALSE;
+			break;
+	}
+
+	return return_value;
+}
+
+static gint atk_action_interface_get_n_action (AtkAction *iface)
+{
+	return G_N_ELEMENTS (action_name);
+}
+
+static G_CONST_RETURN gchar*
+atk_action_interface_get_description (AtkAction *iface, gint i)
+{
+	return atk_action_interface_get_name (iface, i);
+}
+
+static G_CONST_RETURN gchar*
+atk_action_interface_get_name (AtkAction *iface, gint i)
+{
+	if( i >= G_N_ELEMENTS (action_name) || i < 0)
+		return NULL;
+
+	return action_name[i];
+}
+
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.h b/addressbook/gui/widgets/a11y/ea-minicard-view.h
new file mode 100644
index 0000000000..922941cb7b
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.h
@@ -0,0 +1,64 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef __EA_MINICARD_VIEW_H__
+#define __EA_MINICARD_VIEW_H__
+
+#include <atk/atkgobjectaccessible.h>
+#include "e-minicard-view.h"
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define EA_TYPE_MINICARD_VIEW			(ea_minicard_view_get_type ())
+#define EA_MINICARD_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD_VIEW, EaMinicardView))
+#define EA_MINICARD_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_MINICARD_VIEW, EaMiniCardViewClass))
+#define EA_IS_MINICARD_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
+#define EA_IS_MINICARD_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
+
+
+typedef struct _EaMinicardView       EaMinicardView;
+typedef struct _EaMinicardViewClass  EaMinicardViewClass;
+
+struct _EaMinicardView
+{
+	AtkGObjectAccessible parent;
+};
+
+
+struct _EaMinicardViewClass
+{
+	AtkGObjectAccessibleClass parent_class;
+};
+
+GType ea_minicard_view_get_type (void);
+
+AtkObject* ea_minicard_view_new(GObject *obj);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __EA_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.c b/addressbook/gui/widgets/a11y/ea-minicard.c
new file mode 100644
index 0000000000..d0219e03b5
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-minicard.c
@@ -0,0 +1,273 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include <config.h>
+#include <string.h>
+#include <glib/gi18n.h>
+#include "ea-minicard.h"
+#include "ea-minicard-view.h"
+#include "e-minicard.h"
+
+static const char * action_name[] = {
+	N_("Open")
+};
+
+static G_CONST_RETURN gchar* ea_minicard_get_name (AtkObject *accessible);
+static G_CONST_RETURN gchar* ea_minicard_get_description (AtkObject *accessible);
+
+static void ea_minicard_class_init (EaMinicardClass *klass);
+
+static gint ea_minicard_get_n_children (AtkObject *obj);
+static AtkObject* ea_minicard_ref_child(AtkObject *obj, gint i);
+
+static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj);
+
+static void atk_action_interface_init (AtkActionIface *iface);
+static gboolean atk_action_interface_do_action (AtkAction *iface, gint i);
+static gint atk_action_interface_get_n_action (AtkAction *iface);
+static G_CONST_RETURN gchar* atk_action_interface_get_description (AtkAction *iface, gint i);
+static G_CONST_RETURN gchar* atk_action_interface_get_name (AtkAction *iface, gint i);
+
+static gpointer parent_class = NULL;
+
+GType
+ea_minicard_get_type (void)
+{
+	static GType type = 0;
+	AtkObjectFactory *factory;
+	GTypeQuery query;
+	GType derived_atk_type;
+
+	if (!type) {
+		static  GTypeInfo tinfo =  {
+			sizeof (EaMinicardClass),
+			(GBaseInitFunc) NULL,  /* base_init */
+			(GBaseFinalizeFunc) NULL,  /* base_finalize */
+			(GClassInitFunc) ea_minicard_class_init,
+			(GClassFinalizeFunc) NULL, /* class_finalize */
+			NULL,	/* class_data */
+			sizeof (EaMinicard),
+			0,	/* n_preallocs */
+			(GInstanceInitFunc) NULL, /* instance init */
+			NULL	/* value table */
+		};
+
+		static const GInterfaceInfo atk_action_info = {
+			(GInterfaceInitFunc) atk_action_interface_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
+
+		/*
+		 * Figure out the size of the class and instance
+		 * we are run-time deriving from (GailWidget, in this case)
+		 */
+
+		factory = atk_registry_get_factory (atk_get_default_registry (),
+						    GNOME_TYPE_CANVAS_GROUP);
+		derived_atk_type = atk_object_factory_get_accessible_type (factory);
+		g_type_query (derived_atk_type, &query);
+
+		tinfo.class_size = query.class_size;
+		tinfo.instance_size = query.instance_size;
+
+		type = g_type_register_static ( derived_atk_type,
+						"EaMinicard", &tinfo, 0);
+		g_type_add_interface_static (type, ATK_TYPE_ACTION,
+					     &atk_action_info);
+	}
+
+	return type;
+}
+
+static void
+ea_minicard_class_init (EaMinicardClass *klass)
+{
+	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
+
+	parent_class = g_type_class_peek_parent (klass);
+
+	class->get_name = ea_minicard_get_name;
+	class->get_description = ea_minicard_get_description;
+	class->ref_state_set = ea_minicard_ref_state_set;
+	class->get_n_children = ea_minicard_get_n_children;
+	class->ref_child = ea_minicard_ref_child;
+}
+
+/*
+ *  we access the main content of current minicard, including
+ *  header text, label(field, field name)
+ */
+static G_CONST_RETURN gchar*
+ea_minicard_get_name (AtkObject *accessible)
+{
+#define BUFFERSIZE 500
+
+	static gchar name[BUFFERSIZE];
+	GString *new_str = g_string_new (NULL);
+	gchar *string;
+	EMinicard *card;
+
+	g_return_val_if_fail (EA_IS_MINICARD(accessible), NULL);
+	memset (name, '\0', BUFFERSIZE);
+
+	card = E_MINICARD(atk_gobject_accessible_get_object
+			 (ATK_GOBJECT_ACCESSIBLE(accessible)));
+	if (!card)
+		return NULL;
+
+	g_object_get (card->header_text, "text", &string, NULL);
+
+	if (e_contact_get (card->contact, E_CONTACT_IS_LIST))
+		g_string_append (new_str, _("Contact List: "));
+	else    g_string_append (new_str, _("Contact: "));
+
+	/* get header of current card */
+	g_string_append (new_str, string);
+	g_free (string);
+
+	/* if there exist no enough space for remain info, return */
+	if (new_str->len >= BUFFERSIZE) {
+		strncpy (name, new_str->str, BUFFERSIZE);
+		return name;
+	}
+
+	strcpy (name, new_str->str);
+	g_string_free (new_str, TRUE);
+
+	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name);
+
+	return accessible->name;
+}
+
+static G_CONST_RETURN gchar*
+ea_minicard_get_description (AtkObject *accessible)
+{
+	if (accessible->description)
+		return accessible->description;
+
+	return _("evolution minicard");
+}
+
+AtkObject*
+ea_minicard_new (GObject *obj)
+{
+	GObject *object;
+	AtkObject *accessible;
+
+	g_return_val_if_fail(obj != NULL, NULL);
+	g_return_val_if_fail (E_IS_MINICARD(obj), NULL);
+
+	object = g_object_new (EA_TYPE_MINICARD, NULL);
+	accessible = ATK_OBJECT (object);
+	atk_object_initialize (accessible, obj);
+
+	accessible->role = ATK_ROLE_PANEL;
+	return accessible;
+}
+
+static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj)
+{
+	AtkStateSet *state_set = NULL;
+	GObject *gobj = NULL;
+
+	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+	if( !state_set )
+		state_set = atk_state_set_new ();
+
+	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
+	if( !gobj )
+		return state_set;
+
+	atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
+	atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
+	atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE);
+	atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
+
+	return state_set;
+}
+
+static gint
+ea_minicard_get_n_children (AtkObject *accessible)
+{
+	return 0;
+}
+
+static AtkObject *
+ea_minicard_ref_child (AtkObject *accessible, gint index)
+{
+	return NULL;
+}
+
+static void atk_action_interface_init (AtkActionIface *iface)
+{
+	g_return_if_fail (iface != NULL);
+
+	iface->do_action = atk_action_interface_do_action;
+	iface->get_n_actions = atk_action_interface_get_n_action;
+	iface->get_description = atk_action_interface_get_description;
+	iface->get_name = atk_action_interface_get_name;
+}
+
+static gboolean atk_action_interface_do_action (AtkAction *iface, gint i)
+{
+	EMinicard *minicard = NULL;
+
+	minicard = E_MINICARD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (iface)));
+	if( minicard == NULL )
+		return FALSE;
+
+	if( i >= G_N_ELEMENTS (action_name) || i < 0 )
+		return FALSE;
+
+	switch (i) {
+		// open card
+		case 0:
+			e_minicard_activate_editor (minicard);
+			break;
+		default:
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+static gint atk_action_interface_get_n_action (AtkAction *iface)
+{
+	return G_N_ELEMENTS (action_name);
+}
+
+static G_CONST_RETURN gchar*
+atk_action_interface_get_description (AtkAction *iface, gint i)
+{
+	return atk_action_interface_get_name (iface, i);
+}
+
+static G_CONST_RETURN gchar*
+atk_action_interface_get_name (AtkAction *iface, gint i)
+{
+	if( i >= G_N_ELEMENTS (action_name) || i < 0)
+		return NULL;
+
+	return action_name[i];
+}
+
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.h b/addressbook/gui/widgets/a11y/ea-minicard.h
new file mode 100644
index 0000000000..9c0c8a2b56
--- /dev/null
+++ b/addressbook/gui/widgets/a11y/ea-minicard.h
@@ -0,0 +1,63 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef __EA_MINICARD_H__
+#define __EA_MINICARD_H__
+
+#include <atk/atkgobjectaccessible.h>
+#include "e-minicard.h"
+#include "e-minicard-label.h"
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define EA_TYPE_MINICARD			(ea_minicard_get_type ())
+#define EA_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD, EaMinicard))
+#define EA_MINICARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EA_TYPE_MINICARD, EaMiniCardClass))
+#define EA_IS_MINICARD(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD))
+#define EA_IS_MINICARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD))
+
+typedef struct _EaMinicard       EaMinicard;
+typedef struct _EaMinicardClass  EaMinicardClass;
+
+struct _EaMinicard
+{
+	AtkGObjectAccessible parent;
+};
+
+
+struct _EaMinicardClass
+{
+	AtkGObjectAccessibleClass parent_class;
+};
+
+GType ea_minicard_get_type (void);
+AtkObject* ea_minicard_new(GObject *obj);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __EA_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index 5032f3e2d0..bd2ba3397b 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -21,7 +21,7 @@
 #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 
-#include <misc/e-reflow-model.h>
+#include <text/e-reflow-model.h>
 #include <libebook/e-contact.h>
 #include "e-addressbook-model.h"
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 7131a61005..8ee3c14e0b 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -33,7 +33,7 @@
 #include <e-shell-sidebar.h>
 
 #include "addressbook/printing/e-contact-print.h"
-#include "a11y/addressbook/ea-addressbook.h"
+#include "a11y/ea-addressbook.h"
 
 #include "e-util/e-print.h"
 #include "e-util/e-util.h"
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 32957fdf33..c6faa4aed7 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -34,7 +34,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include "e-util/e-util.h"
-#include "a11y/addressbook/ea-addressbook.h"
+#include "a11y/ea-addressbook.h"
 
 static void e_minicard_view_drag_data_get(GtkWidget *widget,
 					  GdkDragContext *context,
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 4cdf9be7be..657d0a9b74 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -26,7 +26,7 @@
 
 #include "e-minicard.h"
 
-#include <misc/e-reflow.h>
+#include <text/e-reflow.h>
 #include <misc/e-selection-model-simple.h>
 #include <libebook/e-book.h>
 #include "e-addressbook-reflow-adapter.h"
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 3e5e8ec3bf..a875e43a8d 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -38,7 +38,7 @@
 #include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
 #include <libebook/e-destination.h>
-#include "a11y/addressbook/ea-addressbook.h"
+#include "a11y/ea-addressbook.h"
 
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *class);
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index c194f2705e..59c5c519cd 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -38,12 +38,6 @@ contact_print_test_LDADD =	\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
-contact_print_style_editor_test_LDADD =	\
-	libecontactprint.la					\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
-
 EXTRA_DIST = 		\
 	$(ecps_DATA)