diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
commit | 95efeafc86f47592b37c44f2f7314324cc04250d (patch) | |
tree | e60fe38e88d8e6cf42cf1311c5ada752b79a59c7 /openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtktreemodelfilter.c.diff | |
parent | 7755d9d194b42ea859096f805f2e22ae5b6e6281 (diff) | |
download | openembedded-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/gtktreemodelfilter.c.diff')
-rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtktreemodelfilter.c.diff | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtktreemodelfilter.c.diff b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtktreemodelfilter.c.diff new file mode 100644 index 000000000..af2d495a8 --- /dev/null +++ b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/gtktreemodelfilter.c.diff @@ -0,0 +1,52 @@ +--- gtk+-2.6.4/gtk/gtktreemodelfilter.c 2005-02-24 16:43:53.000000000 +0200 ++++ gtk+-2.6.4/gtk/gtktreemodelfilter.c 2005-04-06 16:19:38.177734464 +0300 +@@ -1210,14 +1210,22 @@ + if (gtk_tree_path_get_depth (filter->priv->virtual_root) >= + gtk_tree_path_get_depth (c_path)) + { +- gint level; ++ gint level, i; + gint *v_indices, *c_indices; ++ gboolean common_prefix = TRUE; + + level = gtk_tree_path_get_depth (c_path) - 1; + v_indices = gtk_tree_path_get_indices (filter->priv->virtual_root); + c_indices = gtk_tree_path_get_indices (c_path); + +- if (v_indices[level] >= c_indices[level]) ++ for (i = 0; i < level; i++) ++ if (v_indices[i] != c_indices[i]) ++ { ++ common_prefix = FALSE; ++ break; ++ } ++ ++ if (common_prefix && v_indices[level] >= c_indices[level]) + (v_indices[level])++; + } + } +@@ -1455,14 +1463,22 @@ + if (gtk_tree_path_get_depth (filter->priv->virtual_root) >= + gtk_tree_path_get_depth (c_path)) + { +- gint level; ++ gint level, i; + gint *v_indices, *c_indices; ++ gboolean common_prefix = TRUE; + + level = gtk_tree_path_get_depth (c_path) - 1; + v_indices = gtk_tree_path_get_indices (filter->priv->virtual_root); + c_indices = gtk_tree_path_get_indices (c_path); + +- if (v_indices[level] > c_indices[level]) ++ for (i = 0; i < level; i++) ++ if (v_indices[i] != c_indices[i]) ++ { ++ common_prefix = FALSE; ++ break; ++ } ++ ++ if (common_prefix && v_indices[level] > c_indices[level]) + (v_indices[level])--; + } + } |