rev 17343 - trunk/packages/kdelibs/debian/patches

[Pino Toscano]

Author: pino-guest
Date: 2010-03-05 01:27:16 +0000 (Fri, 05 Mar 2010)
New Revision: 17343

Modified:
   trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
Log:
update/simplify: less unuseful differences, more upstream-style


Modified: trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2010-03-05 01:17:56 UTC (rev 17342)
+++ trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2010-03-05 01:27:16 UTC (rev 17343)
@@ -3,7 +3,7 @@
 path is a symlink.
 --- a/kdecore/services/kservicefactory.cpp
 +++ b/kdecore/services/kservicefactory.cpp
-@@ -124,33 +124,49 @@ KService::Ptr KServiceFactory::findServi
+@@ -124,22 +124,16 @@
      return newService;
  }
  
@@ -18,27 +18,21 @@
      int offset = m_relNameDict->find_string( _name );
      if (!offset) {
 -        //kDebug(servicesDebugArea()) << "findServiceByDesktopPath:" << _name << "not found";
--        return KService::Ptr(); // Not found
-+         return KService::Ptr(); // Not found
+         return KService::Ptr(); // Not found
      }
  
      KService::Ptr newService(createEntry(offset));
      if (!newService) {
 -        kDebug(servicesDebugArea()) << "findServiceByDesktopPath: createEntry failed!";
-+       kDebug() << "findServiceByDesktopPath: createEntry failed!";
++        kDebug(servicesDebugArea()) << "serviceFromPath: createEntry failed!";
      }
      // Check whether the dictionary was right
      // It's ok that it's wrong, for the case where we're looking up an unknown service,
-     // and the hash value gave us another one.
--    if (newService && (newService->entryPath() != _name)) {
-+    if (newService && (newService->entryPath() != _name))
-+    {
-         // No it wasn't...
-         return KService::Ptr();
+@@ -150,6 +144,27 @@
      }
      return newService;
  }
- 
++
 +KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &_name)
 +{
 +    if (!m_relNameDict) return KService::Ptr(); // Error!
@@ -50,22 +44,21 @@
 +    if (!newService) {
 +        // We might have been given a symlink or non-canonical path of some sort.
 +        // Therefore try looking up KStandardDirs::realFilePath'ed path too.
-+        newService = serviceFromPath( KStandardDirs::realFilePath( _name ) );
++        newService = serviceFromPath(KStandardDirs::realFilePath(_name));
 +    }
 +
-+    if ( !newService ) {
-+        qDebug( "findServiceByDesktopPath: %s not found", qPrintable( _name ) );
++    if (!newService) {
++        kDebug(servicesDebugArea()) << _name << "not found";
 +        return KService::Ptr(); // Not found
 +    }
 +    return newService;
 +}
-+
+ 
  KService::Ptr KServiceFactory::findServiceByMenuId(const QString &_menuId)
  {
-     if (!m_menuIdDict) return KService::Ptr(); // Error!
 --- a/kdecore/services/kservicefactory.h
 +++ b/kdecore/services/kservicefactory.h
-@@ -121,6 +121,8 @@ protected:
+@@ -121,6 +121,8 @@
      virtual void virtual_hook( int id, void* data );
  private:
      class KServiceFactoryPrivate* d;