Don't unref model if it is NULL. (#139770)

2004-04-12  Matthias Clasen  <mclasen@dhcp64-228.boston.redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_unset_model): Don't unref
	model if it is NULL. (#139770)

diff --git a/ChangeLog b/ChangeLog
index cdfa77e7e99a4c9be30b6fc4d2066a32cf3bbed2..d0a63f180a50177d50d5e2f542410d6ba6f7d151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-12  Matthias Clasen  <mclasen@dhcp64-228.boston.redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Don't unref
+       model if it is NULL. (#139770)
+
        * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Typo fix.
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_init): Don't add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cdfa77e7e99a4c9be30b6fc4d2066a32cf3bbed2..d0a63f180a50177d50d5e2f542410d6ba6f7d151 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-04-12  Matthias Clasen  <mclasen@dhcp64-228.boston.redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Don't unref
+       model if it is NULL. (#139770)
+
        * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Typo fix.
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_init): Don't add

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cdfa77e7e99a4c9be30b6fc4d2066a32cf3bbed2..d0a63f180a50177d50d5e2f542410d6ba6f7d151 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2004-04-12  Matthias Clasen  <mclasen@dhcp64-228.boston.redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Don't unref
+       model if it is NULL. (#139770)
+
        * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Typo fix.
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_init): Don't add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cdfa77e7e99a4c9be30b6fc4d2066a32cf3bbed2..d0a63f180a50177d50d5e2f542410d6ba6f7d151 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-04-12  Matthias Clasen  <mclasen@dhcp64-228.boston.redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Don't unref
+       model if it is NULL. (#139770)
+
        * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Typo fix.
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_init): Don't add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cdfa77e7e99a4c9be30b6fc4d2066a32cf3bbed2..d0a63f180a50177d50d5e2f542410d6ba6f7d151 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-04-12  Matthias Clasen  <mclasen@dhcp64-228.boston.redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Don't unref
+       model if it is NULL. (#139770)
+
        * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Typo fix.
 
        * gtk/gtkentrycompletion.c (gtk_entry_completion_init): Don't add

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0690152eeaa6213bbf9042661577d4babe26e302..79942ee42c0f415e12452bcfb3941534aa0674d5 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1483,8 +1483,11 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box)
                                (GtkCallback)gtk_widget_destroy, NULL);
     }
 
-  g_object_unref (G_OBJECT (combo_box->priv->model));
-  combo_box->priv->model = NULL;
+  if (combo_box->priv->model)
+    {
+      g_object_unref (G_OBJECT (combo_box->priv->model));
+      combo_box->priv->model = NULL;
+    }
 }
 
 static void