Fixed loading of file extensions from mime.types (only the first ext was

loaded)

1 files changed, 1 insertions, 3 deletions

diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index e2e0dab..92fe5e6 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -54,255 +54,253 @@ public:
 	if ( desc.isEmpty() )
 	    desc = QPEApplication::tr("%1 document").arg(apps.first()->name());
 	return desc;
     }
 
     QPixmap regIcon()
     {
 	if ( regicon.isNull() )
 	    loadPixmaps();
 	return regicon;
     }
 
     QPixmap bigIcon()
     {
 	if ( bigicon.isNull() )
 	    loadPixmaps();
 	return bigicon;
     }
 
 private:
     void loadPixmaps()
     {
 	if ( apps.count() ) {
 	    QString icon;
 	    for (AppLnk* lnk = apps.first(); icon.isNull() && lnk; lnk=apps.next()) {
 		QStringList icons = lnk->mimeTypeIcons();
 		if ( icons.count() ) {
 		    QStringList types = lnk->mimeTypes();
 		    for (QStringList::ConstIterator t=types.begin(),i=icons.begin(); t!=types.end() && i!=icons.end(); ++i,++t) {
 			if ( *t == id ) {
 			    icon = *i;
 			    break;
 			}
 		    }
 		}
 	    }
 	    if ( icon.isNull() ) {
 		AppLnk* lnk = apps.first();
 		regicon = lnk->pixmap();
 		bigicon = lnk->bigPixmap();
 	    } else {
 		QImage unscaledIcon = Resource::loadImage( icon );
 		regicon.convertFromImage( unscaledIcon.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
 		bigicon.convertFromImage( unscaledIcon.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() ) );
 	    }
 	}
     }
 
     QPixmap regicon;
     QPixmap bigicon;
     QString desc;
 };
 
 class MimeType::Private : public QDict<MimeTypeData> {
 public:
     Private() {}
     ~Private() {}
 
     // ...
 };
 
 MimeType::Private* MimeType::d=0;
 static QMap<QString,QString> *typeFor = 0;
 static QMap<QString,QStringList> *extFor = 0;
 
 MimeType::Private& MimeType::data()
 {
     if ( !d ) {
 	d = new Private;
 	d->setAutoDelete(TRUE);
 	static bool setCleanup = FALSE;
 	if ( !setCleanup ) {
 	    qAddPostRoutine( cleanupMime );
 	    setCleanup = TRUE;
 	}
     }
     return *d;
 }
 
 MimeType::MimeType( const QString& ext_or_id )
 {
     init(ext_or_id);
 }
 
 MimeType::MimeType( const DocLnk& lnk )
 {
     init(lnk.type());
 }
 
 QString MimeType::id() const
 {
     return i;
 }
 
 QString MimeType::description() const
 {
     MimeTypeData* d = data(i);
     return d ? d->description() : QString::null;
 }
 
 QPixmap MimeType::pixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->regIcon() : QPixmap();
 }
 
 QString MimeType::extension() const
 {
     return extensions().first();
 }
 
 QStringList MimeType::extensions() const
 {
     loadExtensions();
     return *(*extFor).find(i);
 }
 
 QPixmap MimeType::bigPixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->bigIcon() : QPixmap();
 }
 
 const AppLnk* MimeType::application() const
 {
     MimeTypeData* d = data(i);
     return d ? d->apps.first() : 0;
 }
 
 static QString serviceBinding(const QString& service)
 {
     // Copied from qtopiaservices
     QString svrc = service;
     for (int i=0; i<(int)svrc.length(); i++)
         if ( svrc[i]=='/' ) svrc[i] = '-';
     return "Service-"+svrc;
 }
 
 void MimeType::registerApp( const AppLnk& lnk )
 {
     QStringList list = lnk.mimeTypes();
     for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
 	MimeTypeData* cur = data()[*it];
 	AppLnk* l = new AppLnk(lnk);
 	if ( !cur ) {
 	    cur = new MimeTypeData( *it );
 	    data().insert( *it, cur );
 	    cur->apps.append(l);
 	} else if ( cur->apps.count() ) {
 	    Config binding(serviceBinding("Open/"+*it));
 	    binding.setGroup("Service");
 	    QString def = binding.readEntry("default");
 	    if ( l->exec() == def )
 		cur->apps.prepend(l);
 	    else
 		cur->apps.append(l);
 	} else {
 	    cur->apps.append(l);
 	}
     }
 }
 
 void MimeType::clear()
 {
     delete d;
     d = 0;
 }
 
 void MimeType::loadExtensions()
 {
     if ( !typeFor ) {
 	extFor = new QMap<QString,QStringList>;
 	typeFor = new QMap<QString,QString>;
 	loadExtensions("/etc/mime.types");
 	loadExtensions(QPEApplication::qpeDir()+"etc/mime.types");
     }
 }
 
 void MimeType::loadExtensions(const QString& filename)
 {
     QFile file(filename);
     if ( file.open(IO_ReadOnly) ) {
 	QTextStream in(&file);
 	QRegExp space("[ \t]+");
 	while (!in.atEnd()) {
 	    QStringList tokens = QStringList::split(space, in.readLine());
 	    QStringList::ConstIterator it = tokens.begin();
 	    if ( it != tokens.end() ) {
 		QString id = *it; ++it;
 		// new override old (though left overrides right)
 		QStringList exts = (*extFor)[id];
 		QStringList newexts;
-		if ( it != tokens.end() ) {
+		while ( it != tokens.end() ) {
 		    exts.remove(*it);
 		    if ( !newexts.contains(*it) )
 			newexts.append(*it);
-		    while (it != tokens.end()) {
 			(*typeFor)[*it] = id;
 			++it;
 		    }
-		}
 		(*extFor)[id] = newexts + exts;
 	    }
 	}
     }
 }
 
 void MimeType::init( const QString& ext_or_id )
 {
     if ( ext_or_id[0] != '/' && ext_or_id.contains('/') ) {
 	i = ext_or_id.lower();
     } else {
 	loadExtensions();
 	int dot = ext_or_id.findRev('.');
 	QString ext = dot >= 0 ? ext_or_id.mid(dot+1) : ext_or_id;
 	i = (*typeFor)[ext.lower()];
 	if ( i.isNull() )
 	    i = "application/octet-stream";
     }
     static bool appsUpdated = FALSE;
     if ( !appsUpdated ) {
 	appsUpdated = TRUE;
 	updateApplications();
     }
 }
 
 MimeTypeData* MimeType::data(const QString& id)
 {
     MimeTypeData* d = data()[id];
     if ( !d ) {
 	int s = id.find('/');
 	QString idw = id.left(s)+"/*";
 	d = data()[idw];
     }
     return d;
 }
 
 QString MimeType::appsFolderName()
 {
     return QPEApplication::qpeDir() + "apps";
 }
 
 void MimeType::updateApplications()
 {
     clear();
     AppLnkSet apps( appsFolderName() );
     updateApplications(&apps);
 }
 
 void MimeType::updateApplications(AppLnkSet* folder)
 {
     for ( QListIterator<AppLnk> it( folder->children() ); it.current(); ++it ) {
 	registerApp(*it.current());
     }
 }