[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kgamma/kcmkgamma
From:       Frans Englich <frans.englich () telia ! com>
Date:       2004-07-11 17:09:44
Message-ID: 20040711170944.BF64216B14 () office ! kde ! org
[Download RAW message or body]

CVS commit by englich: 


Conditional Module Loading.


  M +1 -2      Makefile.am   1.8
  M +11 -1     kgamma.cpp   1.29
  M +1 -0      kgamma.desktop   1.55


--- kdegraphics/kgamma/kcmkgamma/Makefile.am  #1.7:1.8
@@ -11,6 +11,5 @@
 SUBDIRS = pics 
 
-kgamma_datadir = $(kde_appsdir)/.hidden
-kgamma_data_DATA = kgamma.desktop
+xdg_apps_DATA = kgamma.desktop
 
 messages:

--- kdegraphics/kgamma/kcmkgamma/kgamma.cpp  #1.28:1.29
@@ -46,4 +46,14 @@ typedef KGenericFactory<KGamma, QWidget>
 K_EXPORT_COMPONENT_FACTORY ( kcm_kgamma, KGammaFactory( "kgamma" ) )
 
+extern "C"
+{
+        bool test_kgamma()
+        {
+                bool retval;
+                (void) new XVidExtWrap(&retval, NULL);
+                return retval;
+        }
+}
+
 KGamma::KGamma(QWidget *parent, const char *name, const QStringList&)
     :KCModule(parent,name)
@@ -52,5 +62,5 @@ KGamma::KGamma(QWidget *parent, const ch
   GammaCorrection = true;
   xv = new XVidExtWrap(&ok, NULL);
-  if (ok) {
+  if (ok) { /* KDE 4: Uneccessary test, when all KCM wrappers do conditional loading */
     xv->getGamma(XVidExtWrap::Red, &ok);
     if (ok) {

--- kdegraphics/kgamma/kcmkgamma/kgamma.desktop  #1.54:1.55
@@ -87,2 +87,3 @@
 X-KDE-Library=kgamma
 X-KDE-ModuleType=Library
+X-KDE-Test-Module=true


[prev in list] [next in list] [prev in thread] [next in thread]