[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                     |    4 
 patches/dev300/desktop-quickstart-option-enable-unx.diff |   33 +++++---
 patches/dev300/sfx2-qstartfixes.diff                     |   61 +++++++++++++++
 3 files changed, 89 insertions(+), 9 deletions(-)

New commits:
commit a694b661a0a7e870ef331fdf080e6c8df5dcc284
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Feb 4 11:31:52 2010 +0100

    More quickstarter fixes from Caolan (i#108846)
    
    * patches/dev300/desktop-quickstart-option-enable-unx.diff: cleaner solution
      by Caolan
    * patches/dev300/sfx2-qstartfixes.diff:
    * patches/dev300/apply: more quickstarter fixes from Caolan (i#108846)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ea8d217..5b4e1b3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -621,8 +621,12 @@ unxsplash-3layer.diff, i#60696, jholesov
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
 # enable -quistart option on Linux
+# cleaner solution by Caolan, i#108846
 desktop-quickstart-option-enable-unx.diff, i#108918, n#575555, pmladek
 
+# more quickstart fixes from Caolan
+sfx2-qstartfixes.diff, i#108846, caolan
+
 [ WriterFixes ]
 # Some WW8 fields weren't imported at all
 sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
diff --git a/patches/dev300/desktop-quickstart-option-enable-unx.diff b/patches/dev300/desktop-quickstart-option-enable-unx.diff
index 5252084..64d6d17 100644
--- a/patches/dev300/desktop-quickstart-option-enable-unx.diff
+++ b/patches/dev300/desktop-quickstart-option-enable-unx.diff
@@ -1,11 +1,26 @@
---- desktop/source/app/cmdlineargs.cxx.old	2010-01-27 22:33:46.000000000 +0100
-+++ desktop/source/app/cmdlineargs.cxx	2010-02-03 21:06:51.000000000 +0100
-@@ -396,7 +396,7 @@ sal_Bool CommandLineArgs::InterpretComma
-     }
-     else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
-     {
+diff -r 3c24aa9a7810 desktop/source/app/cmdlineargs.cxx
+--- desktop/source/app/cmdlineargs.cxx	Sat Jan 23 16:31:03 2010 +0000
++++ 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(WNT) || defined(OS2) || defined(QUARTZ) || defined(UNX)
-         SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
++#if defined(ENABLE_QUICKSTART_APPLET)
+ 		SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
  #endif
-         return sal_True;
+ 		return sal_True;
+diff -r 3c24aa9a7810 desktop/source/app/makefile.mk
+--- desktop/source/app/makefile.mk	Sat Jan 23 16:31:03 2010 +0000
++++ 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 --git a/patches/dev300/sfx2-qstartfixes.diff b/patches/dev300/sfx2-qstartfixes.diff
new file mode 100644
index 0000000..91f3204
--- /dev/null
+++ b/patches/dev300/sfx2-qstartfixes.diff
@@ -0,0 +1,61 @@
+diff -r 3c24aa9a7810 sfx2/source/appl/shutdownicon.cxx
+--- sfx2/source/appl/shutdownicon.cxx	Sat Jan 23 16:31:03 2010 +0000
++++ 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
+--- sfx2/source/appl/shutdowniconunx.cxx	Sat Jan 23 16:31:03 2010 +0000
++++ 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