Check if completion is non-NULL before accessing it. Oops.

Sat Oct 11 19:09:05 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
	non-NULL before accessing it. Oops.
This commit is contained in:
Kristian Rietveld 2003-10-11 17:10:37 +00:00 committed by Kristian Rietveld
parent 761a6745c3
commit 407e957c04
6 changed files with 29 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
non-NULL before accessing it. Oops.
Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action), * gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action),

View File

@ -1,3 +1,8 @@
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
non-NULL before accessing it. Oops.
Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action), * gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action),

View File

@ -1,3 +1,8 @@
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
non-NULL before accessing it. Oops.
Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action), * gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action),

View File

@ -1,3 +1,8 @@
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
non-NULL before accessing it. Oops.
Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action), * gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action),

View File

@ -1,3 +1,8 @@
Sat Oct 11 19:09:05 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_set_text): Check if completion is
non-NULL before accessing it. Oops.
Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org> Sat Oct 11 15:47:03 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action), * gtk/gtkentrycompletion.[ch] (gtk_entry_completion_insert_action),

View File

@ -3453,7 +3453,8 @@ gtk_entry_set_text (GtkEntry *entry,
g_return_if_fail (text != NULL); g_return_if_fail (text != NULL);
completion = gtk_entry_get_completion (entry); completion = gtk_entry_get_completion (entry);
g_signal_handler_block (entry, completion->priv->changed_id); if (completion)
g_signal_handler_block (entry, completion->priv->changed_id);
/* Actually setting the text will affect the cursor and selection; /* Actually setting the text will affect the cursor and selection;
* if the contents don't actually change, this will look odd to the user. * if the contents don't actually change, this will look odd to the user.
@ -3466,7 +3467,8 @@ gtk_entry_set_text (GtkEntry *entry,
tmp_pos = 0; tmp_pos = 0;
gtk_editable_insert_text (GTK_EDITABLE (entry), text, strlen (text), &tmp_pos); gtk_editable_insert_text (GTK_EDITABLE (entry), text, strlen (text), &tmp_pos);
g_signal_handler_unblock (entry, completion->priv->changed_id); if (completion)
g_signal_handler_unblock (entry, completion->priv->changed_id);
} }
void void