From 1e76488bab4829f8576b0cf01d65497e69b0cc9d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 18 Jul 2005 19:14:46 +0000 Subject: [PATCH] Remove useless calls to gtk_tree_row_reference_inserted/deleted, since we 2005-07-18 Matthias Clasen * 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. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcombobox.c | 14 +------------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30fb2f9779..0a789633b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-07-18 Matthias Clasen + * 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 30fb2f9779..0a789633b9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2005-07-18 Matthias Clasen + * 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 30fb2f9779..0a789633b9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2005-07-18 Matthias Clasen + * 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 8df90b9b1b..99760b805e 100644 --- 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); }