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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       David Faure <faure () kde ! org>
Date:       2010-07-23 13:43:43
Message-ID: 20100723134343.E3CB2AC7AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1153545 by dfaure:

use non-deprecated api


 M  +5 -6      krun.cpp  


--- trunk/KDE/kdelibs/kio/kio/krun.cpp #1153544:1153545
@@ -1402,16 +1402,11 @@
 
     Q_ASSERT(!d->m_bFinished);
 
-    KMimeType::Ptr mime = KMimeType::mimeType(type, KMimeType::ResolveAliases);
-    if (!mime) {
-        kWarning(7010) << "Unknown mimetype " << type;
-    }
-
     // Support for preferred service setting, see setPreferredService
     if (!d->m_preferredService.isEmpty()) {
         kDebug(7010) << "Attempting to open with preferred service: " << d->m_preferredService;
         KService::Ptr serv = KService::serviceByDesktopName(d->m_preferredService);
-        if (serv && serv->hasMimeType(mime.data())) {
+        if (serv && serv->hasMimeType(type)) {
             KUrl::List lst;
             lst.append(d->m_strURL);
             if (KRun::run(*serv, lst, d->m_window, false, QString(), d->m_asn)) {
@@ -1426,6 +1421,10 @@
     }
 
     // Resolve .desktop files from media:/, remote:/, applications:/ etc.
+    KMimeType::Ptr mime = KMimeType::mimeType(type, KMimeType::ResolveAliases);
+    if (!mime) {
+        kWarning(7010) << "Unknown mimetype " << type;
+    }
     if (mime && mime->is("application/x-desktop") && !d->m_localPath.isEmpty()) {
         d->m_strURL = KUrl();
         d->m_strURL.setPath(d->m_localPath);
[prev in list] [next in list] [prev in thread] [next in thread]