rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch, NONE, 1.1 openoffice.org.spec, 1.371, 1.372

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27828

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch 
Log Message:
session management fix

openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch:
 unx/gtk/window/gtkframe.cxx     |    0 
 vcl/unx/gtk/window/gtkframe.cxx |   25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.32
diff -u -p -u -r1.32 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	14 Jul 2005 11:26:15 -0000	1.32
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	5 Aug 2005 09:20:17 -0000
@@ -520,7 +520,10 @@ void GtkSalFrame::Init( SalFrame* pParen
     {
         bool bNoDecor = ! (nStyle & (SAL_FRAME_STYLE_MOVEABLE | SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_CLOSEABLE ) );
         if( (nStyle & SAL_FRAME_STYLE_INTRO) )
+        {
             gtk_window_set_type_hint( m_pWindow, GDK_WINDOW_TYPE_HINT_SPLASHSCREEN );
+            gtk_window_set_role(m_pWindow, "splashscreen");
+        }
         else if( (nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
         {
             gtk_window_set_type_hint( m_pWindow, GDK_WINDOW_TYPE_HINT_UTILITY );
@@ -847,12 +850,32 @@ void GtkSalFrame::SetDefaultSize()
 
 void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
 {
+    static bool bSetGtkSMID = false;
     if( m_pWindow )
     {
         if( bVisible )
         {
             SessionManagerClient::open(); // will simply return after the first time
-            
+            if (!bSetGtkSMID)
+            {
+                XTextProperty sm_client_id_prop;
+                Display* pDisplay = GetSalData()->GetDisplay()->GetDisplay();
+                if (XGetTextProperty(pDisplay, getDisplay()->GetDrawable(),
+                    &sm_client_id_prop, XInternAtom(pDisplay, "SM_CLIENT_ID", False)))
+                {
+                    if (
+                        sm_client_id_prop.encoding == XA_STRING &&
+                        sm_client_id_prop.format == 8 &&
+                        sm_client_id_prop.nitems != 0 &&
+                        sm_client_id_prop.value
+                       )
+                    {
+                        gdk_set_sm_client_id((const gchar *)sm_client_id_prop.value);
+                        XFree(sm_client_id_prop.value);
+                    }
+                }
+                bSetGtkSMID = true;
+            }
             if( m_bDefaultPos )
                 Center();
             if( m_bDefaultSize )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- openoffice.org.spec	4 Aug 2005 18:24:17 -0000	1.371
+++ openoffice.org.spec	5 Aug 2005 09:29:12 -0000	1.372
@@ -1,5 +1,5 @@
 %define ooo2ver 122
-%define ooo_rpm_release 3
+%define ooo_rpm_release 4
 %define build_fc4 0
 %define build_fc5 1
 
@@ -182,6 +182,7 @@
 Patch64: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
 Patch65: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
 Patch66: openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch
+Patch67: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -848,6 +849,7 @@
 %patch64 -p1 -b .oooXXXXX.parallel.solenv.patch
 %patch65 -p1 -b .ooo52786.czech8bitdocimport.patch
 %patch66 -p1 -b .oooXXXXX.systemhsqldb.patch
+%patch67 -p1 -b .ooo52626.workspacerestore.vcl.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3095,6 +3097,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Aug 05 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-4
+- session management and workspace restore corrections
+
 * Wed Aug 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-3
 - ooo#52626# sessionmanagement and vclplug problem
 - ooo#52786# czech 8bit msword doc import problem