summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-02-15 02:34:37 +0000
committerChris Lord <chris@openedhand.com>2006-02-15 02:34:37 +0000
commitcb92e3d2ce5f342bea8d1813021f9d9e224868d7 (patch)
tree4b6545bdcd7e09ab7b794c72726ee731cec71dfa
parent2b7e731cff12abbf2ff22c2025ccefd365bb45a7 (diff)
downloadopenembedded-core-cb92e3d2ce5f342bea8d1813021f9d9e224868d7.tar.gz
openembedded-core-cb92e3d2ce5f342bea8d1813021f9d9e224868d7.tar.bz2
openembedded-core-cb92e3d2ce5f342bea8d1813021f9d9e224868d7.zip
Missed one gtk_tree_row_reference_get_model in patch (somehow this still
compiled...?) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@279 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch b/openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch
index 1a65faead0..40ced49d2c 100644
--- a/openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch
+++ b/openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch
@@ -29,7 +29,7 @@ diff -urNd pcmanfm-0.1.9.8.old/configure.in pcmanfm-0.1.9.8/configure.in
AC_SUBST([FAM_CFLAGS])
diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.c pcmanfm-0.1.9.8/src/foldercontent.c
--- pcmanfm-0.1.9.8.old/src/foldercontent.c 2006-02-08 18:36:52.000000000 +0000
-+++ pcmanfm-0.1.9.8/src/foldercontent.c 2006-02-15 02:15:10.000000000 +0000
++++ pcmanfm-0.1.9.8/src/foldercontent.c 2006-02-15 02:51:03.000000000 +0000
@@ -31,9 +31,11 @@
}FolderContentCallback;
@@ -207,6 +207,18 @@ diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.c pcmanfm-0.1.9.8/src/foldercon
tree_path = gtk_tree_row_reference_get_path(
content->tree_node );
gtk_tree_model_get_iter( model, &parent_it, tree_path );
+@@ -776,7 +825,11 @@
+
+ /* There is no need to update the dir tree currently. */
+ if( content->tree_node ) {
++#ifdef HAVE_GTK_2_8
+ model = gtk_tree_row_reference_get_model( content->tree_node );
++#else
++ model = content->tree_model;
++#endif
+ tree_path = gtk_tree_row_reference_get_path(
+ content->tree_node );
+ gtk_tree_model_get_iter( model, &parent_it, tree_path );
diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.h pcmanfm-0.1.9.8/src/foldercontent.h
--- pcmanfm-0.1.9.8.old/src/foldercontent.h 2006-02-07 10:26:03.000000000 +0000
+++ pcmanfm-0.1.9.8/src/foldercontent.h 2006-02-15 02:13:40.000000000 +0000