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

List:       kde-commits
Subject:    kdebase/kicker/buttons
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-03-05 11:48:57
Message-ID: 20040305114857.ACBD3995A () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Better KDE 3.1 <--> KDE 3.2 compatibility


  M +9 -2      servicebutton.cpp   1.21


--- kdebase/kicker/buttons/servicebutton.cpp  #1.20:1.21
@@ -66,5 +66,10 @@ ServiceButton::ServiceButton( const KCon
   , is_lmb_down(false)
 {
-    loadServiceFromId(config.readPathEntry("DesktopFile"));
+    QString id;
+    if (config.hasKey("StorageId"))
+       id = config.readPathEntry("StorageId");
+    else
+       id = config.readPathEntry("DesktopFile");
+    loadServiceFromId(id);
     initialize();
 }
@@ -131,5 +136,7 @@ void ServiceButton::readDesktopFile()
 void ServiceButton::saveConfig( KConfigGroup& config ) const
 {
-    config.writePathEntry( "DesktopFile", _id );
+    config.writePathEntry("StorageId", _id );
+    if (!config.hasKey("DesktopFile"))
+       config.writePathEntry("DesktopFile", _service->desktopEntryPath());
 }
 


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