summaryrefslogtreecommitdiff
path: root/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-02 11:50:01 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-02 11:50:01 +0000
commit95efeafc86f47592b37c44f2f7314324cc04250d (patch)
treee60fe38e88d8e6cf42cf1311c5ada752b79a59c7 /openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff
parent7755d9d194b42ea859096f805f2e22ae5b6e6281 (diff)
downloadopenembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.gz
openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.bz2
openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.xz
openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.zip
Add gtk+, avahi, dbus-0.34 (.36 coming soon) and dependencies. Fix x11-common breakage.
git-svn-id: https://svn.o-hand.com/repos/poky@13 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff')
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff48
1 files changed, 48 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtkrbtree.c.diff
new file mode 100644
index 000000000..1e34b3f2e
--- /dev/null
+++ b/openembedded/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);