diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index e7b77d4923..e568fe4a27 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2001-08-27 Ettore Perazzoli <ettore@ximian.com> + + * gui/component/addressbook-component.c: Get rid of a warning by + initializing the closing NULL element in folder_types correctly. + + * gui/component/select-names/e-select-names.c: Updated to match + the studlyCapsification of attributes in shell/Evolution*.idl. + 2001-08-27 Jon Trowbridge <trow@ximian.com> * gui/component/select-names/e-select-names-completion.c diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 46e9e7a6a7..ea74122399 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -67,7 +67,7 @@ static char *accepted_dnd_types[] = { static const EvolutionShellComponentFolderType folder_types[] = { { "contacts", "evolution-contacts.png", N_("Contacts"), N_("Folder containing contact information"), TRUE, accepted_dnd_types, NULL }, - { NULL, NULL, FALSE, NULL, NULL } + { NULL } }; diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 7a40a14c76..7316458630 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -361,11 +361,11 @@ new_folder (EvolutionStorageListener *storage_listener, if (!strcmp(folder->type, "contacts")) { ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1); e_folder->description = g_strdup(folder->description ); - e_folder->display_name = g_strdup(folder->display_name); - if (!strncmp (folder->physical_uri, "file:", 5)) - e_folder->uri = g_strdup_printf ("%s/addressbook.db", folder->physical_uri); + e_folder->display_name = g_strdup(folder->displayName); + if (!strncmp (folder->physicalUri, "file:", 5)) + e_folder->uri = g_strdup_printf ("%s/addressbook.db", folder->physicalUri); else - e_folder->uri = g_strdup(folder->physical_uri); + e_folder->uri = g_strdup(folder->physicalUri); g_hash_table_insert(e_select_names->folders, g_strdup(path), e_folder); update_option_menu(e_select_names); |