INTEGRATION: CWS ucpgio1 (1.10.34); FILE MERGED

2008/05/01 13:08:21 cmc 1.10.34.4: #i88090# add gio content provider config fragment only for ENABLE_GIO
2008/05/01 08:19:37 cmc 1.10.34.3: #i88090# add gio content provider config fragment
2008/04/30 16:54:49 cmc 1.10.34.2: #i88090# add gio content provider
2008/04/30 16:41:36 cmc 1.10.34.1: #i88090# add gio content provider

scp2/source/gnome/module_gnome.scp

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: module_gnome.scp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,6 +30,15 @@
 
 #include "macros.inc"
 
+#ifdef ENABLE_GIO
+File gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration;
+    Name = "/registry/spool/org/openoffice/ucb/Configuration-gio.xcu";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
 Module gid_Module_Optional_Gnome
     ParentID = gid_Module_Optional;
     Default = YES;
@@ -37,6 +46,13 @@ Module gid_Module_Optional_Gnome
     MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
     Styles = (DONTSHOWINUSERINSTALL);
     XpdCheckSolaris = "SUNWgnome-vfs";
-    Files = (gid_File_Lib_Gnomevfs, gid_File_Lib_Gconfbe);
+    Files = (
+#ifdef ENABLE_GNOMEVFS
+      gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
+#endif
+#ifdef ENABLE_GIO
+      gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
+#endif
+      gid_File_Lib_Gconfbe);
 End