aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-08-21 09:11:46 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-08-21 09:11:46 +0800
commit882ebae3deff7b7b2dda6ce45809346f3f450661 (patch)
tree1a53cfc2410e99333fca762a7e49720689279e52 /addressbook/backend
parenta0bfb48ea7f1ddce8d55341939249fcc49ba754b (diff)
downloadgsoc2013-evolution-882ebae3deff7b7b2dda6ce45809346f3f450661.tar.gz
gsoc2013-evolution-882ebae3deff7b7b2dda6ce45809346f3f450661.tar.zst
gsoc2013-evolution-882ebae3deff7b7b2dda6ce45809346f3f450661.zip
Wrap our addressbook table adapter in an ETableWithout, so that we can
2001-08-20 Jon Trowbridge <trow@ximian.com> * gui/component/select-names/e-select-names.c (e_addressbook_create_ebook_table): Wrap our addressbook table adapter in an ETableWithout, so that we can make addresses appear and disappear when we remove/add them to the section lists (To/Cc/Bcc) on the right of the dialog. (real_add_address_cb): When we add an address, hide it in the main list. (e_select_names_init): Get pointer to our without table from the table's object data, and store it. (remove_address): When we remove an address, show it in the main list. (card_key): Added. Allocate a unique key from an ECard. (esn_get_key_fn): Added. Callback for ETableWithout. (esn_dup_key_fn): Added. Callback for ETableWithout. (esn_free_gotten_key_fn): Added. Callback for ETableWithout. (esn_free_duped_key_fn): Added. Callback for ETableWithout. * backend/ebook/e-card-simple.c (e_card_simple_get): Changed E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS type. This allows the cards in the ESelectName dialog to appear in proper sort order (i.e. as 'Doe, John' rather than 'John Doe'). Fixes ximian #6002. svn path=/trunk/; revision=12334
Diffstat (limited to 'addressbook/backend')
-rw-r--r--addressbook/backend/ebook/e-card-simple.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
index 5bd8bb57e5..713b587cb2 100644
--- a/addressbook/backend/ebook/e-card-simple.c
+++ b/addressbook/backend/ebook/e-card-simple.c
@@ -786,6 +786,11 @@ char *e_card_simple_get (ECardSimple *simple,
case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
if (simple->card) {
gtk_object_get(GTK_OBJECT(simple->card),
+ "file_as", &string,
+ NULL);
+ if (string && *string)
+ return g_strdup(string);
+ gtk_object_get(GTK_OBJECT(simple->card),
"full_name", &string,
NULL);
if (string && *string)