diff options
| author | Manish Singh <yosh@gimp.org> | 2004-08-18 23:18:15 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2004-08-18 23:18:15 +0000 |
| commit | ba6fc3ccd8358a451bcd1f0eb40eda2b67ad4f2b (patch) | |
| tree | e8449e877fcee1a49d71e8ab2f42d59569cc2fa5 /gtk | |
| parent | 65ddedd1ae74ffcd85a01ba46196f025aa9d7319 (diff) | |
| download | gdk-pixbuf-ba6fc3ccd8358a451bcd1f0eb40eda2b67ad4f2b.tar.gz | |
Initialize height from fixed_height before we do anything, so it always
Wed Aug 18 16:18:00 2004 Manish Singh <yosh@gimp.org>
* 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).
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 2 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 16b4f712e..a3eb5b5a9 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 4cf727541..9deac4dea 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) |