incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1182943 - in /incubator/ooo/trunk/main/sfx2: Library_sfx.mk source/appl/shutdownicon.cxx
Date Thu, 13 Oct 2011 16:13:34 GMT
Author: pfg
Date: Thu Oct 13 16:13:33 2011
New Revision: 1182943

URL: http://svn.apache.org/viewvc?rev=1182943&view=rev
Log:
gtk system tray icon broken - submitted by Ariel Constenla-Haile.

Modified:
    incubator/ooo/trunk/main/sfx2/Library_sfx.mk
    incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx

Modified: incubator/ooo/trunk/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/Library_sfx.mk?rev=1182943&r1=1182942&r2=1182943&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/Library_sfx.mk (original)
+++ incubator/ooo/trunk/main/sfx2/Library_sfx.mk Thu Oct 13 16:13:33 2011
@@ -265,6 +265,14 @@ $(eval $(call gb_Library_set_defs,sfx,\
 ))
 endif
 
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Library_set_defs,sfx,\
+	$$(DEFS) \
+	-DENABLE_QUICKSTART_APPLET \
+	-DENABLE_SYSTRAY_GTK \
+))
+endif
+
 ifeq ($(OS),OS2)
 $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/appl/shutdowniconOs2.ob \

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=1182943&r1=1182942&r2=1182943&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/appl/shutdownicon.cxx Thu Oct 13 16:13:33 2011
@@ -94,7 +94,7 @@ extern "C" { static void SAL_CALL thisMo
 #endif
 
 #if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
-#define PLUGIN_NAME "libqstart_gtkli.so"
+#define PLUGIN_NAME libqstart_gtk.so
 #endif
 
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener
>
@@ -156,7 +156,7 @@ bool ShutdownIcon::LoadModule( osl::Modu
 
 	oslGenericFunction pTmpInit = NULL;
 	oslGenericFunction pTmpDeInit = NULL;
-	if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING(
PLUGIN_NAME ) ) ) ) )
+	if ( pPlugin->loadRelative( &thisModule, OUString( RTL_CONSTASCII_USTRINGPARAM( STRING(
PLUGIN_NAME ) ) ) ) )
 	{
 		pTmpInit = pPlugin->getFunctionSymbol(
 			OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );



Mime
View raw message