From 7b221ebc07a7867c3528b113e82f25a01816a015 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 5 Dec 2008 19:20:28 +0000
Subject: ** Fix for bug #332629

2008-12-05  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #332629

	* filter/filter-option.h: (struct _filter_option),
	(struct _FilterOption), (filter_option_add):
	* filter/filter-option.c: (filter_option_init), (filter_option_finalise),
	(filter_option_add), (xml_create), (get_widget), (clone):
	Be able to define optionlist with dynamically created list of options.

	* filter/filter-label.c: (fill_options): Adapt.

	* addressbook/gui/widgets/addresstypes.xml:
	* calendar/gui/caltypes.xml:
	* calendar/gui/memotypes.xml:
	* calendar/gui/tasktypes.xml:
	Use dynamically created list of categories in the option's widget.


svn path=/trunk/; revision=36836
---
 addressbook/ChangeLog                    |  7 ++++
 addressbook/gui/widgets/addresstypes.xml | 67 +-------------------------------
 2 files changed, 8 insertions(+), 66 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0465a19384..47b128090d 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-05  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #332629
+
+	* gui/widgets/addresstypes.xml:
+	Use dynamically created list of categories in the option's widget.
+
 2008-12-04  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #263268
diff --git a/addressbook/gui/widgets/addresstypes.xml b/addressbook/gui/widgets/addresstypes.xml
index 813bf1c0ac..c93f9cac19 100644
--- a/addressbook/gui/widgets/addresstypes.xml
+++ b/addressbook/gui/widgets/addresstypes.xml
@@ -74,72 +74,7 @@
     </option>
    </input>
    <input type="optionlist" name="category">
-    <option value="Anniversary">
-        <title>Anniversary</title>
-    </option>
-    <option value="Holiday">
-        <title>Holiday</title>
-    </option>
-    <option value="Ideas">
-        <title>Ideas</title>
-    </option>
-    <option value="Status">
-        <title>Status</title>
-    </option>
-    <option value="Holiday Cards">
-        <title>Holiday Cards</title>
-    </option>
-    <option value="Hot Contacts">
-        <title>Hot Contacts</title>
-    </option>
-    <option value="International">
-        <title>International</title>
-    </option>
-    <option value="Birthday">
-        <title>Birthday</title>
-    </option>
-    <option value="VIP">
-        <title>VIP</title>
-    </option>
-    <option value="Gifts">
-        <title>Gifts</title>
-    </option>
-    <option value="Waiting">
-        <title>Waiting</title>
-    </option>
-    <option value="Key Customer">
-        <title>Key Customer</title>
-    </option>
-    <option value="Time &amp; Expenses">
-        <title>Time &amp; Expenses </title>
-    </option>
-    <option value="Miscellaneous">
-        <title>Miscellaneous</title>
-    </option>
-    <option value="Business">
-        <title>Business</title>
-    </option>
-    <option value="Personal">
-        <title>Personal</title>
-    </option>
-    <option value="Suppliers">
-        <title>Suppliers</title>
-    </option>
-    <option value="Goals/Objectives">
-        <title>Goals/Objectives</title>
-    </option>
-    <option value="Strategies">
-        <title>Strategies</title>
-    </option>
-    <option value="Competition">
-        <title>Competition</title>
-    </option>
-    <option value="Favourites">
-        <title>Favourites</title>
-    </option>
-    <option value="Phone Calls">
-        <title>Phone Calls</title>
-    </option>
+      <dynamic func="e_util_get_category_filter_options"/>
    </input>
  </part>
  <part name="sexp">
-- 
cgit v1.2.3