diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.bz2 openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.xz openembedded-core-b2f192faabe412adce79534e22efe9fb69ee40e2.zip |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff b/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff new file mode 100644 index 000000000..1e34b3f2e --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff @@ -0,0 +1,48 @@ +--- gtk+-2.6.4/gtk/gtkrbtree.c 2004-10-28 18:00:04.000000000 +0300 ++++ gtk+-2.6.4/gtk/gtkrbtree.c 2005-04-06 16:19:37.812789944 +0300 +@@ -1378,18 +1378,18 @@ + g_return_val_if_fail (node != NULL, NULL); + + /* Case 1: the node's below us. */ +- if (node->right != tree->nil) ++ if (node && node->right != tree->nil) + { + node = node->right; +- while (node->left != tree->nil) ++ while (node && node->left != tree->nil) + node = node->left; + return node; + } + + /* Case 2: it's an ancestor */ +- while (node->parent != tree->nil) ++ while (node && node->parent != tree->nil) + { +- if (node->parent->right == node) ++ if (node->parent && node->parent->right == node) + node = node->parent; + else + return (node->parent); +@@ -1407,18 +1407,18 @@ + g_return_val_if_fail (node != NULL, NULL); + + /* Case 1: the node's below us. */ +- if (node->left != tree->nil) ++ if (node != NULL && node->left != tree->nil) + { + node = node->left; +- while (node->right != tree->nil) ++ while (node != NULL && node->right != tree->nil) + node = node->right; + return node; + } + + /* Case 2: it's an ancestor */ +- while (node->parent != tree->nil) ++ while (node != NULL && node->parent != tree->nil) + { +- if (node->parent->left == node) ++ if (node->parent && node->parent->left == node) + node = node->parent; + else + return (node->parent); |