1 files changed, 13 insertions, 0 deletions

diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index c6a4453..9fab160 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -9,24 +9,25 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_MIMEEXT
 #include "mimetype.h"
 #include "applnk.h"
 #include "resource.h"
 #include "qpeapplication.h"
 #include <qfile.h>
 #include <qdict.h>
 #include <qregexp.h>
 #include <qstringlist.h>
 #include <qtextstream.h>
 #include <qmap.h>
  
 class MimeTypeData {
@@ -37,37 +38,39 @@ public:
         app(lnk)
     {
         if ( icon.isEmpty() ) {
             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() ) );
         }
     }
     QString id;
+    QString extension;
     QString desc;
     QPixmap regIcon;
     QPixmap bigIcon;
     AppLnk app;
 };
 
 class MimeType::Dict : public QDict<MimeTypeData> {
 public:
     Dict() {}
 };
 
 MimeType::Dict* MimeType::d=0;
 static QMap<QString,QString> *typeFor = 0;
+static QMap<QString,QString> *extFor = 0;
 
 MimeType::Dict& MimeType::dict()
 {
     if ( !d ) {
         d = new Dict;
         d->setAutoDelete(TRUE);
     }
     return *d;
 }
 
 MimeType::MimeType( const QString& ext_or_id )
 {
@@ -87,24 +90,30 @@ QString MimeType::id() const
 QString MimeType::description() const
 {
     MimeTypeData* d = data(i);
     return d ? d->desc : QString::null;
 }
 
 QPixmap MimeType::pixmap() const
 {
     MimeTypeData* d = data(i);
     return d ? d->regIcon : QPixmap();
 }
 
+QString MimeType::extension() 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->app : 0;
 }
 
@@ -119,49 +128,53 @@ void MimeType::registerApp( const AppLnk& lnk )
     }
 }
 
 void MimeType::clear()
 {
     delete d;
     d = 0;
 }
 
 void MimeType::loadExtensions()
 {
     if ( !typeFor ) {
+        extFor = new QMap<QString,QString>;
         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;
+                if ( it != tokens.end() ) {
+                    (*extFor)[id] = *it;
                 while (it != tokens.end()) {
                     (*typeFor)[*it] = id;
                     ++it;
                 }
             }
         }
     }
 }
+}
 
 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";