Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit a forgotten fix.

Browse Source
This commit is contained in:
Matthias Clasen
2004-06-25 04:33:47 +00:00
parent a7df1508a6
commit bcd4a8cdb3
5 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
Fri Jun 25 00:32:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
which was mentioned below.
2004-06-22 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:

5
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
Fri Jun 25 00:32:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
which was mentioned below.
2004-06-22 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:

5
ChangeLog.pre-2-6
View File

@@ -1,3 +1,8 @@
Fri Jun 25 00:32:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
which was mentioned below.
2004-06-22 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:

5
ChangeLog.pre-2-8
View File

@@ -1,3 +1,8 @@
Fri Jun 25 00:32:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreestore.c (gtk_tree_store_swap): Commit the change
which was mentioned below.
2004-06-22 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:

35
gtk/gtktreestore.c
View File

@@ -2014,18 +2014,33 @@ gtk_tree_store_swap (GtkTreeStore *tree_store,
gtk_tree_path_up (path_a);
gtk_tree_path_up (path_b);
if (gtk_tree_path_compare (path_a, path_b))
if (gtk_tree_path_get_depth (path_a) == 0
|| gtk_tree_path_get_depth (path_b) == 0)
{
gtk_tree_path_free (path_a);
gtk_tree_path_free (path_b);
g_warning ("Given childs are not in the same level\n");
return;
if (gtk_tree_path_get_depth (path_a) != gtk_tree_path_get_depth (path_b))
{
gtk_tree_path_free (path_a);
gtk_tree_path_free (path_b);
g_warning ("Given children are not in the same level\n");
return;
}
parent_node = G_NODE (tree_store->root);
}
else
{
if (gtk_tree_path_compare (path_a, path_b))
{
gtk_tree_path_free (path_a);
gtk_tree_path_free (path_b);
g_warning ("Given children don't have a common parent\n");
return;
}
gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent,
path_a);
parent_node = G_NODE (parent.user_data);
}
gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent, path_a);
parent_node = G_NODE (parent.user_data);
gtk_tree_path_free (path_b);
/* old links which we have to keep around */