[openoffice.org/f14/master] Resolves: rhbz#616508 abrt in atk_wrapper_focus_idle_handler

[Caolan McNamara]

commit a90e16becd525ae7777a83c692b151b4799dba18
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 30 13:21:11 2010 +0100

    Resolves: rhbz#616508 abrt in atk_wrapper_focus_idle_handler

 openoffice.org.spec    |    5 ++++-
 workspace.vcl114.patch |   17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 344e48c..8be7c27 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 2
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3785,6 +3785,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Fri Jul 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.2
+- Resolves: rhbz#616508 abrt in atk_wrapper_focus_idle_handler
+
 * Fri Jul 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.1
 - latest milestone
 - drop integrated openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
diff --git a/workspace.vcl114.patch b/workspace.vcl114.patch
index 2b80570..02780e5 100644
--- a/workspace.vcl114.patch
+++ b/workspace.vcl114.patch
@@ -38,3 +38,20 @@ diff -ru vcl.orig/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
  	for (i = 0; i < nParams; i++ )
  		g_free( pCmdLineAry[i] );
  	delete [] pCmdLineAry;
+diff -ru vcl/unx/gtk/a11y.orig/atkutil.cxx vcl/unx/gtk/a11y/atkutil.cxx
+--- vcl.orig/unx/gtk/a11y.orig/atkutil.cxx	2010-07-28 09:07:53.000000000 +0100
++++ vcl/unx/gtk/a11y/atkutil.cxx	2010-07-28 09:10:39.000000000 +0100
+@@ -77,11 +77,10 @@
+     uno::Reference< accessibility::XAccessible > xAccessible = xNextFocusObject;
+     if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) )
+     {
++        AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL;
+         // Gail does not notify focus changes to NULL, so do we ..
+-        if( xAccessible.is() )
++        if( atk_obj )
+         {
+-            AtkObject *atk_obj = atk_object_wrapper_ref( xAccessible );
+-
+ #ifdef ENABLE_TRACING
+             fprintf(stderr, "notifying focus event for %p\n", atk_obj);
+ #endif