Check to make sure our call to e_addressbook_model_get_card doesn't return

2001-10-05  Jon Trowbridge  <trow@ximian.com>

	* gui/component/select-names/e-select-names.c
	(real_add_address_cb): Check to make sure our call to
	e_addressbook_model_get_card doesn't return NULL.

	* gui/widgets/e-addressbook-model.c
	(e_addressbook_model_get_card): Chek that we aren't requesting a
	negative row.

	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
	Move to the bottom of the scrolled window, so we can see the
	address we just added.
	(table_drag_data_received_cb): Move to the bottom of the scrolled
	window, so we can see the contact we just dropped.

	* gui/component/addressbook.c (addressbook_factory_new_control):
	We don't own the string returned by e_categories_master_list_nth,
	so terrible things will happen if we free it. (Bug 10916)

svn path=/trunk/; revision=13469

1 files changed, 1 insertions, 3 deletions

diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index eb7cd4afb5..17e6ed4e3d 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -898,12 +898,10 @@ addressbook_factory_new_control (void)
 		subitems[0].translate = FALSE;
 
 		for (i=0; i<N; ++i) {
-			char *category;
+			const char *category = e_categories_master_list_nth (master_list, i);
 
 			subitems[i+1].id = i;
-			category = (char *) e_categories_master_list_nth (master_list, i);
 			subitems[i+1].text = e_utf8_to_locale_string (category);
-			g_free (category);
 			subitems[i+1].translate = FALSE;
 		}
 		subitems[N+1].id = -1;