From 2f1e9eba44bd888d6393fe4c075befc7255c581e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Tue, 8 Jan 2008 11:26:52 +0000
Subject: [PATCH] Uncomment code with new i18n strings.

svn path=/trunk/KDE/kdebase/workspace/; revision=758577
---
 compositingprefs.cpp | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index d94da8bdf3..6e895bfffa 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -87,26 +87,20 @@ QString CompositingPrefs::compositingNotPossibleReason()
         {
         return i18n("Required X extensions (XComposite and XDamage) are not available.");
         }
-#if KDE_IS_VERSION( 4, 0, 90 )
-#ifdef __GNUC__
-#warning Uncomment
+#if defined( KWIN_HAVE_OPENGL_COMPOSITING ) && !defined( KWIN_HAVE_XRENDER_COMPOSITING )
+    if( !Extensions::glxAvailable())
+        return i18n( "GLX/OpenGL are not available and only OpenGL support is compiled." );
+#elif !defined( KWIN_HAVE_OPENGL_COMPOSITING ) && defined( KWIN_HAVE_XRENDER_COMPOSITING )
+    if( !Extensions::glxAvailable())
+        return i18n( "XRender/XFixes extensions are not available and only XRender support"
+            " is compiled." );
+#else
+    if( !( Extensions::glxAvailable()
+            || ( Extensions::renderAvailable() && Extensions::fixesAvailable())))
+        {
+        return i18n( "GLX/OpenGL and XRender/XFixes are not available." );
+        }
 #endif
-#endif
-//#if defined( KWIN_HAVE_OPENGL_COMPOSITING ) && !defined( KWIN_HAVE_XRENDER_COMPOSITING )
-//    if( !Extensions::glxAvailable())
-//        return i18n( "GLX/OpenGL are not available and only OpenGL support is compiled." );
-//#endif
-//#elseif !defined( KWIN_HAVE_OPENGL_COMPOSITING ) && defined( KWIN_HAVE_XRENDER_COMPOSITING )
-//    if( !Extensions::glxAvailable())
-//        return i18n( "XRender/XFixes extensions are not available and only XRender support"
-//            " is compiled." );
-//#else
-//    if( !( Extensions::glxAvailable()
-//            || ( Extensions::renderAvailable() && Extensions::fixesAvailable())))
-//        {
-//        return i18n( "GLX/OpenGL and XRender/XFixes are not available." );
-//        }
-//#endif
     return QString();
 #else
     return i18n("Compositing was disabled at compile time.\n"