diff options
| -rw-r--r-- | addressbook/ChangeLog | 17 | ||||
| -rw-r--r-- | addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-util.c | 2 |
5 files changed, 27 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5e63a1842e..25c93710d9 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,20 @@ +2002-09-25 Dan Winship <danw@ximian.com> + + * gui/component/addressbook-component.c (folder_types): Rename + "ldap-contacts" to "contacts/ldap" and add "contacts/public". + (IS_CONTACT_TYPE): update for new types. + + * gui/component/select-names/e-select-names.c + (e_select_names_init): Use "contacts/*" for selector_types. + + * gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards): + Likewise. + + * gui/component/GNOME_Evolution_Addressbook.oaf.in: add + "evolution:config_item:type" = "contacts/ldap" to the LDAP sources + control so it comes up by default when you open Preferences in an + LDAP folder. + 2002-09-23 Chris Toshok <toshok@ximian.com> * gui/widgets/e-addressbook-table-adapter.c (addressbook_destroy): diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in index d62e1262f4..294db83fe9 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in @@ -163,6 +163,10 @@ <oaf_attribute name="evolution:config_item:icon_name" type="string" value="ldap-settings.png"/> + <oaf_attribute name="evolution:config_item:type" type="stringv"> + <item value="contacts/ldap"/> + </oaf_attribute> + <oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/> <oaf_attribute name="description" type="string" diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 7438576931..791e49ac48 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -72,12 +72,14 @@ 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 }, - { "ldap-contacts", "ldap.png", N_("LDAP Server"), N_("LDAP server containing contact information"), + { "contacts/ldap", "ldap.png", N_("LDAP Server"), N_("LDAP server containing contact information"), + FALSE, accepted_dnd_types, NULL }, + { "contacts/public", "evolution-contacts.png", N_("Public Contacts"), N_("Public folder containing contact information"), FALSE, accepted_dnd_types, NULL }, { NULL } }; -#define IS_CONTACT_TYPE(x) (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "ldap-contacts") == 0) +#define IS_CONTACT_TYPE(x) (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "contacts/ldap") == 0 || g_strcasecmp((x), "contacts/public")) /* EvolutionShellComponent methods and signals. */ diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 9dfebe4ca2..e0aa78b7ec 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -491,7 +491,7 @@ e_select_names_init (ESelectNames *e_select_names) { GladeXML *gui; GtkWidget *widget, *button; - const char *selector_types[] = { "contacts", "ldap-contacts", NULL }; + const char *selector_types[] = { "contacts/*", NULL }; char *filename; char *uri; char *contacts_uri, *contacts_path; diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c index cdb17086a3..a0ec15f3cc 100644 --- a/addressbook/gui/widgets/e-addressbook-util.c +++ b/addressbook/gui/widgets/e-addressbook-util.c @@ -331,7 +331,7 @@ extern EvolutionShellClient *global_shell_client; void e_addressbook_transfer_cards (EBook *source, GList *cards /* adopted */, gboolean delete_from_source, GtkWindow *parent_window) { - const char *allowed_types[] = { "contacts", NULL }; + const char *allowed_types[] = { "contacts/*", NULL }; GNOME_Evolution_Folder *folder; static char *last_uri = NULL; CardCopyProcess *process; |