aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarfraaz Ahmed <asarfraaz@novell.com>2005-05-06 12:47:19 +0800
committerAhmed Sarfraaz <sarfraaz@src.gnome.org>2005-05-06 12:47:19 +0800
commit21a815d86fbe90d33e7713d878147cce00df34fd (patch)
treebb404e31d5448d556bd3de659c57db601e0fdf79
parenta5b8cdfdbead7f6fbe3fdffb69e31f839a6e1b25 (diff)
downloadgsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.tar
gsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.tar.gz
gsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.tar.bz2
gsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.tar.lz
gsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.tar.xz
gsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.tar.zst
gsoc2013-evolution-21a815d86fbe90d33e7713d878147cce00df34fd.zip
Solaris gettext crashes on NULL input string. Fixes #260312. Patch
2005-05-06 Sarfraaz Ahmed <asarfraaz@novell.com> * misc/e-search-bar.c: (set_menu) Solaris gettext crashes on NULL input string. Fixes #260312. Patch submitted by Suresh Chandrasekharan <suresh.chandrasekharan@sun.com> svn path=/trunk/; revision=29282
-rw-r--r--widgets/ChangeLog6
-rw-r--r--widgets/misc/e-search-bar.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index e17316dd30..09fe5ea3eb 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06 Sarfraaz Ahmed <asarfraaz@novell.com>
+
+ * misc/e-search-bar.c: (set_menu) Solaris gettext crashes on NULL
+ input string. Fixes #260312. Patch submitted by
+ Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
+
2005-04-28 Li Yuan <li.yuan@sun.com>
* misc/e-calendar-item.c: (e_calendar_item_realize),
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index cdf4b37113..72a4494dc4 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -603,7 +603,7 @@ set_menu (ESearchBar *esb,
g_assert (items[i].subitems == NULL);
new_item = g_new (ESearchBarItem, 1);
- new_item->text = g_strdup (_(items[i].text));
+ new_item->text = items[i].text ? g_strdup (_(items[i].text)) : NULL;
new_item->id = items[i].id;
new_item->subitems = NULL;