diff options
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card-simple.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 16 |
3 files changed, 17 insertions, 12 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 7df3700a39..8b8aec9e75 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,12 @@ +2000-10-18 Christopher James Lahey <clahey@helixcode.com> + + * backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the + email address if both name and organization are taken. + + * gui/component/select-names/e-select-names.c: Fixed up the spec + strings in this class. Removed the "cursor_mode" argument to + ETable since it's part of the spec now. + 2000-10-17 Iain Holmes <iain@helixcode.com> * contact-editor/contact-editor.glade: Change the initial dialog diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c index 7cb644a802..ff65ff82b0 100644 --- a/addressbook/backend/ebook/e-card-simple.c +++ b/addressbook/backend/ebook/e-card-simple.c @@ -767,6 +767,10 @@ char *e_card_simple_get (ECardSimple *simple, gtk_object_get(GTK_OBJECT(simple->card), "org", &string, NULL); + if (string && *string) + return g_strdup(string); + string = e_card_simple_get_email(simple, + E_CARD_SIMPLE_EMAIL_ID_EMAIL); return g_strdup(string); case E_CARD_SIMPLE_FIELD_FAMILY_NAME: gtk_object_get (GTK_OBJECT(simple->card), diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 611f6a76ff..e0ff5f6519 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -87,19 +87,19 @@ e_select_names_class_init (ESelectNamesClass *klass) object_class->destroy = e_select_names_destroy; } -#define SPEC "<ETableSpecification no-headers=\"true\"> \ - <ETableColumn model_col= \"34\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \ +#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \ + <ETableColumn model_col= \"35\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \ <ETableState> \ <column source=\"0\"/> \ <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \ </ETableState> \ </ETableSpecification>" -#define SPEC2 "<ETableSpecification no-headers=\"true\"> \ +#define SPEC2 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \ <ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \ <ETableState> \ <column source=\"0\"/> \ - <grouping> </grouping> \ + <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \ </ETableState> \ </ETableSpecification>" @@ -139,10 +139,6 @@ e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int n g_free(filename); table = e_table_scrolled_new (model, NULL, SPEC, NULL); - gtk_object_set(GTK_OBJECT(table), - "cursor_mode", E_TABLE_CURSOR_LINE, - NULL); - gtk_object_set_data(GTK_OBJECT(table), "model", model); return table; } @@ -336,10 +332,6 @@ e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, E gtk_signal_connect(GTK_OBJECT(etable), "double_click", GTK_SIGNAL_FUNC(remove_address), child); - gtk_object_set(GTK_OBJECT(etable), - "cursor_mode", E_TABLE_CURSOR_LINE, - NULL); - child->model = model; child->source = source; gtk_object_ref(GTK_OBJECT(child->model)); |