reviewed by: Harish Krishnaswamy <kharish@novell.com>

2006-01-27  Kjartan Maraas  <kmaraas@gnome.org>

	reviewed by: Harish Krishnaswamy <kharish@novell.com>

	* gui/component/addressbook-component.c: (impl_requestCreateItem):
	Remove unused bits.
	* gui/component/addressbook-config.c: (eabc_general_type),
	(eabc_general_offline): Same here.
	* gui/component/addressbook-migrate.c: Remove unused static function.
	* gui/component/addressbook-view.c: (selector_tree_drag_motion):
	Remove unused static function and init uninitialized var.
	* gui/contact-editor/e-contact-editor-address.c:
	(fill_in_countries): Return early if setlocale() fails.
	* gui/contact-editor/e-contact-editor.c: (file_as_get_style),
	(extract_email), (extract_phone), (sensitize_phone_types),
	(extract_im), (sensitize_im_types), (init_simple):
	Mark some arrays static, remove unused variables, fix gcc warnings
	* gui/contact-list-editor/e-contact-list-editor.c: (fill_in_info):
	Remove unused var.
	* gui/merging/eab-contact-compare.c: (eab_contact_compare_name):
	Remove unused static function and unused vars.
	* gui/search/e-addressbook-search-dialog.c:
	(eab_search_dialog_dispose): Remove unused vars.
	* gui/widgets/e-addressbook-model.c: (get_view): Add comment.
	* gui/widgets/e-addressbook-view.c: (eab_view_class_init),
	(eab_view_delete_selection): Remove unused var
	* gui/widgets/e-addressbook-view.h: Remove extra semi-colon.
	* gui/widgets/e-minicard-label.c: (e_minicard_label_unrealize):
	Remove unused var.
	* gui/widgets/e-minicard.c: (e_minicard_unrealize),
	(e_minicard_event), (add_field), (remodel), (e_minicard_reflow):
	Remove unused vars. s/if/ifdef in some places, use passed in parameter
	instead of redeclaring the thing locally.
	* gui/widgets/eab-contact-display.c: (accum_address),
	(eab_contact_display_render_compact): s/if/ifdef.
	* gui/widgets/eab-gui-util.c: (eab_select_source): Comment out unused var.
	* gui/widgets/eab-popup-control.c: (eab_popup_control_cleanup): s/if/ifdef
	* printing/e-contact-print-style-editor.c:
	(e_contact_print_style_editor_class_init),
	(e_contact_print_style_editor_set_arg),
	(e_contact_print_style_editor_get_arg): Remove unused vars.
	* util/eab-book-util.c: s/if/ifdef

svn path=/trunk/; revision=31327

1 files changed, 2 insertions, 2 deletions

diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 48725d6fcc..4d7b39debe 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -194,7 +194,7 @@ accum_address (GString *gstr, EContact *contact, const char *html_label, EContac
 	if (label) {
 		char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
 
-#if mapping_works
+#ifdef mapping_works
 		g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
 #else
 		g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font></td><td valign=\"top\">%s</td></tr>", html_label, html);
@@ -548,7 +548,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
 
 			for (l = email_list; l; l = l->next) {
 				if (l->data) {
-					char *html = e_text_to_html (l->data, 0);
+					html = e_text_to_html (l->data, 0);
 					gtk_html_stream_printf (html_stream, "%s, ", html);
 					g_free (html);
 				}