6 files changed, 14 insertions, 9 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 91f16b25c2..d1d2a6cb04 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -45,6 +45,7 @@
 #include "addressbook/gui/search/e-addressbook-search-dialog.h"
 #include "addressbook/gui/widgets/eab-popup.h"
 #include "addressbook/gui/widgets/eab-menu.h"
+#include "a11y/addressbook/ea-addressbook.h"
 
 #include "e-util/e-print.h"
 #include "libedataserver/e-sexp.h"
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index b362cb1294..eeb1daea11 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -33,6 +33,7 @@
 #include <misc/e-canvas.h>
 #include <libgnome/gnome-i18n.h>
 #include <string.h>
+#include "a11y/addressbook/ea-addressbook.h"
 
 static void e_minicard_view_drag_data_get(GtkWidget *widget,
 					  GdkDragContext *context,
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index a1f84c4423..b5b941be1d 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -41,6 +41,7 @@
 #include "e-contact-editor.h"
 #include <e-util/e-icon-factory.h>
 #include <libebook/e-destination.h>
+#include "a11y/addressbook/ea-addressbook.h"
 
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *klass);
@@ -534,8 +535,7 @@ editor_closed_cb (GtkObject *editor, gpointer data)
 gboolean
 e_minicard_activate_editor(EMinicard *minicard)
 {
-	GnomeCanvasItem *item = NULL;
-	item = minicard;
+	GnomeCanvasItem *item = (GnomeCanvasItem *)minicard;
       
 	if (minicard->editor) {
 		eab_editor_raise (minicard->editor);
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index d96c1a323d..a925ce72d6 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -663,7 +663,7 @@ eab_contact_display_new (void)
 static void
 eab_contact_display_init (GObject *object)
 {
-	gtk_html_construct (object);
+	gtk_html_construct ((GtkHTML *)object);
 }
 
 static void
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 85a4e8d0f8..dd09c7620c 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -497,8 +497,11 @@ void
 eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
 {
 	GtkWidget *filesel;
-	char *file, *full_filename;
+	char *file;
 	char *name;
+#ifndef USE_GTKFILECHOOSER
+	char *full_filename;
+#endif
 	SaveAsInfo *info = g_new(SaveAsInfo, 1);
 
 	name = e_contact_get (contact, E_CONTACT_FILE_AS);
@@ -556,7 +559,10 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window)
 {
 	GtkWidget *filesel;
 	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	char *file, *full_filename;
+	char *file;
+#ifndef USE_GTKFILECHOOSER
+	char *full_filename;
+#endif
 
 #ifdef USE_GTKFILECHOOSER
 	filesel = gtk_file_chooser_dialog_new (title,
@@ -861,8 +867,7 @@ eab_send_to_contact_and_email_num_list (GList *c)
 		GList *iterator;
 
 		if (emails != NULL) {
-
-			is_list = (gboolean)e_contact_get (contact, E_CONTACT_IS_LIST);
+			is_list = e_contact_get (contact, E_CONTACT_IS_LIST) != NULL;
 			is_hidden = is_list && !e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES);
 
 			if (is_list) {
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index 6b114a9950..6433b91d29 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -926,8 +926,6 @@ contact_editor_cb (EBook *book, EBookStatus status, gpointer closure)
 static void
 eab_popup_control_display_contact (EABPopupControl *pop, EContact *contact)
 {
-	GtkWidget *b;
-
 	g_return_if_fail (pop && EAB_IS_POPUP_CONTROL (pop));
 	g_return_if_fail (contact && E_IS_CONTACT (contact));
 	g_return_if_fail (pop->contact == NULL);