ooo-build r15461 - in branches/ooo-build-3-0-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Wed Mar  4 12:50:49 2009
New Revision: 15461
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15461&view=rev

Log:
2009-03-04  Petr Mladek  <pmladek suse cz>

	* patches/dev300/fix-gtk-a11y.diff,
	* patches/dev300/apply: backport from trunk to make atk/a11y work
	  again; fix by Michael Meeks (i#98533, n#457611)



Added:
   branches/ooo-build-3-0-1/patches/dev300/fix-gtk-a11y.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Mar  4 12:50:49 2009
@@ -232,6 +232,9 @@
 # Fix linkoo, the ultimate hacker tool
 fix-linkoo.diff, i#83548, jholesov
 
+# fix a11y bug
+fix-gtk-a11y.diff, i#98533, n#457611, michael
+
 # Update linkoo for dev300 TODO file upstream
 linkoo-dev300.diff, jholesov
 

Added: branches/ooo-build-3-0-1/patches/dev300/fix-gtk-a11y.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/fix-gtk-a11y.diff	Wed Mar  4 12:50:49 2009
@@ -0,0 +1,61 @@
+--- vcl/unx/source/plugadapt/salplug.cxx	(revision 264856)
++++ vcl/unx/source/plugadapt/salplug.cxx	(working copy)
+@@ -92,32 +92,6 @@
+             if( pInst )
+             {
+                 pCloseModule = aMod;
+-
+-                /*
+-                 * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can 
+-                 * not access the 'gnome_accessibility_module_shutdown' anymore. 
+-                 * So make sure libgtk+ & co are still mapped into memory when 
+-                 * atk-bridge's atexit handler gets called.
+-                 */
+-                if( rModuleBase.equalsAscii("gtk") )
+-                {
+-                    const char* gtk_modules = getenv( "GTK_MODULES" );
+-                    if( gtk_modules )
+-                    {
+-                        rtl::OString aModules( gtk_modules );
+-                        sal_Int32 nIndex = 0;
+-                        while( nIndex >= 0 )
+-                        {
+-                            rtl::OString aToken = aModules.getToken( 0, ':', nIndex );
+-                            if( aToken.equals( "atk-bridge" ) )
+-                            {
+-                                pCloseModule = NULL;
+-                                break;
+-                            }
+-                        }
+-                    }
+-                }
+-                
+                 GetSalData()->m_pPlugin = aMod;
+             }
+             else
+
+--- vcl/unx/gtk/app/gtkinst.cxx	(revision 264856)
++++ vcl/unx/gtk/app/gtkinst.cxx	(working copy)
+@@ -174,21 +174,7 @@
+         pSalData->Init();
+         pSalData->initNWF();
+ 
+-        const char* pGtkModules = getenv( "GTK_MODULES" );
+-        if( pGtkModules )
+-        {
+-            rtl::OString aModules( pGtkModules );
+-            sal_Int32 nIndex = 0;
+-            while( nIndex >= 0 )
+-            {
+-                rtl::OString aToken = aModules.getToken( 0, ':', nIndex );
+-                if( aToken.equals( "gail" ) || aToken.equals( "atk-bridge" ) )
+-                {
+-                    InitAtkBridge();
+-                    break;
+-                }
+-            }
+-        }
++	InitAtkBridge();
+ 
+         return pInstance;
+     }