diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:44:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:44:13 +0000 |
| commit | 213573cfde2a687aa51133cc7b679c42ccbd9eb0 (patch) | |
| tree | 876e87cce2046249013c70343d927e528b80076d /scp2/source/gnome/file_gnome.scp | |
| parent | 29aca89ef1121a73f929de6d29c19eb62e450568 (diff) | |
INTEGRATION: CWS sb91 (1.10.102); FILE MERGED
2008/07/17 15:58:22 sb 1.10.102.1: #i91721# added explicit ENABLE_GCONF (had previously been covered by ENABLE_GNOMEVFS, but unxsolu4 does not support the latter but does support the former)
Diffstat (limited to 'scp2/source/gnome/file_gnome.scp')
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index bab2b7b86..1aa703c9d 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: file_gnome.scp,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -41,7 +41,6 @@ End #endif #ifdef ENABLE_GNOMEVFS - File gid_File_Lib_Gnomevfs TXT_FILE_BODY; Styles = (PACKED); @@ -50,9 +49,9 @@ File gid_File_Lib_Gnomevfs RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "ucpgvfs-ucd.txt"; End - #endif +#ifdef ENABLE_GCONF File gid_File_Lib_Gconfbe TXT_FILE_BODY; Styles = (PACKED); @@ -61,3 +60,4 @@ File gid_File_Lib_Gconfbe RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "gconfbe1-ucd.txt"; End +#endif |