diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | gtk/gtkentrycompletion.c | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2006-06-19 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentrycompletion.c (gtk_entry_completion_compute_prefix): Don't + call g_str_has_prefix on a NULL strung. (#344897, Tommi Komulainen) + * gtk/gtkfilechooserdefault.c: Avoid a near-duplicate string and add some translator comments. (#345320, #345321, Hendrik Richter) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a06223520e..f74b7ae84c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-06-19 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentrycompletion.c (gtk_entry_completion_compute_prefix): Don't + call g_str_has_prefix on a NULL strung. (#344897, Tommi Komulainen) + * gtk/gtkfilechooserdefault.c: Avoid a near-duplicate string and add some translator comments. (#345320, #345321, Hendrik Richter) diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 34d9bd0998..46bc7ffad7 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1486,7 +1486,7 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion) &iter, completion->priv->text_column, &text, -1); - if (g_str_has_prefix (text, key)) + if (text && g_str_has_prefix (text, key)) { if (!prefix) prefix = g_strdup (text); |