diff options
| author | Chris Lord <chris@openedhand.com> | 2006-02-15 02:34:37 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2006-02-15 02:34:37 +0000 |
| commit | cb92e3d2ce5f342bea8d1813021f9d9e224868d7 (patch) | |
| tree | 4b6545bdcd7e09ab7b794c72726ee731cec71dfa /openembedded/packages/pcmanfm/files | |
| parent | 2b7e731cff12abbf2ff22c2025ccefd365bb45a7 (diff) | |
| download | poky-cb92e3d2ce5f342bea8d1813021f9d9e224868d7.tar.gz | |
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
Diffstat (limited to 'openembedded/packages/pcmanfm/files')
| -rw-r--r-- | openembedded/packages/pcmanfm/files/no-fam-gtk2.6.patch | 14 |
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 | |||
| 29 | AC_SUBST([FAM_CFLAGS]) | 29 | AC_SUBST([FAM_CFLAGS]) |
| 30 | diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.c pcmanfm-0.1.9.8/src/foldercontent.c | 30 | diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.c pcmanfm-0.1.9.8/src/foldercontent.c |
| 31 | --- pcmanfm-0.1.9.8.old/src/foldercontent.c 2006-02-08 18:36:52.000000000 +0000 | 31 | --- pcmanfm-0.1.9.8.old/src/foldercontent.c 2006-02-08 18:36:52.000000000 +0000 |
| 32 | +++ pcmanfm-0.1.9.8/src/foldercontent.c 2006-02-15 02:15:10.000000000 +0000 | 32 | +++ pcmanfm-0.1.9.8/src/foldercontent.c 2006-02-15 02:51:03.000000000 +0000 |
| 33 | @@ -31,9 +31,11 @@ | 33 | @@ -31,9 +31,11 @@ |
| 34 | }FolderContentCallback; | 34 | }FolderContentCallback; |
| 35 | 35 | ||
| @@ -207,6 +207,18 @@ diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.c pcmanfm-0.1.9.8/src/foldercon | |||
| 207 | tree_path = gtk_tree_row_reference_get_path( | 207 | tree_path = gtk_tree_row_reference_get_path( |
| 208 | content->tree_node ); | 208 | content->tree_node ); |
| 209 | gtk_tree_model_get_iter( model, &parent_it, tree_path ); | 209 | gtk_tree_model_get_iter( model, &parent_it, tree_path ); |
| 210 | @@ -776,7 +825,11 @@ | ||
| 211 | |||
| 212 | /* There is no need to update the dir tree currently. */ | ||
| 213 | if( content->tree_node ) { | ||
| 214 | +#ifdef HAVE_GTK_2_8 | ||
| 215 | model = gtk_tree_row_reference_get_model( content->tree_node ); | ||
| 216 | +#else | ||
| 217 | + model = content->tree_model; | ||
| 218 | +#endif | ||
| 219 | tree_path = gtk_tree_row_reference_get_path( | ||
| 220 | content->tree_node ); | ||
| 221 | gtk_tree_model_get_iter( model, &parent_it, tree_path ); | ||
| 210 | diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.h pcmanfm-0.1.9.8/src/foldercontent.h | 222 | diff -urNd pcmanfm-0.1.9.8.old/src/foldercontent.h pcmanfm-0.1.9.8/src/foldercontent.h |
| 211 | --- pcmanfm-0.1.9.8.old/src/foldercontent.h 2006-02-07 10:26:03.000000000 +0000 | 223 | --- pcmanfm-0.1.9.8.old/src/foldercontent.h 2006-02-07 10:26:03.000000000 +0000 |
| 212 | +++ pcmanfm-0.1.9.8/src/foldercontent.h 2006-02-15 02:13:40.000000000 +0000 | 224 | +++ pcmanfm-0.1.9.8/src/foldercontent.h 2006-02-15 02:13:40.000000000 +0000 |
