incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1194985 - in /incubator/ooo/trunk/main: desktop/source/app/makefile.mk sfx2/source/appl/shutdownicon.cxx
Date Sat, 29 Oct 2011 19:24:38 GMT
Author: pfg
Date: Sat Oct 29 19:24:38 2011
New Revision: 1194985

URL: http://svn.apache.org/viewvc?rev=1194985&view=rev
Log:
i108846 - sfx2: gtk quick starter is still a bit sick

Modified:
    incubator/ooo/trunk/main/desktop/source/app/makefile.mk
    incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx

Modified: incubator/ooo/trunk/main/desktop/source/app/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/app/makefile.mk?rev=1194985&r1=1194984&r2=1194985&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/app/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/source/app/makefile.mk Sat Oct 29 19:24:38 2011
@@ -57,6 +57,10 @@ CFLAGS+=-DENABLE_QUICKSTART_APPLET
 # DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
 # .ENDIF
 
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
+CFLAGS+=-DENABLE_QUICKSTART_APPLET
+.ENDIF
+
 SHL1TARGET = sofficeapp
 SHL1OBJS = \
     $(SLO)$/app.obj \

Modified: incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx?rev=1194985&r1=1194984&r2=1194985&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx Sat Oct 29 19:24:38 2011
@@ -580,8 +580,8 @@ void ShutdownIcon::terminateDesktop()
         return;
         
     // always remove ourselves as listener
-    xDesktop->removeTerminateListener( pInst );
     pInst->m_bListenForTermination = true;
+    xDesktop->removeTerminateListener( pInst );
 
     // terminate desktop only if no tasks exist
     Reference< XFramesSupplier > xSupplier( xDesktop, UNO_QUERY );



Mime
View raw message