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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Nov 13 11:45:39 2008
New Revision: 14491
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14491&view=rev

Log:
2008-11-13  Petr Mladek  <pmladek suse cz>

	* patches/dev300/ucb-gio-gnome-init.diff, patches/dev300/apply:
          call g_type_init() before using GIO; avoid crash when using GIO in
          non-GNOME Window manager (i#96170, n#442678); thanks Michael Meeks
          for the patch.



Added:
   trunk/patches/dev300/ucb-gio-gnome-init.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Nov 13 11:45:39 2008
@@ -1117,6 +1117,10 @@
 # do not allow to enable GIO and GNOME VFS at once
 config_office-gio-vs-gnome-vfs.diff, i#95713, pmladek
 
+# call g_type_init() before using GIO;
+# avoid crash when using GIO in non-GNOME Window manager
+ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks
+
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei

Added: trunk/patches/dev300/ucb-gio-gnome-init.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ucb-gio-gnome-init.diff	Thu Nov 13 11:45:39 2008
@@ -0,0 +1,16 @@
+Index: ucb/source/ucp/gio/gio_provider.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/gio/gio_provider.cxx,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 gio_provider.cxx
+--- ucb/source/ucp/gio/gio_provider.cxx	14 May 2008 14:47:59 -0000	1.2
++++ ucb/source/ucp/gio/gio_provider.cxx	12 Nov 2008 13:34:53 -0000
+@@ -163,6 +163,8 @@ extern "C" void * SAL_CALL component_get
+         (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
+     uno::Reference< lang::XSingleServiceFactory > xFactory;
+ 
++    g_type_init();
++
+     if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
+         xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
+