[Libreoffice-commits] .: 2 commits - vcl/Library_desktop_detector.mk vcl/unx

[Lubos Lunak]

 vcl/Library_desktop_detector.mk       |    4 ++--
 vcl/unx/generic/plugadapt/salplug.cxx |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9212b191c28c1199d4d01a773aaf5f1e79abd74d
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue May 31 17:27:09 2011 +0200

    SAL_DLLEXTENSION should not be used here
    
    probably result of a bad merge

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index cd0a80b..47062a0 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -139,7 +139,6 @@ static const rtl::OUString& get_desktop_environment()
         OUStringBuffer aModName( 128 );
         aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" );
         aModName.appendAscii( SAL_DLLPOSTFIX );
-        aModName.appendAscii( SAL_DLLEXTENSION );
         OUString aModule = aModName.makeStringAndClear();
 
         oslModule aMod = osl_loadModuleRelative(
commit e5c6887294c65e1adf441a32759d6c712ce1d1d4
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue May 31 17:24:08 2011 +0200

    desktop detector stuff is desktop_detector, not vclplug_kde

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index c36f9e8..c7e1cd0 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
+$(eval $(call gb_Library_set_defs,desktop_detector,\
     $$(DEFS) \
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
     ICE \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
     vcl/unx/generic/desktopdetect/desktopdetector \
 ))