val_labs_equal: Accept null pointers

[pspp] / src / ui / gui / psppire-value-entry.c

diff --git a/src/ui/gui/psppire-value-entry.c b/src/ui/gui/psppire-value-entry.c
index 675df83966ef3aa7e49e27e644bfec7cec59b99f..85dbaa093cb31134a50ca04c50a12622290bdaca 100644 (file)
--- a/src/ui/gui/psppire-value-entry.c
+++ b/src/ui/gui/psppire-value-entry.c
@@ -243,6 +243,7 @@ psppire_value_entry_refresh_model (PsppireValueEntry *obj)
 {
   GtkWidget *entry = gtk_bin_get_child (GTK_BIN (obj));
   GtkTreeModel *model;
+  GtkTreeModel *old_model;
 
   if (val_labs_count (obj->val_labs) > 0)
     {
@@ -270,6 +271,14 @@ psppire_value_entry_refresh_model (PsppireValueEntry *obj)
   else
     model = NULL;
 
+  old_model = gtk_combo_box_get_model (GTK_COMBO_BOX (obj));
+
+  if (old_model != model)
+    {
+      GtkEntry *entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (obj)));
+      gtk_entry_set_text (entry, "");
+    }
+
   gtk_combo_box_set_model (GTK_COMBO_BOX (obj), model);
   gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (obj), COL_LABEL);
   gtk_widget_set_sensitive (entry, model != NULL);
@@ -310,9 +319,7 @@ void
 psppire_value_entry_set_value_labels (PsppireValueEntry *obj,
                                       const struct val_labs *val_labs)
 {
-  if (val_labs != NULL
-      ? obj->val_labs == NULL || !val_labs_equal (obj->val_labs, val_labs)
-      : obj->val_labs != NULL)
+  if (!val_labs_equal (obj->val_labs, val_labs))
     {
       obj->cur_value = NULL;