Bug #639483 - Category list includes weather information

8 files changed, 8 insertions, 8 deletions

diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 7dec37968d..b2c63b872a 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -1124,7 +1124,7 @@ e_book_shell_view_update_search_filter (EBookShellView *book_shell_view)
 
 	/* Build the category actions. */
 
-	list = e_categories_get_list ();
+	list = e_util_get_searchable_categories ();
 	for (iter = list, ii = 0; iter != NULL; iter = iter->next, ii++) {
 		const gchar *category_name = iter->data;
 		const gchar *filename;
diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index 2ac5d98968..8b5d816eaa 100644
--- a/modules/addressbook/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
@@ -223,7 +223,7 @@ book_shell_view_execute_search (EShellView *shell_view)
 			GList *categories;
 			const gchar *category_name;
 
-			categories = e_categories_get_list ();
+			categories = e_util_get_searchable_categories ();
 			category_name = g_list_nth_data (categories, filter_id);
 			g_list_free (categories);
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 90abf79c3c..5e16b6db5b 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1858,7 +1858,7 @@ e_cal_shell_view_update_search_filter (ECalShellView *cal_shell_view)
 
 	/* Build the category actions. */
 
-	list = e_categories_get_list ();
+	list = e_util_get_searchable_categories ();
 	for (iter = list, ii = 0; iter != NULL; iter = iter->next, ii++) {
 		const gchar *category_name = iter->data;
 		const gchar *filename;
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 6aafdc82a6..1210d2d267 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -191,7 +191,7 @@ cal_shell_view_execute_search (EShellView *shell_view)
 			GList *categories;
 			const gchar *category_name;
 
-			categories = e_categories_get_list ();
+			categories = e_util_get_searchable_categories ();
 			category_name = g_list_nth_data (categories, value);
 			g_list_free (categories);
 
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index a55eab1c10..660ad09f5f 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -977,7 +977,7 @@ e_memo_shell_view_update_search_filter (EMemoShellView *memo_shell_view)
 
 	/* Build the category actions. */
 
-	list = e_categories_get_list ();
+	list = e_util_get_searchable_categories ();
 	for (iter = list, ii = 0; iter != NULL; iter = iter->next, ii++) {
 		const gchar *category_name = iter->data;
 		const gchar *filename;
diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index 870d5aedc8..219497577c 100644
--- a/modules/calendar/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
@@ -139,7 +139,7 @@ memo_shell_view_execute_search (EShellView *shell_view)
 			GList *categories;
 			const gchar *category_name;
 
-			categories = e_categories_get_list ();
+			categories = e_util_get_searchable_categories ();
 			category_name = g_list_nth_data (categories, value);
 			g_list_free (categories);
 
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index d3531244d9..dce77b0af7 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -1176,7 +1176,7 @@ e_task_shell_view_update_search_filter (ETaskShellView *task_shell_view)
 
 	/* Build the category actions. */
 
-	list = e_categories_get_list ();
+	list = e_util_get_searchable_categories ();
 	for (iter = list, ii = 0; iter != NULL; iter = iter->next, ii++) {
 		const gchar *category_name = iter->data;
 		const gchar *filename;
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index b4c6c7db0b..7b575f84d4 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -249,7 +249,7 @@ task_shell_view_execute_search (EShellView *shell_view)
 			GList *categories;
 			const gchar *category_name;
 
-			categories = e_categories_get_list ();
+			categories = e_util_get_searchable_categories ();
 			category_name = g_list_nth_data (categories, value);
 			g_list_free (categories);