AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Initialize height from fixed_height before we do anything, so it always

Browse Source 
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).
This commit is contained in:
Manish Singh 2004-08-18 23:18:15 +00:00 committed by Manish Singh
parent 65ddedd1ae
commit ba6fc3ccd8
6 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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).
2004-08-18 Federico Mena Quintero <federico@ximian.com>
Merged from 2.4:

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
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).
2004-08-18 Federico Mena Quintero <federico@ximian.com>
Merged from 2.4:

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
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).
2004-08-18 Federico Mena Quintero <federico@ximian.com>
Merged from 2.4:

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
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).
2004-08-18 Federico Mena Quintero <federico@ximian.com>
Merged from 2.4:

2
gtk/gtkfilechooserdefault.c
View File

@ -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);

12
gtk/gtktreeview.c
View File

@ -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)