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

List:       kde-commits
Subject:    KDE/kdebase/workspace/powerdevil
From:       Dario Freddi <drf () kde ! org>
Date:       2010-10-21 11:22:37
Message-ID: 20101021112237.BE588AC89F () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188085 by dafre:

After all of those changes, change the filename for PowerDevil profiles. Previous \
PowerDevil profiles are incompatible and not portable unfortunately.

 M  +1 -1      daemon/PowerDevilDaemon.cpp  
 M  +2 -2      daemon/powerdevilcore.cpp  
 M  +1 -1      daemon/powerdevilprofilegenerator.cpp  
 M  +1 -1      kcmodule/EditPage.cpp  
 M  +1 -1      kcmodule/GeneralPage.cpp  


--- trunk/KDE/kdebase/workspace/powerdevil/daemon/PowerDevilDaemon.cpp \
#1188084:1188085 @@ -180,7 +180,7 @@
     // First things first: let's set up PowerDevil to be aware of active session
     setUpConsoleKit();
 
-    d->profilesConfig = KSharedConfig::openConfig("powerdevilprofilesrc", \
KConfig::SimpleConfig); +    d->profilesConfig = \
KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);  \
setAvailableProfiles(d->profilesConfig->groupList());  
     recacheBatteryPointer(true);
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilcore.cpp #1188084:1188085
@@ -90,7 +90,7 @@
         return;
     }
 
-    m_profilesConfig = KSharedConfig::openConfig("powerdevilprofilesrc", \
KConfig::SimpleConfig); +    m_profilesConfig = \
KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);  
     // Is it brand new?
     if (m_profilesConfig->groupList().isEmpty()) {
@@ -128,7 +128,7 @@
 
     // Listen to profile changes
     KDirWatch *profilesWatch = new KDirWatch(this);
-    profilesWatch->addFile(KStandardDirs::locate("config", "powerdevilprofilesrc"));
+    profilesWatch->addFile(KStandardDirs::locate("config", \
                "powerdevil2profilesrc"));
     connect(profilesWatch, SIGNAL(dirty(QString)), this, \
                SLOT(reloadCurrentProfile()));
     connect(profilesWatch, SIGNAL(created(QString)), this, \
                SLOT(reloadCurrentProfile()));
     connect(profilesWatch, SIGNAL(deleted(QString)), this, \
                SLOT(reloadCurrentProfile()));
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/powerdevilprofilegenerator.cpp \
#1188084:1188085 @@ -47,7 +47,7 @@
     }
 
     // Ok, let's get our config file.
-    KSharedConfigPtr profilesConfig = \
KSharedConfig::openConfig("powerdevilprofilesrc", KConfig::SimpleConfig); +    \
KSharedConfigPtr profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", \
KConfig::SimpleConfig);  
     // And clear it
     foreach (const QString &group, profilesConfig->groupList()) {
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/EditPage.cpp #1188084:1188085
@@ -77,7 +77,7 @@
 
     setupUi(this);
 
-    m_profilesConfig = KSharedConfig::openConfig("powerdevilprofilesrc", \
KConfig::SimpleConfig); +    m_profilesConfig = \
KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);  
     if (m_profilesConfig->groupList().isEmpty()) {
         // Let's add some basic profiles, huh?
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/GeneralPage.cpp #1188084:1188085
@@ -152,7 +152,7 @@
 
 void GeneralPage::reloadAvailableProfiles()
 {
-    KSharedConfigPtr profilesConfig = \
KSharedConfig::openConfig("powerdevilprofilesrc", KConfig::SimpleConfig); +    \
KSharedConfigPtr profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", \
KConfig::SimpleConfig);  
     acProfile->clear();
     batteryProfile->clear();


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