INTEGRATION: CWS ucpgio1 (1.7.32); FILE MERGED

2008/04/30 16:54:49 cmc 1.7.32.2: #i88090# add gio content provider
2008/04/30 16:41:35 cmc 1.7.32.1: #i88090# add gio content provider

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.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,6 +29,19 @@
  ************************************************************************/
 #include "macros.inc"
 
+#ifdef ENABLE_GIO
+File gid_File_Lib_GIO
+    TXT_FILE_BODY;
+    Styles = (PACKED,PATCH);
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Regmergefile = "ucpgio-ucd.txt";
+End
+#endif
+
+#ifdef ENABLE_GNOMEVFS
+
 File gid_File_Lib_Gnomevfs
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -38,6 +51,15 @@ File gid_File_Lib_Gnomevfs
     Regmergefile = "ucpgvfs-ucd.txt";
 End
 
+File gid_File_Bin_Gnome_Set_Default_Application
+    BIN_FILE_BODY;
+    Dir = gid_Dir_Program;
+    Name = "gnome-set-default-application";
+    Styles = (PACKED);
+End
+
+#endif
+
 File gid_File_Lib_Gconfbe
     TXT_FILE_BODY;
     Styles = (PACKED);