Remove useless calls to gtk_tree_row_reference_inserted/deleted, since we

2005-07-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_model_row_deleted)
	(gtk_combo_box_model_row_inserted): Remove useless calls
	to gtk_tree_row_reference_inserted/deleted, since we
	don't use manual row references here.

diff --git a/ChangeLog b/ChangeLog
index 30fb2f9779654f4bf187237e450fb88aea24e8d4..0a789633b947d1fe7ba608391a6c8beabda8d303 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-07-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_model_row_deleted) 
+       (gtk_combo_box_model_row_inserted): Remove useless calls
+       to gtk_tree_row_reference_inserted/deleted, since we
+       don't use manual row references here. 
+
        * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
        gettext_initialization before checking gtk_initialized, otherwise
        there are scenarios where it is not called at all. For an

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30fb2f9779654f4bf187237e450fb88aea24e8d4..0a789633b947d1fe7ba608391a6c8beabda8d303 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-07-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_model_row_deleted) 
+       (gtk_combo_box_model_row_inserted): Remove useless calls
+       to gtk_tree_row_reference_inserted/deleted, since we
+       don't use manual row references here. 
+
        * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
        gettext_initialization before checking gtk_initialized, otherwise
        there are scenarios where it is not called at all. For an

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 30fb2f9779654f4bf187237e450fb88aea24e8d4..0a789633b947d1fe7ba608391a6c8beabda8d303 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-07-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_model_row_deleted) 
+       (gtk_combo_box_model_row_inserted): Remove useless calls
+       to gtk_tree_row_reference_inserted/deleted, since we
+       don't use manual row references here. 
+
        * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
        gettext_initialization before checking gtk_initialized, otherwise
        there are scenarios where it is not called at all. For an

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 8df90b9b1b29606171d7c0bd806404ea26a8d398..99760b805e77b36be4750449ca06dfbe3c9088bd 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2783,8 +2783,6 @@ gtk_combo_box_model_row_inserted (GtkTreeModel     *model,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
 
-  gtk_tree_row_reference_inserted (G_OBJECT (user_data), path);
-    
   if (combo_box->priv->tree_view)
     gtk_combo_box_list_popup_resize (combo_box);
   else
@@ -2798,19 +2796,9 @@ gtk_combo_box_model_row_deleted (GtkTreeModel     *model,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
 
-  gtk_tree_row_reference_deleted (G_OBJECT (combo_box), path);
-
   if (combo_box->priv->cell_view)
     {
-      if (gtk_tree_row_reference_valid (combo_box->priv->active_row))
-       {
-         GtkTreePath *path;
-
-         path = gtk_tree_row_reference_get_path (combo_box->priv->active_row);
-         gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), path);     
-         gtk_tree_path_free (path);
-       }
-      else
+      if (!gtk_tree_row_reference_valid (combo_box->priv->active_row))
        gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL);
     }