From 0f614b2e971aa0f7168b63f335e1c738bf4f9379 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 21 May 2009 22:15:40 -0400
Subject: Fix what I assume are some merge errors.

---
 e-util/e-util.c | 21 +++++++++++++++++++++
 e-util/e-util.h |  2 ++
 2 files changed, 23 insertions(+)

(limited to 'e-util')

diff --git a/e-util/e-util.c b/e-util/e-util.c
index 576f46e54b..e4658c1bd7 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1511,6 +1511,27 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer,
 	return res;
 }
 
+GSList *
+e_util_get_category_filter_options (void)
+{
+	GSList *res = NULL;
+	GList *clist, *l;
+
+	clist = e_categories_get_list ();
+	for (l = clist; l; l = l->next) {
+		const gchar *cname = l->data;
+		struct _filter_option *fo = g_new0 (struct _filter_option, 1);
+
+		fo->title = g_strdup (cname);
+		fo->value = g_strdup (cname);
+		res = g_slist_prepend (res, fo);
+	}
+
+	g_list_free (clist);
+
+	return g_slist_reverse (res);
+}
+
 static gpointer
 e_camel_object_copy (gpointer camel_object)
 {
diff --git a/e-util/e-util.h b/e-util/e-util.h
index c748aaed8e..458bef77a7 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -140,6 +140,8 @@ gboolean	e_util_read_file		(const gchar *filename,
 						 gchar **buffer,
 						 gsize *read,
 						 GError **error);
+GSList *	e_util_get_category_filter_options
+						(void);
 
 /* Camel uses its own object system, so we have to box
  * CamelObjects to safely use them as GObject properties. */
-- 
cgit