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

List:       kde-commits
Subject:    kdebase/kicker/core
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-09-09 13:12:35
[Download RAW message or body]

CVS commit by waba: 

Improve lookup of services.


  M +6 -6      containerarea.cpp   1.153
  M +2 -16     global.cpp   1.15
  M +1 -1      global.h   1.19


--- kdebase/kicker/core/containerarea.cpp  #1.152:1.153
@@ -147,10 +147,10 @@ void ContainerArea::defaultContainerConf
     } else {
         buttons << "menuext/prefmenu.desktop";
-        buttons << "System/konsole.desktop";
-        buttons << "Home.desktop";
-        buttons << "Internet/konqbrowser.desktop";
-        buttons << "Internet/KMail.desktop";
-        buttons << "Office/kword.desktop";
-        buttons << "Help.desktop";
+        buttons << "kde-konsole.desktop";
+        buttons << "kde-Home.desktop";
+        buttons << "kde-konqbrowser.desktop";
+        buttons << "kde-KMail.desktop";
+        buttons << "kde-kword.desktop";
+        buttons << "kde-Help.desktop";
     }
 

--- kdebase/kicker/core/global.cpp  #1.14:1.15
@@ -65,21 +65,7 @@ int sizeValue(Size s)
 }
 
-QString locateDesktopFile(const QString &desktopName)
+QString locateDesktopFile(const QString &storageId)
 {
-   if (desktopName.startsWith("/") && QFile::exists(desktopName))
-      return desktopName;
-
-   KService::Ptr service = KService::serviceByDesktopPath(desktopName);
-   if (!service)
-   {
-      QString tmp = desktopName;
-      tmp = tmp.mid(tmp.findRev('/')+1); // Strip dir
-
-      if (tmp.endsWith(".desktop"))
-         tmp.truncate(tmp.length()-8);
-
-
-      service = KService::serviceByDesktopName(tmp);
-   }
+   KService::Ptr service = KService::serviceByStorageId(storageId);
    if (service)
       return service->desktopEntryPath();

--- kdebase/kicker/core/global.h  #1.18:1.19
@@ -35,5 +35,5 @@ Position directionToPosition( Direction 
 Direction positionToDirection( Position p );
 int sizeValue(Size s);
-QString locateDesktopFile(const QString &desktopName);
+QString locateDesktopFile(const QString &storageId);
 
 #endif // __pglobal_h__


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