5 files changed, 1 insertions, 31 deletions

diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 18495d59c9..0b0c71711d 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -512,11 +512,8 @@ contact_list_editor_drag_drop_cb (GtkWidget *widget,
                                   gint x, gint y,
                                   guint time)
 {
-	EContactListEditor *editor;
 	GList *iter;
 
-	editor = contact_list_editor_extract (widget);
-
 	for (iter = context->targets; iter != NULL; iter = iter->next) {
 		GdkAtom target = GDK_POINTER_TO_ATOM (iter->data);
 		gchar *possible_type;
@@ -547,11 +544,8 @@ contact_list_editor_drag_motion_cb (GtkWidget *widget,
                                     gint x, gint y,
                                     guint time)
 {
-	EContactListEditor *editor;
 	GList *iter;
 
-	editor = contact_list_editor_extract (widget);
-
 	for (iter = context->targets; iter != NULL; iter = iter->next) {
 		GdkAtom target = GDK_POINTER_TO_ATOM (iter->data);
 		gchar *possible_type;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index bcf6ed6277..cc540c14c3 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1252,7 +1252,6 @@ e_addressbook_view_delete_selection(EAddressbookView *view, gboolean is_delete)
 	ETable *etable = NULL;
 	EAddressbookModel *model;
 	EBook *book;
-	EMinicardView *card_view;
 	ESelectionModel *selection_model = NULL;
 	GalViewInstance *view_instance;
 	GalView *gal_view;
@@ -1280,8 +1279,6 @@ e_addressbook_view_delete_selection(EAddressbookView *view, gboolean is_delete)
 	widget = gtk_bin_get_child (GTK_BIN (view));
 
 	if (GAL_IS_VIEW_MINICARD (gal_view)) {
-		card_view = e_minicard_view_widget_get_view (
-			E_MINICARD_VIEW_WIDGET (view->priv->object));
 		selection_model = e_addressbook_view_get_selection_model (view);
 		row = e_selection_model_cursor_row (selection_model);
 	}
@@ -1363,19 +1360,12 @@ e_addressbook_view_delete_selection(EAddressbookView *view, gboolean is_delete)
 void
 e_addressbook_view_view (EAddressbookView *view)
 {
-	EAddressbookModel *model;
-	EBook *book;
 	GList *list, *iter;
-	gboolean editable;
 	gint response;
 	guint length;
 
 	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
 
-	model = e_addressbook_view_get_model (view);
-	book = e_addressbook_model_get_book (model);
-	editable = e_addressbook_model_get_editable (model);
-
 	list = e_addressbook_view_get_selected (view);
 	length = g_list_length (list);
 	response = GTK_RESPONSE_YES;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index a3d7e3aad4..04bf9757e4 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -983,7 +983,6 @@ remodel( EMinicard *e_minicard )
 						count = 5;
 					else
 						count = count + g_list_length (email);
-					is_email=FALSE;
 					g_list_free (email);
 				} else {
 					string = e_contact_get(e_minicard->contact, field);
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 84f7cba538..dda6081137 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -916,17 +916,6 @@ contact_display_dispose (GObject *object)
 }
 
 static void
-contact_display_finalize (GObject *object)
-{
-	EABContactDisplayPrivate *priv;
-
-	priv = EAB_CONTACT_DISPLAY_GET_PRIVATE (object);
-
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
 contact_display_url_requested (GtkHTML *html,
                                const gchar *uri,
                                GtkHTMLStream *handle)
@@ -1094,7 +1083,6 @@ eab_contact_display_class_init (EABContactDisplayClass *class)
 	object_class->set_property = contact_display_set_property;
 	object_class->get_property = contact_display_get_property;
 	object_class->dispose = contact_display_dispose;
-	object_class->finalize = contact_display_finalize;
 
 	html_class = GTK_HTML_CLASS (class);
 	html_class->url_requested = contact_display_url_requested;
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 4f84eed6e4..31d05d278c 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -233,7 +233,6 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select
 	ESourceList *source_list;
 	GtkWidget *dialog;
 	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
 	/* GtkWidget *label; */
 	GtkWidget *selector;
 	GtkWidget *scrolled_window;
@@ -247,7 +246,7 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select
 					      NULL);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 300);
 
-	cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 	ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
 	gtk_widget_set_sensitive (ok_button, FALSE);