vcl/inc/unx/desktops.hxx | 2 +-
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 4 ++--
vcl/unx/generic/plugadapt/salplug.cxx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d0ad8460b4f85186860a4c093f76a5bf9da83e16
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Sep 2 14:52:03 2015 +0200
vcl: rename DESKTOP_KDE to DESKTOP_KDE3
Change-Id: Ie9d4d339f0fe3248a7fd7f790adcb89e660d34ec
diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index e88c473..89d6459 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -32,7 +32,7 @@ enum SAL_DLLPUBLIC_RTTI DesktopType {
DESKTOP_XFCE,
DESKTOP_MATE,
DESKTOP_TDE,
- DESKTOP_KDE,
+ DESKTOP_KDE3,
DESKTOP_KDE4,
DESKTOP_KDE5
}; // keep in sync with desktop_strings[] in salplug.cxx
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 58ecf2d..2f8ee66 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -316,7 +316,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
if ( aOver.equalsIgnoreAsciiCase( "mate" ) )
return DESKTOP_MATE;
if ( aOver.equalsIgnoreAsciiCase( "kde" ) )
- return DESKTOP_KDE;
+ return DESKTOP_KDE3;
if ( aOver.equalsIgnoreAsciiCase( "none" ) )
return DESKTOP_UNKNOWN;
}
@@ -401,7 +401,7 @@ DESKTOP_DETECTOR_PUBLIC DesktopType
get_desktop_environment()
else if ( is_gnome_desktop( pDisplay ) )
ret = DESKTOP_GNOME;
else if ( is_kde_desktop( pDisplay ) )
- ret = DESKTOP_KDE;
+ ret = DESKTOP_KDE3;
else if ( is_tde_desktop( pDisplay ) )
ret = DESKTOP_TDE;
else
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 0d0b26d..20fa9e8 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -212,7 +212,7 @@ static SalInstance* autodetect_plugin()
pList = pStandardFallbackList;
else if( desktop == DESKTOP_TDE )
pList = pTDEFallbackList;
- else if( desktop == DESKTOP_KDE )
+ else if( desktop == DESKTOP_KDE3 )
{
pList = pKDEFallbackList;
nListEntry = 1;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
