[Libreoffice-commits] .: Branch 'libreoffice-3-4-1' - sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/source

[Petr Mladek]

 sfx2/Library_qstart.mk            |    7 +++++++
 sfx2/Library_sfx.mk               |    9 +++++++++
 sfx2/source/appl/shutdownicon.cxx |    2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 9d427bb9ebb491e4ce28c98ec511ca4cd11ce463
Author: Robert Nagy <robert at openbsd.org>
Date:   Mon Jun 20 11:43:55 2011 +0200

    correctly build GTK systray icon
    
    the setting was lost during move the GNU make
    
    Signed-off-by:    Petr Mladek <pmladek at suse.cz>
    Signed-off-by:    Tor Lillqvist <tlillqvist at novell.com>
    Signed-off-by:    Michael Meeks <michael.meeks at novell.com>

diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 0709f60..e46a581 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -44,6 +44,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\
     -DENABLE_QUICKSTART_APPLET \
 ))
 
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Library_set_defs,qstart_gtk,\
+    $$(DEFS) \
+    -DENABLE_SYSTRAY_GTK \
+))
+endif
+
 $(eval $(call gb_Library_set_cflags,qstart_gtk,\
     $$(CFLAGS) \
     $(filter-out -I%,$(GTK_CFLAGS)) \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4d2396b..c9ec52c 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -56,6 +56,15 @@ $(eval $(call gb_Library_set_defs,sfx,\
     -DSFX2_DLLIMPLEMENTATION \
 ))
 
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DENABLE_QUICKSTART_APPLET \
+    -DENABLE_SYSTRAY_GTK \
+    -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
+))
+endif
+
 $(eval $(call gb_Library_add_linked_libs,sfx,\
     comphelper \
     cppu \
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 36dd915..6cab935 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 # endif
 #endif
 
-#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
+#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) && !defined(PLUGIN_NAME)
 #define PLUGIN_NAME "libqstart_gtkli.so"
 #endif