aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-07-02 12:32:58 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-07-02 12:32:58 +0800
commite6191dc02e287a768ac8574499673d157397d079 (patch)
treee1116903b5d21212799a0f703dec1b18c01680ca /addressbook
parent00e3b9af8a4c5d661b1cd1cecc6811cbf374f3dd (diff)
downloadgsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.gz
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.zst
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.zip
Fall back to use the name field if all else fails (which can happen with
2001-07-01 Jon Trowbridge <trow@ximian.com> * backend/ebook/e-destination.c (e_destination_get_string): Fall back to use the name field if all else fails (which can happen with imported EDestinations). svn path=/trunk/; revision=10665
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/backend/ebook/e-destination.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index de74fffbb0..6a10b7a275 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,9 @@
2001-07-01 Jon Trowbridge <trow@ximian.com>
+ * backend/ebook/e-destination.c (e_destination_get_string): Fall
+ back to use the name field if all else fails (which can happen
+ with imported EDestinations).
+
* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the
"recipient not specified" bug --- we were not correctly checking
for whether or not an EDestination was actually empty.
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index 882453be0e..172afb6da6 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -342,6 +342,12 @@ e_destination_get_string (const EDestination *dest)
if (priv->string == NULL)
priv->string = g_strdup (_("???"));
+
+ } else { /* If there is no card... */
+
+ if (priv->name)
+ return priv->name;
+
}
}
Chris Lahey <clahey@ximian.com> * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ #include <config.h> #include <stdlib.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-table-column-specification.h" /* workaround for avoiding API breakage */ #define etcs_get_type e_table_column_specification_get_type G_DEFINE_TYPE (ETableColumnSpecification, etcs, G_TYPE_OBJECT) static void free_strings (ETableColumnSpecification *etcs) { g_free(etcs->title); etcs->title = NULL; g_free(etcs->pixbuf); etcs->pixbuf = NULL; g_free(etcs->cell); etcs->cell = NULL; g_free(etcs->compare); etcs->compare = NULL; g_free(etcs->search); etcs->search = NULL; g_free (etcs->sortable); etcs->sortable = NULL; } static void etcs_finalize (GObject *object) { ETableColumnSpecification *etcs = E_TABLE_COLUMN_SPECIFICATION (object); free_strings(etcs); G_OBJECT_CLASS (etcs_parent_class)->finalize (object); } static void etcs_class_init (ETableColumnSpecificationClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = etcs_finalize; } static void etcs_init (ETableColumnSpecification *specification) { specification->model_col = 0; specification->compare_col = 0; specification->title = g_strdup(""); specification->pixbuf = NULL; specification->expansion = 0; specification->minimum_width = 0; specification->resizable = FALSE; specification->disabled = FALSE; specification->cell = NULL; specification->compare = NULL; specification->search = NULL; specification->priority = 0; } ETableColumnSpecification * e_table_column_specification_new (void) { ETableColumnSpecification *etcs = g_object_new (E_TABLE_COLUMN_SPECIFICATION_TYPE, NULL); return (ETableColumnSpecification *) etcs; } void e_table_column_specification_load_from_node (ETableColumnSpecification *etcs, const xmlNode *node) { free_strings(etcs); etcs->model_col = e_xml_get_integer_prop_by_name (node, (const unsigned char *)"model_col"); etcs->compare_col = e_xml_get_integer_prop_by_name_with_default (node, (const unsigned char *)"compare_col", etcs->model_col); etcs->title = e_xml_get_string_prop_by_name (node, (const unsigned char *)"_title"); etcs->pixbuf = e_xml_get_string_prop_by_name (node, (const unsigned char *)"pixbuf"); etcs->expansion = e_xml_get_double_prop_by_name (node, (const unsigned char *)"expansion"); etcs->minimum_width = e_xml_get_integer_prop_by_name (node, (const unsigned char *)"minimum_width"); etcs->resizable = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"resizable"); etcs->disabled = e_xml_get_bool_prop_by_name (node, (const unsigned char *)"disabled"); etcs->cell = e_xml_get_string_prop_by_name (node, (const unsigned char *)"cell"); etcs->compare = e_xml_get_string_prop_by_name (node, (const unsigned char *)"compare"); etcs->search = e_xml_get_string_prop_by_name (node, (const unsigned char *)"search"); etcs->sortable = e_xml_get_string_prop_by_name (node, (const unsigned char *)"sortable"); etcs->priority = e_xml_get_integer_prop_by_name_with_default (node, (const unsigned char *)"priority", 0); if (etcs->title == NULL) etcs->title = g_strdup(""); } xmlNode * e_table_column_specification_save_to_node (ETableColumnSpecification *specification, xmlNode *parent) { xmlNode *node; if (parent) node = xmlNewChild(parent, NULL, (const unsigned char *)"ETableColumn", NULL); else node = xmlNewNode(NULL, (const unsigned char *)"ETableColumn"); e_xml_set_integer_prop_by_name(node, (const unsigned char *)"model_col", specification->model_col); if (specification->compare_col != specification->model_col) e_xml_set_integer_prop_by_name(node, (const unsigned char *)"compare_col", specification->compare_col); e_xml_set_string_prop_by_name(node, (const unsigned char *)"_title", specification->title); e_xml_set_string_prop_by_name(node, (const unsigned char *)"pixbuf", specification->pixbuf); e_xml_set_double_prop_by_name(node, (const unsigned char *)"expansion", specification->expansion); e_xml_set_integer_prop_by_name(node, (const unsigned char *)"minimum_width", specification->minimum_width); e_xml_set_bool_prop_by_name(node, (const unsigned char *)"resizable", specification->resizable); e_xml_set_bool_prop_by_name(node, (const unsigned char *)"disabled", specification->disabled); e_xml_set_string_prop_by_name(node, (const unsigned char *)"cell", specification->cell); e_xml_set_string_prop_by_name(node, (const unsigned char *)"compare", specification->compare); e_xml_set_string_prop_by_name(node, (const unsigned char *)"search", specification->search); if (specification->priority != 0) e_xml_set_integer_prop_by_name (node, (const unsigned char *)"priority", specification->priority); return node; }