From ba6fc3ccd8358a451bcd1f0eb40eda2b67ad4f2b Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 18 Aug 2004 23:18:15 +0000 Subject: [PATCH] Initialize height from fixed_height before we do anything, so it always Wed Aug 18 16:18:00 2004 Manish Singh * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height from fixed_height before we do anything, so it always has a valid value. * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call to gtk_tree_model_get (missing "," in param list). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkfilechooserdefault.c | 2 +- gtk/gtktreeview.c | 12 ++++++------ 6 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index df09cf601c..228766fef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Aug 18 16:18:00 2004 Manish Singh + + * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height + from fixed_height before we do anything, so it always has a valid + value. + + * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call + to gtk_tree_model_get (missing "," in param list). + 2004-08-18 Federico Mena Quintero Merged from 2.4: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index df09cf601c..228766fef9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Wed Aug 18 16:18:00 2004 Manish Singh + + * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height + from fixed_height before we do anything, so it always has a valid + value. + + * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call + to gtk_tree_model_get (missing "," in param list). + 2004-08-18 Federico Mena Quintero Merged from 2.4: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index df09cf601c..228766fef9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Wed Aug 18 16:18:00 2004 Manish Singh + + * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height + from fixed_height before we do anything, so it always has a valid + value. + + * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call + to gtk_tree_model_get (missing "," in param list). + 2004-08-18 Federico Mena Quintero Merged from 2.4: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index df09cf601c..228766fef9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Wed Aug 18 16:18:00 2004 Manish Singh + + * gtk/gtktreeview.c (gtk_tree_view_row_inserted): Initialize height + from fixed_height before we do anything, so it always has a valid + value. + + * gtk/gtkfilechooserdefault.c (shortcuts_reload_icons): Fix call + to gtk_tree_model_get (missing "," in param list). + 2004-08-18 Federico Mena Quintero Merged from 2.4: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 16b4f712e1..a3eb5b5a9b 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -942,7 +942,7 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl) gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter, SHORTCUTS_COL_DATA, &data, - SHORTCUTS_COL_IS_VOLUME &is_volume, + SHORTCUTS_COL_IS_VOLUME, &is_volume, SHORTCUTS_COL_PIXBUF_VISIBLE, &pixbuf_visible, -1); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 4cf727541a..9deac4dea7 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -7080,6 +7080,12 @@ gtk_tree_view_row_inserted (GtkTreeModel *model, g_return_if_fail (path != NULL || iter != NULL); + if (tree_view->priv->fixed_height_mode + && tree_view->priv->fixed_height >= 0) + height = tree_view->priv->fixed_height; + else + height = 0; + if (path == NULL) { path = gtk_tree_model_get_path (model, iter); @@ -7137,12 +7143,6 @@ gtk_tree_view_row_inserted (GtkTreeModel *model, if (tree == NULL) goto done; - if (tree_view->priv->fixed_height_mode - && tree_view->priv->fixed_height >= 0) - height = tree_view->priv->fixed_height; - else - height = 0; - /* ref the node */ gtk_tree_model_ref_node (tree_view->priv->model, iter); if (indices[depth - 1] == 0)