diff options
| author | Sushma Rai <rsushma@src.gnome.org> | 2005-11-28 13:13:19 +0000 |
|---|---|---|
| committer | Sushma Rai <rsushma@src.gnome.org> | 2005-11-28 13:13:19 +0000 |
| commit | 8acab3c3b76737b266d80dbe98eec5aec84f8df2 (patch) | |
| tree | 7e71397c152c66c1388a6533ec9aaa8c8fbfda59 | |
| parent | 17fb6cc9f117329a4242d8f2b3dba61ff1545165 (diff) | |
| download | evolution-data-server-8acab3c3b76737b266d80dbe98eec5aec84f8df2.tar.gz | |
Patch for not bringing back deleted default categories. Fixes #273905.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libedataserver/e-categories.c | 52 |
2 files changed, 34 insertions, 25 deletions
@@ -1,3 +1,10 @@ +2005-11-28 Sushma Rai <rsushma@novell.com> + + * libedataserver/e-categories.c (initialize_categories_config): Add + default categories only if the category list is empty in gconf, so that + we don't bring back the deleted category from the default list + every time. Fixes #273905. + 2005-10-25 Irene Huang <Irene.Huang@sun.com> * configure.in: Add API_VERSION to EVO_SUBST_SERVER_RULE diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c index cf36e655e..e4ba8aaf9 100644 --- a/libedataserver/e-categories.c +++ b/libedataserver/e-categories.c @@ -231,32 +231,34 @@ initialize_categories_config (void) conf_is_dirty = FALSE; } + else { + /* Add default categories only if gconf doesn't contain any category list */ + /* Make sure we have all categories */ + e_categories_add (_("Anniversary"), NULL, NULL, TRUE); + e_categories_add (_("Birthday"), NULL, E_DATA_SERVER_IMAGESDIR "/category_birthday_16.png", TRUE); + e_categories_add (_("Business"), NULL, E_DATA_SERVER_IMAGESDIR "/category_business_16.png", TRUE); + e_categories_add (_("Competition"), NULL, NULL, TRUE); + e_categories_add (_("Favorites"), NULL, E_DATA_SERVER_IMAGESDIR "/category_favorites_16.png", TRUE); + e_categories_add (_("Gifts"), NULL, E_DATA_SERVER_IMAGESDIR "/category_gifts_16.png", TRUE); + e_categories_add (_("Goals/Objectives"), NULL, E_DATA_SERVER_IMAGESDIR "/category_goals_16.png", TRUE); + e_categories_add (_("Holiday"), NULL, E_DATA_SERVER_IMAGESDIR "/category_holiday_16.png", TRUE); + e_categories_add (_("Holiday Cards"), NULL, E_DATA_SERVER_IMAGESDIR "/category_holiday-cards_16.png", TRUE); + e_categories_add (_("Hot Contacts"), NULL, E_DATA_SERVER_IMAGESDIR "/category_hot-contacts_16.png", TRUE); + e_categories_add (_("Ideas"), NULL, E_DATA_SERVER_IMAGESDIR "/category_ideas_16.png", TRUE); + e_categories_add (_("International"), NULL, E_DATA_SERVER_IMAGESDIR "/category_international_16.png", TRUE); + e_categories_add (_("Key Customer"), NULL, E_DATA_SERVER_IMAGESDIR "/category_key-customer_16.png", TRUE); + e_categories_add (_("Miscellaneous"), NULL, E_DATA_SERVER_IMAGESDIR "/category_miscellaneous_16.png", TRUE); + e_categories_add (_("Personal"), NULL, E_DATA_SERVER_IMAGESDIR "/category_personal_16.png", TRUE); + e_categories_add (_("Phone Calls"), NULL, E_DATA_SERVER_IMAGESDIR "/category_phonecalls_16.png", TRUE); + e_categories_add (_("Status"), NULL, E_DATA_SERVER_IMAGESDIR "/category_status_16.png", TRUE); + e_categories_add (_("Strategies"), NULL, E_DATA_SERVER_IMAGESDIR "/category_strategies_16.png", TRUE); + e_categories_add (_("Suppliers"), NULL, E_DATA_SERVER_IMAGESDIR "/category_suppliers_16.png", TRUE); + e_categories_add (_("Time & Expenses"), NULL, E_DATA_SERVER_IMAGESDIR "/category_time-and-expenses_16.png", TRUE); + e_categories_add (_("VIP"), NULL, NULL, TRUE); + e_categories_add (_("Waiting"), NULL, NULL, TRUE); - /* Make sure we have all categories */ - add_category_if_not_present (_("Anniversary"), NULL, NULL, TRUE); - add_category_if_not_present (_("Birthday"), NULL, E_DATA_SERVER_IMAGESDIR "/category_birthday_16.png", TRUE); - add_category_if_not_present (_("Business"), NULL, E_DATA_SERVER_IMAGESDIR "/category_business_16.png", TRUE); - add_category_if_not_present (_("Competition"), NULL, NULL, TRUE); - add_category_if_not_present (_("Favorites"), NULL, E_DATA_SERVER_IMAGESDIR "/category_favorites_16.png", TRUE); - add_category_if_not_present (_("Gifts"), NULL, E_DATA_SERVER_IMAGESDIR "/category_gifts_16.png", TRUE); - add_category_if_not_present (_("Goals/Objectives"), NULL, E_DATA_SERVER_IMAGESDIR "/category_goals_16.png", TRUE); - add_category_if_not_present (_("Holiday"), NULL, E_DATA_SERVER_IMAGESDIR "/category_holiday_16.png", TRUE); - add_category_if_not_present (_("Holiday Cards"), NULL, E_DATA_SERVER_IMAGESDIR "/category_holiday-cards_16.png", TRUE); - add_category_if_not_present (_("Hot Contacts"), NULL, E_DATA_SERVER_IMAGESDIR "/category_hot-contacts_16.png", TRUE); - add_category_if_not_present (_("Ideas"), NULL, E_DATA_SERVER_IMAGESDIR "/category_ideas_16.png", TRUE); - add_category_if_not_present (_("International"), NULL, E_DATA_SERVER_IMAGESDIR "/category_international_16.png", TRUE); - add_category_if_not_present (_("Key Customer"), NULL, E_DATA_SERVER_IMAGESDIR "/category_key-customer_16.png", TRUE); - add_category_if_not_present (_("Miscellaneous"), NULL, E_DATA_SERVER_IMAGESDIR "/category_miscellaneous_16.png", TRUE); - add_category_if_not_present (_("Personal"), NULL, E_DATA_SERVER_IMAGESDIR "/category_personal_16.png", TRUE); - add_category_if_not_present (_("Phone Calls"), NULL, E_DATA_SERVER_IMAGESDIR "/category_phonecalls_16.png", TRUE); - add_category_if_not_present (_("Status"), NULL, E_DATA_SERVER_IMAGESDIR "/category_status_16.png", TRUE); - add_category_if_not_present (_("Strategies"), NULL, E_DATA_SERVER_IMAGESDIR "/category_strategies_16.png", TRUE); - add_category_if_not_present (_("Suppliers"), NULL, E_DATA_SERVER_IMAGESDIR "/category_suppliers_16.png", TRUE); - add_category_if_not_present (_("Time & Expenses"), NULL, E_DATA_SERVER_IMAGESDIR "/category_time-and-expenses_16.png", TRUE); - add_category_if_not_present (_("VIP"), NULL, NULL, TRUE); - add_category_if_not_present (_("Waiting"), NULL, NULL, TRUE); - - save_config (); + save_config (); + } } static void |