← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to kded/kbuildservicefactory.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-16 13:53:22 UTC
  • mfrom: (1.14.11)
  • Revision ID: package-import@ubuntu.com-20111216135322-joct6gdco90t3koc
Tags: 4:4.7.90-0ubuntu1
* New upstream beta release
* Remove kubuntu_mobile patches, kactivities is split out now and they 
  will be out of date, keep 
  kubuntu-mobile-07-serviceAvailabilityChanged-bool-signal.diff
  for binary compatibility reasons

Show diffs side-by-side

added added

removed removed

Lines of Context:
kded/kbuildservicefactory.cpp
252
252
                //kDebug(7021) << "Adding service" << service->entryPath() << "to" << serviceType->name() << "pref=" << preference;
253
253
                m_offerHash.addServiceOffer(stName, KServiceOffer(service, preference, 0, service->allowAsDefault()) );
254
254
            } else {
 
255
                KServiceOffer offer(service, serviceTypeList[i].preference, 0, service->allowAsDefault());
255
256
                KMimeType::Ptr mime = KMimeType::mimeType(stName, KMimeType::ResolveAliases);
256
257
                if (!mime) {
257
258
                    if (stName.startsWith(QLatin1String("x-scheme-handler/"))) {
258
259
                        // Create those on demand
259
260
                        m_mimeTypeFactory->createFakeMimeType(stName);
 
261
                        m_offerHash.addServiceOffer(stName, offer );
260
262
                    } else {
261
263
                        kDebug(7021) << service->entryPath() << "specifies undefined mimetype/servicetype" << stName;
262
264
                        // technically we could call addServiceOffer here, 'mime' isn't used. But it
264
266
                        // over all known servicetypes and mimetypes. Unknown -> never written out.
265
267
                        continue;
266
268
                    }
 
269
                } else {
 
270
                    m_offerHash.addServiceOffer(mime->name(), offer); // mime->name so that we resolve aliases
267
271
                }
268
 
                m_offerHash.addServiceOffer(stName, KServiceOffer(service, serviceTypeList[i].preference, 0, service->allowAsDefault()) );
269
272
            }
270
273
        }
271
274
    }