rpms/openoffice.org/devel openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch, NONE, 1.1 openoffice.org.spec, 1.2134, 1.2135

Caolan McNamara caolanm at fedoraproject.org
Tue Feb 2 15:06:55 UTC 2010


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27119

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch 
Log Message:
latest version

openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch:
 desktop/source/app/cmdlineargs.cxx   |    2 +-
 desktop/source/app/makefile.mk       |    4 ++++
 sfx2/source/appl/shutdownicon.cxx    |    2 +-
 sfx2/source/appl/shutdowniconunx.cxx |    9 +++++++--
 4 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch ---
diff -r 3c24aa9a7810 desktop/source/app/cmdlineargs.cxx
--- a/desktop/source/app/cmdlineargs.cxx	Sat Jan 23 16:31:03 2010 +0000
+++ b/desktop/source/app/cmdlineargs.cxx	Tue Feb 02 13:59:39 2010 +0000
@@ -387,7 +387,7 @@
 	}
 	else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
 	{
-#if defined(WNT) || defined(OS2) || defined(QUARTZ)
+#if defined(ENABLE_QUICKSTART_APPLET)
 		SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
 #endif
 		return sal_True;
diff -r 3c24aa9a7810 desktop/source/app/makefile.mk
--- a/desktop/source/app/makefile.mk	Sat Jan 23 16:31:03 2010 +0000
+++ b/desktop/source/app/makefile.mk	Tue Feb 02 13:59:39 2010 +0000
@@ -44,6 +44,10 @@
 CFLAGS+=-DGNOME_VFS_ENABLED
 .ENDIF
 
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
+CFLAGS+=-DENABLE_QUICKSTART_APPLET
+.ENDIF
+
 SHL1TARGET = sofficeapp
 SHL1OBJS = \
     $(SLO)$/app.obj \
diff -r 3c24aa9a7810 sfx2/source/appl/shutdownicon.cxx
--- a/sfx2/source/appl/shutdownicon.cxx	Sat Jan 23 16:31:03 2010 +0000
+++ b/sfx2/source/appl/shutdownicon.cxx	Tue Feb 02 13:59:39 2010 +0000
@@ -555,8 +555,8 @@
         return;
         
     // always remove ourselves as listener
+    pInst->m_bListenForTermination = true;
     xDesktop->removeTerminateListener( pInst );
-    pInst->m_bListenForTermination = true;
 
     // terminate desktop only if no tasks exist
     Reference< XFramesSupplier > xSupplier( xDesktop, UNO_QUERY );
diff -r 3c24aa9a7810 sfx2/source/appl/shutdowniconunx.cxx
--- a/sfx2/source/appl/shutdowniconunx.cxx	Sat Jan 23 16:31:03 2010 +0000
+++ b/sfx2/source/appl/shutdowniconunx.cxx	Tue Feb 02 13:59:39 2010 +0000
@@ -39,6 +39,7 @@
 static EggTrayIcon *pTrayIcon;
 static GtkWidget *pExitMenuItem = NULL;
 static GtkWidget *pOpenMenuItem = NULL;
+static GtkWidget *pDisableMenuItem = NULL;
 
 static void open_url_cb( GtkWidget *, gpointer data )
 {
@@ -67,8 +68,10 @@
 static void exit_quickstarter_cb( GtkWidget * )
 {
 	egg_tray_icon_cancel_message (pTrayIcon, 1 );
-	ShutdownIcon::getInstance()->terminateDesktop();
 	plugin_shutdown_sys_tray();
+	//terminate may cause this .so to be unloaded. So we must be hands off
+	//all calls into this .so after this call
+	ShutdownIcon::terminateDesktop();
 }
 
 static void menu_deactivate_cb( GtkWidget *pMenu )
@@ -265,7 +268,7 @@
 	pMenuItem = gtk_separator_menu_item_new();
 	gtk_menu_shell_append( pMenuShell, pMenuItem );
 
-	(void) add_image_menu_item
+	pDisableMenuItem = add_image_menu_item
         ( pMenuShell, GTK_STOCK_CLOSE,
 		  pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH_UNX ),
 		  G_CALLBACK( systray_disable_cb ) );
@@ -289,6 +292,7 @@
 	bool bModal = ShutdownIcon::bModalMode;
 	gtk_widget_set_sensitive( pExitMenuItem, !bModal);
 	gtk_widget_set_sensitive( pOpenMenuItem, !bModal);
+	gtk_widget_set_sensitive( pDisableMenuItem, !bModal);
 }
 
 extern "C" {
@@ -404,6 +409,7 @@
 	pTrayIcon = NULL;
 	pExitMenuItem = NULL;
 	pOpenMenuItem = NULL;
+	pDisableMenuItem = NULL;
 }
 
 #endif // ENABLE_QUICKSTART_APPLET


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2134
retrieving revision 1.2135
diff -u -p -r1.2134 -r1.2135
--- openoffice.org.spec	29 Jan 2010 09:33:44 -0000	1.2134
+++ openoffice.org.spec	2 Feb 2010 15:06:54 -0000	1.2135
@@ -1,6 +1,6 @@
 %define oootag OOO320
-%define ooomilestone 11
-%define rh_rpm_release 2
+%define ooomilestone 12
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -134,6 +134,7 @@ Patch58: workspace.cmcfixes70.patch
 Patch59: workspace.s390xport02.patch
 Patch60: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
 Patch61: openoffice.org-3.2.0.ooo107763.transcrash.patch
+Patch62: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1695,6 +1696,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch59 -p1 -b .workspace.s390xport02.patch
 %patch60 -p1 -b .ooo108637.sfx2.uisavedir.patch
 %patch61 -p1 -b .ooo107763.transcrash.patch
+%patch62 -p1 -b .ooo108846.sfx2.qstartfixes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4177,6 +4179,10 @@ fi
 %endif
 
 %changelog
+* Tue Feb 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.1
+- latest milestone
+- Resolves: rhbz#560996/rhbz#560353 qstartfixes (caolanm)
+
 * Fri Jan 29 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-11.2
 - Resolves: ooo#107763 transparent object crash in impress
 



More information about the scm-commits mailing list