diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 11 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-destination.c | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-model.c | 4 |
3 files changed, 22 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ba92a6a603..45580033a5 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,16 @@ 2001-07-15 Christopher James Lahey <clahey@ximian.com> + * 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 <clahey@ximian.com> + * gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a call to e_table_view_to_model_row here. (e_addressbook_view_can_print, e_addressbook_view_can_delete, 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]); |