[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - vcl/inc

[Maxim Monastirsky]

 vcl/inc/unx/desktops.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c98633df335b370f6fb2ffaa3056f63c41d4f341
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Jan 7 14:01:38 2014 +0200

    Keep in sync with desktop_strings[] in salplug.cxx
    
    Items should have the same order. Only that way KDE4
    will get the correct icon theme. (A regression of commit
    cea7cca5c8db3f273ed2c14efde45ff0e73dee7a)
    
    Change-Id: Id8ba6fadd312d5ff782de7011694fc58cdfae312
    Reviewed-on: https://gerrit.libreoffice.org/7288
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 1b00be2ed1f911aec07ab2ef9432168cfa333c6d)
    (cherry picked from commit cf24bd4e14677c3dc3d64f1dc7935de679d268ce)
    Reviewed-on: https://gerrit.libreoffice.org/7409
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index 0515cf5..5bc768d 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -27,9 +27,9 @@ enum DesktopType {
     DESKTOP_UNITY,
     DESKTOP_XFCE,
     DESKTOP_MATE,
+    DESKTOP_TDE,
     DESKTOP_KDE,
-    DESKTOP_KDE4,
-    DESKTOP_TDE
+    DESKTOP_KDE4
 }; // keep in sync with desktop_strings[] in salplug.cxx
 
 #endif // INCLUDED_VCL_INC_UNX_DESKTOPS_HXX