[ooo-build-commit] patches/dev300

[Jan Holesovsky]

 patches/dev300/kde4-plugin-detection.diff |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 5a9d7d0df840395081b94c61ff43607da703d521
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jun 15 18:15:11 2009 +0200

    Change the order of the KDE3 and KDE4 detection.
    
    * patches/dev300/kde4-plugin-detection.diff: First check for KDE4.

diff --git a/patches/dev300/kde4-plugin-detection.diff b/patches/dev300/kde4-plugin-detection.diff
index 15dbbd7..bf3f9c5 100644
--- a/patches/dev300/kde4-plugin-detection.diff
+++ b/patches/dev300/kde4-plugin-detection.diff
@@ -74,15 +74,17 @@ index 335bb8f..da10725 100644
          if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
              pRet = desktop_strings[DESKTOP_GNOME];
          if ( aOver.equalsIgnoreAsciiCase( "none" ) )
-@@ -412,6 +441,8 @@ static const char * get_desktop_environment()
+@@ -412,7 +441,9 @@ static const char * get_desktop_environment()
+             {
+                 XErrorHandler pOldHdl = XSetErrorHandler( autodect_error_handler );
              
-                 if ( is_kde_desktop( pDisplay ) )
-                     pRet = desktop_strings[DESKTOP_KDE];
-+                else if ( is_kde4_desktop( pDisplay ) )
+-                if ( is_kde_desktop( pDisplay ) )
++                if ( is_kde4_desktop( pDisplay ) )
 +                    pRet = desktop_strings[DESKTOP_KDE4];
++                else if ( is_kde_desktop( pDisplay ) )
+                     pRet = desktop_strings[DESKTOP_KDE];
                  else if ( is_gnome_desktop( pDisplay ) )
                      pRet = desktop_strings[DESKTOP_GNOME];
-                 else if ( is_cde_desktop( pDisplay ) )
 @@ -443,6 +474,8 @@ static const char* autodetect_plugin()
          pRet = "gtk";
      else if( desktop == desktop_strings[DESKTOP_KDE] )