aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-search-bar.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index bc3cef32dd..c880937751 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-14 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #211353
+
+ * e-search-bar.c: (e_search_bar_get_viewitem_id):
+ Return -1 if no viewmenu is setup yet.
+
2007-12-17 Srinivasa Ragavan <sragavan@novell.com>
** Revamped Activity handler and task bar/widget for non-intrusive
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index a4da8b3f79..0365938507 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -1491,6 +1491,9 @@ e_search_bar_get_viewitem_id (ESearchBar *search_bar)
g_return_val_if_fail (search_bar != NULL, -1);
g_return_val_if_fail (E_IS_SEARCH_BAR (search_bar), -1);
+ if (!search_bar->viewoption_menu)
+ return -1;
+
menu_item = gtk_menu_get_active (GTK_MENU (search_bar->viewoption_menu));
viewitem_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "EsbItemId"));