Commit b04a72a5 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Don't stumble over separators which are not backed by model rows.

Sun Aug  8 22:52:26 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c (find_menu_by_path): Don't stumble over
	separators which are not backed by model rows.
parent 0528aeae
Sun Aug 8 22:52:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (find_menu_by_path): Don't stumble over
separators which are not backed by model rows.
Sun Aug 8 11:01:23 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_set_active): Don't leak
......
Sun Aug 8 22:52:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (find_menu_by_path): Don't stumble over
separators which are not backed by model rows.
Sun Aug 8 11:01:23 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_set_active): Don't leak
......
Sun Aug 8 22:52:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (find_menu_by_path): Don't stumble over
separators which are not backed by model rows.
Sun Aug 8 11:01:23 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_set_active): Don't leak
......
Sun Aug 8 22:52:26 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (find_menu_by_path): Don't stumble over
separators which are not backed by model rows.
Sun Aug 8 11:01:23 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_set_active): Don't leak
......
......@@ -2733,7 +2733,12 @@ find_menu_by_path (GtkWidget *menu,
{
if (GTK_IS_SEPARATOR_MENU_ITEM (i->data))
{
mpath = gtk_tree_path_copy (g_object_get_data (G_OBJECT (i->data), "gtk-combo-box-item-path"));
mpath = g_object_get_data (G_OBJECT (i->data), "gtk-combo-box-item-path");
if (!mpath)
continue;
mpath = gtk_tree_path_copy (mpath);
}
else if (GTK_IS_CELL_VIEW (GTK_BIN (i->data)->child))
{
......@@ -4172,7 +4177,7 @@ gtk_combo_box_set_active (GtkComboBox *combo_box,
if (index_ != -1)
path = gtk_tree_path_new_from_indices (index_, -1);
gtk_combo_box_set_active_internal (combo_box, path);
if (path)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment