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

List:       kde-commits
Subject:    kdebase
From:       George Staikos <staikos () kde ! org>
Date:       2003-02-18 4:55:07
[Download RAW message or body]

CVS commit by staikos: 

Repair a bit of damage


  M +2 -3      kcontrol/xinerama/kcmxinerama.cpp   1.3
  M +5 -4      kwin/options.cpp   1.85


--- kdebase/kcontrol/xinerama/kcmxinerama.cpp  #1.2:1.3
@@ -42,5 +42,5 @@ KCMXinerama::KCMXinerama(QWidget *parent
         _indicators.setAutoDelete(true);
 
-        config = KGlobal::config();
+        config = new KConfig("kdeglobals", false, false);
 
         connect(&_timer, SIGNAL(timeout()), this, SLOT(clearIndicator()));
@@ -94,6 +94,5 @@ KCMXinerama::KCMXinerama(QWidget *parent
 KCMXinerama::~KCMXinerama() {
         _timer.stop();
-        //Don't delete KGlobal::config()
-        //delete config;
+        delete config;
         config = 0;
         clearIndicator();

--- kdebase/kwin/options.cpp  #1.84:1.85
@@ -192,5 +192,5 @@ void Options::reload()
     rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE);
 
-    KConfig *gc = KGlobal::config();
+    KConfig *gc = new KConfig("kdeglobals", false, false);
     bool isVirtual = KApplication::desktop()->isVirtualDesktop();
     gc->setGroup("Windows");
@@ -198,10 +198,11 @@ void Options::reload()
                       isVirtual;
     if (xineramaEnabled) {
-        xineramaPlacementEnabled = config->readBoolEntry ("XineramaPlacementEnabled", FALSE);
-        xineramaMovementEnabled = config->readBoolEntry ("XineramaMovementEnabled", FALSE);
-        xineramaMaximizeEnabled = config->readBoolEntry ("XineramaMaximizeEnabled", FALSE);
+        xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", FALSE);
+        xineramaMovementEnabled = gc->readBoolEntry ("XineramaMovementEnabled", FALSE);
+        xineramaMaximizeEnabled = gc->readBoolEntry ("XineramaMaximizeEnabled", FALSE);
     } else {
          xineramaPlacementEnabled = xineramaMovementEnabled = xineramaMaximizeEnabled = false;
     }
+    delete gc;
 
     val = config->readEntry("Placement","Smart");


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