ooo-build r15447 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Mar  3 19:12:10 2009
New Revision: 15447
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15447&view=rev

Log:
2009-03-03  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/gnome-vfs-late-init-m2.diff:
	* patches/dev300/gnome-vfs-late-init.diff:
	* patches/dev300/apply: adjusted for ooo310-m3.



Added:
   trunk/patches/dev300/gnome-vfs-late-init-m2.diff
      - copied unchanged from r15445, /trunk/patches/dev300/gnome-vfs-late-init.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/gnome-vfs-late-init.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar  3 19:12:10 2009
@@ -641,10 +641,15 @@
 
 gnome-vfs-locking-ucb.diff, i#91151, jholesov
 
+[ GnomeVFS < dev300-m42 < ooo310-m3 ]
 # Move gnome-vfs out of the startup sequence, load it only when needed
 # (up-stream does not like it, because it adds dependency to VCL in URE)
-gnome-vfs-late-init.diff, i#84137, jholesov
+gnome-vfs-late-init-m2.diff, i#84137, jholesov
 
+[ GnomeVFS >= dev300-m42 >= ooo310-m3 ]
+# Move gnome-vfs out of the startup sequence, load it only when needed
+# (up-stream does not like it, because it adds dependency to VCL in URE)
+gnome-vfs-late-init.diff, i#84137, jholesov
 
 [ QuickStarter ]
 unxsplash-rework.diff, i#60696, michael/jholesov

Modified: trunk/patches/dev300/gnome-vfs-late-init.diff
==============================================================================
--- trunk/patches/dev300/gnome-vfs-late-init.diff	(original)
+++ trunk/patches/dev300/gnome-vfs-late-init.diff	Tue Mar  3 19:12:10 2009
@@ -1,19 +1,20 @@
-diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
-index e8e06b6..6c231fa 100644
+diff --git desktop/source/app/appinit.cxx desktop/source/app/appinit.cxx
+index 6a982ad..e4c1168 100644
 --- desktop/source/app/appinit.cxx
 +++ desktop/source/app/appinit.cxx
-@@ -213,7 +213,6 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
+@@ -153,7 +153,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                  {
                      Reference<XContentProviderManager> xCPM =
                          cb->getContentProviderManagerInterface();
 -#if 0
++
+                     try
+                     {
  
-                     Reference<XContentProviderFactory> xCPF(
-                         xServiceFactory->createInstance(
-@@ -229,24 +228,6 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
-                             ),
-                             rtl::OUString::createFromAscii(".*"),
-                             false);
+@@ -174,30 +174,6 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
+                     } catch (...)
+                     {
+                     }
 -#else
 -
 -		    // Workaround for P1 #124597#.  Instanciate GNOME-VFS-UCP in the thread that initialized
@@ -21,25 +22,31 @@
 -		    // a different thread. The latter may happen when calling the Office remotely via UNO.  
 -		    // THIS IS NOT A FIX, JUST A WORKAROUND!
 -
--                    Reference<XContentProvider> xCP(
--                        xServiceFactory->createInstance(
--                            rtl::OUString::createFromAscii(
--                                "com.sun.star.ucb.GnomeVFSContentProvider")),
--                        UNO_QUERY);
--                    if(xCP.is())
--                        xCPM->registerContentProvider(
--                            xCP,
--                            rtl::OUString::createFromAscii(".*"),
--                            false);
+-                    try
+-                    {
+-                        Reference<XContentProvider> xCP(
+-                            xServiceFactory->createInstance(
+-                                rtl::OUString::createFromAscii(
+-                                    "com.sun.star.ucb.GnomeVFSContentProvider")),
+-                            UNO_QUERY);
+-                        if(xCP.is())
+-                            xCPM->registerContentProvider(
+-                                xCP,
+-                                rtl::OUString::createFromAscii(".*"),
+-                                false);
+-                    } catch (...)
+-                    {
+-                    }
+-                }
 -#endif
-                 }
              }
          } catch (RuntimeException e) {
-diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk
-index b071745..074a9fa 100644
+         }
+diff --git ucb/source/ucp/gvfs/makefile.mk ucb/source/ucp/gvfs/makefile.mk
+index 8351f6c..3bca046 100644
 --- ucb/source/ucp/gvfs/makefile.mk
 +++ ucb/source/ucp/gvfs/makefile.mk
-@@ -88,6 +88,7 @@ SHL1STDLIBS=\
+@@ -84,6 +84,7 @@ SHL1STDLIBS=\
  	$(CPPULIB) \
  	$(SALLIB)  \
  	$(SALHELPERLIB)  \
@@ -47,11 +54,11 @@
  	$(UCBHELPERLIB)
  
  SHL1STDLIBS+=$(PKGCONFIG_LIBS)
-diff --git a/ucb/source/ucp/gvfs/provider.cxx b/ucb/source/ucp/gvfs/provider.cxx
-index 99cbb9e..12430a5 100644
+diff --git ucb/source/ucp/gvfs/provider.cxx ucb/source/ucp/gvfs/provider.cxx
+index df36cfa..dad5dcb 100644
 --- ucb/source/ucp/gvfs/provider.cxx
 +++ ucb/source/ucp/gvfs/provider.cxx
-@@ -37,6 +37,9 @@
+@@ -32,6 +32,9 @@
  #include "precompiled_ucb.hxx"
  
  #include <ucbhelper/contentidentifier.hxx>
@@ -61,7 +68,7 @@
  #include <libgnomevfs/gnome-vfs-init.h>
  #include "provider.hxx"
  #include "content.hxx"
-@@ -202,6 +205,55 @@ component_writeInfo( void */*pServiceManager*/,
+@@ -198,6 +201,55 @@ component_writeInfo( void */*pServiceManager*/,
  			   ::gvfs::ContentProvider::getImplementationName_Static(),
  			   ::gvfs::ContentProvider::getSupportedServiceNames_Static() );
  }
@@ -117,7 +124,7 @@
  extern "C" void * SAL_CALL
  component_getFactory( const sal_Char *pImplName,
  		      void           *pServiceManager,
-@@ -209,13 +261,8 @@ component_getFactory( const sal_Char *pImplName,
+@@ -205,13 +257,8 @@ component_getFactory( const sal_Char *pImplName,
  {
  	void * pRet = 0;
  
@@ -133,11 +140,3 @@
  
  	uno::Reference< lang::XMultiServiceFactory > xSMgr
  		(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
---- ucb/prj/build.lst.old	2007-11-26 13:43:29.000000000 +0100
-+++ ucb/prj/build.lst	2008-03-06 15:06:44.000000000 +0100
-@@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
-+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
- uc	ucb							usr1	-	all	uc_mkout NULL
- uc	ucb\inc					    nmake	-	all	uc_inc NULL
- uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL