From 13dad0c8c9f26039ac0048865bcbea11c035bd17 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sun, 15 Jul 2001 09:49:41 +0000 Subject: Commented out some unused variables and labels. (e_destination_importv): 2001-07-15 Christopher James Lahey * backend/ebook/e-destination.c (e_destination_set_string): Commented out some unused variables and labels. (e_destination_importv): Check for the xml not parsing correctly and just return NULL here. * gui/component/select-names/e-select-names-model.c (e_select_names_model_import_destinationv): Handle a NULL destv here. svn path=/trunk/; revision=11112 --- addressbook/ChangeLog | 11 +++++++++++ addressbook/backend/ebook/e-destination.c | 7 +++++++ addressbook/gui/component/select-names/e-select-names-model.c | 4 ++++ 3 files changed, 22 insertions(+) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ba92a6a603..45580033a5 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,14 @@ +2001-07-15 Christopher James Lahey + + * backend/ebook/e-destination.c (e_destination_set_string): + Commented out some unused variables and labels. + (e_destination_importv): Check for the xml not parsing correctly + and just return NULL here. + + * gui/component/select-names/e-select-names-model.c + (e_select_names_model_import_destinationv): Handle a NULL destv + here. + 2001-07-15 Christopher James Lahey * gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index 7b88ea4fb4..8a25fd1937 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -273,7 +273,9 @@ e_destination_set_string (EDestination *dest, const gchar *str) { gchar *name = NULL; gchar *email = NULL; +#if 0 gchar *lt, *gt; +#endif g_return_if_fail (dest && E_IS_DESTINATION (dest)); g_return_if_fail (str != NULL); @@ -305,7 +307,9 @@ e_destination_set_string (EDestination *dest, const gchar *str) /* Default: Just treat it as a name address. */ name = g_strdup (str); +#if 0 finished: +#endif if (name) { g_message ("name: [%s]", name); if (*name) @@ -913,6 +917,9 @@ e_destination_importv (const gchar *str) return NULL; destv_doc = xmlParseMemory ((gchar *)str, strlen (str)); + if (destv_doc == NULL) + return NULL; + node = destv_doc->xmlRootNode; if (strcmp (node->name, "destinations")) diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c index 3cdd5913a5..3fd5249a26 100644 --- a/addressbook/gui/component/select-names/e-select-names-model.c +++ b/addressbook/gui/component/select-names/e-select-names-model.c @@ -372,6 +372,10 @@ e_select_names_model_import_destinationv (ESelectNamesModel *model, destv = e_destination_importv (destinationv); e_select_names_model_delete_all (model); + + if (destv == NULL) + return; + for (i = 0; destv[i]; i++) { e_destination_use_card (destv[i], send_changed, model); e_select_names_model_append (model, destv[i]); -- cgit v1.2.3