]> code.ossystems Code Review - openembedded-core.git/commitdiff
Missed one gtk_tree_row_reference_get_model in patch (somehow this still
authorChris Lord <chris@openedhand.com>
Wed, 15 Feb 2006 02:34:37 +0000 (02:34 +0000)
committerChris Lord <chris@openedhand.com>
Wed, 15 Feb 2006 02:34:37 +0000 (02:34 +0000)
compiled...?)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@279 311d38ba-8fff-0310-9ca6-ca027cbcb966

openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch

index 1a65faead00b9cafa9d30753f8f66e7b295a573f..40ced49d2c4f752030306a80f260029f5d80f343 100644 (file)
@@ -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