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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/kickoff
From:       David Faure <faure () kde ! org>
Date:       2007-10-22 17:17:50
Message-ID: 1193073470.961755.27979.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 728198 by dfaure:

Fix compilation when strigi is in its own prefix (again and again :)
Fix a deprecated method call.


 M  +2 -0      CMakeLists.txt  
 M  +5 -5      core/applicationmodel.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/CMakeLists.txt #728197:728198
@@ -24,6 +24,8 @@
         kworkspace
         strigiqtdbusclient )
 
+include_directories( ${STRIGI_INCLUDE_DIR} )
+
 # Standalone Test Application
 IF (CMAKE_BUILD_TYPE MATCHES debug)
    set ( Application_SRCS
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/applicationmodel.cpp #728197:728198
@@ -154,16 +154,16 @@
          icon = service->icon();
          appName = service->name();
          genericName = service->genericName();
-         desktopEntry = service->desktopEntryPath();
-         
+         desktopEntry = service->entryPath();
+
          // check for duplicates (eg. KDE 3 and KDE 4 versions of application
          // both present)
          if (duplicatePolicy == ApplicationModel::ShowLatestOnlyPolicy && 
-             existingServices.contains(appName)     
+             existingServices.contains(appName)
             ) {
                 if (Kickoff::isLaterVersion(existingServices[appName],service)) {
-                    continue;   
-                } else { 
+                    continue;
+                } else {
                     // find and remove the existing entry with the same name
                     for (int i = 0 ; i < node->children.count() ; i++) { 
                         if ( node->children[i]->appName == appName ) { 
[prev in list] [next in list] [prev in thread] [next in thread]