Remove msdos code now in src/msdos, update bakefiles and regenerate.

[wxWidgets.git] / src / unix / mimetype.cpp

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 50b119f15846a254d089d6c848c05d482fc73859..e38775b6718748e1676099cd70bd6c3e6f823379 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -75,7 +75,6 @@
 #include "wx/tokenzr.h"
 #include "wx/iconloc.h"
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include "wx/iconloc.h"
 #include "wx/filename.h"

-#include "wx/fileconf.h"

 
 #include "wx/unix/mimetype.h"
 
 
 #include "wx/unix/mimetype.h"
 


@@ -776,7 +775,13 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
     wxString strDesc;
     
     if ( !wxDir::Exists(dirname) )
     wxString strDesc;
     
     if ( !wxDir::Exists(dirname) )

-        return;
+    {
+        // Jst test for default GPE dir also
+        dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons");
+        
+        if ( !wxDir::Exists(dirname) )
+           return;
+    }

 
     wxDir dir2( dirname );
 
 
     wxDir dir2( dirname );
 


@@ -1063,7 +1068,8 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
                 size_t nDir, nDirs = icondirs.GetCount();
                 for ( nDir = 0; nDir < nDirs; nDir++ )
                 {
                 size_t nDir, nDirs = icondirs.GetCount();
                 for ( nDir = 0; nDir < nDirs; nDir++ )
                 {

-                    wxFileName fname( icondirs[nDir], strIcon );
+                    wxFileName fnameIcon( strIcon );
+                    wxFileName fname( icondirs[nDir], fnameIcon.GetName() );

                     fname.SetExt( wxT("png") );
                     if (fname.FileExists())
                     {
                     fname.SetExt( wxT("png") );
                     if (fname.FileExists())
                     {


@@ -1164,6 +1170,19 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
 {
     wxArrayString dirs;
     wxArrayString icondirs;
 {
     wxArrayString dirs;
     wxArrayString icondirs;

+
+    // FIXME: This code is heavily broken. There are three bugs in it:
+    //        1) it uses only KDEDIR, which is deprecated, instead of using
+    //           list of paths from KDEDIRS and using KDEDIR only if KDEDIRS
+    //           is not set
+    //        2) it doesn't look into ~/.kde/share/config/kdeglobals where
+    //           user's settings are stored and thus *ignores* user's settings
+    //           instead of respecting them
+    //        3) it "tries to guess KDEDIR" and "tries a few likely theme
+    //           names", both of which is completely arbitrary; instead, the
+    //           code should give up if KDEDIR(S) is not set and/or the icon
+    //           theme cannot be determined, because it means that the user is
+    //           not using KDE (and thus is not interested in KDE icons anyway)

     
     // the variable $KDEDIR is set when KDE is running
     wxString kdedir = wxGetenv( wxT("KDEDIR") );
     
     // the variable $KDEDIR is set when KDE is running
     wxString kdedir = wxGetenv( wxT("KDEDIR") );


@@ -1177,21 +1196,23 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
         configFile.AppendDir( wxT("config") );
         configFile.SetName( wxT("kdeglobals") );
            
         configFile.AppendDir( wxT("config") );
         configFile.SetName( wxT("kdeglobals") );
            

-        if (configFile.FileExists())
+        wxTextFile config;
+        if (configFile.FileExists() && config.Open(configFile.GetFullPath()))

         {
         {

-            wxFileConfig config( wxEmptyString, wxEmptyString, configFile.GetFullPath() );

             // $(KDEDIR)/share/config -> $(KDEDIR)/share
             configFile.RemoveDir( configFile.GetDirCount()-1 );
             // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
             configFile.AppendDir( wxT("icons") );
 
             // Check for entry
             // $(KDEDIR)/share/config -> $(KDEDIR)/share
             configFile.RemoveDir( configFile.GetDirCount()-1 );
             // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
             configFile.AppendDir( wxT("icons") );
 
             // Check for entry

-            config.SetPath( wxT("Icons") );
-            wxString theme;
-            if (config.Read( wxT("Theme"), &theme ))
-                configFile.AppendDir( theme );
-            else
-                configFile.AppendDir( wxT("default.kde") );
+            wxString theme(wxT("default.kde"));
+            size_t cnt = config.GetLineCount();
+            for (size_t i = 0; i < cnt; i++)
+            {
+                if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/))
+                    break;
+            }
+            configFile.AppendDir(theme);

         }
         else
         {
         }
         else
         {


@@ -1204,39 +1225,39 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
         }
         
         configFile.SetName( wxEmptyString );
         }
         
         configFile.SetName( wxEmptyString );

+        configFile.AppendDir( wxT("32x32") );
+        configFile.AppendDir( wxT("mimetypes") );

         
         // Just try a few likely icons theme names
         
         // Just try a few likely icons theme names

-
+        
+        int pos = configFile.GetDirCount()-3;
+        

         if (!wxDir::Exists(configFile.GetPath()))
         {
         if (!wxDir::Exists(configFile.GetPath()))
         {

-            configFile.RemoveDir( configFile.GetDirCount()-1 );
-            configFile.AppendDir( wxT("default.kde") );
+            configFile.RemoveDir( pos );
+            configFile.InsertDir( pos, wxT("default.kde") );

         }
         
         if (!wxDir::Exists(configFile.GetPath()))
         {
         }
         
         if (!wxDir::Exists(configFile.GetPath()))
         {

-            configFile.RemoveDir( configFile.GetDirCount()-1 );
-            configFile.AppendDir( wxT("default") );
+            configFile.RemoveDir( pos );
+            configFile.InsertDir( pos, wxT("default") );

         }
         
         if (!wxDir::Exists(configFile.GetPath()))
         {
         }
         
         if (!wxDir::Exists(configFile.GetPath()))
         {

-            configFile.RemoveDir( configFile.GetDirCount()-1 );
-            configFile.AppendDir( wxT("crystalsvg") );
+            configFile.RemoveDir( pos );
+            configFile.InsertDir( pos, wxT("crystalsvg") );

         }
         
         if (!wxDir::Exists(configFile.GetPath()))
         {
         }
         
         if (!wxDir::Exists(configFile.GetPath()))
         {

-            configFile.RemoveDir( configFile.GetDirCount()-1 );
-            configFile.AppendDir( wxT("crystal") );
+            configFile.RemoveDir( pos );
+            configFile.InsertDir( pos, wxT("crystal") );

         }
         
         if (wxDir::Exists(configFile.GetPath()))
         }
         
         if (wxDir::Exists(configFile.GetPath()))

-        {
-            configFile.AppendDir( wxT("32x32") );
-            configFile.AppendDir( wxT("mimetypes") );

             icondirs.Add( configFile.GetFullPath() );
             icondirs.Add( configFile.GetFullPath() );

-        }

     }
 
     // settings in ~/.kde have maximal priority
     }
 
     // settings in ~/.kde have maximal priority


@@ -2268,8 +2289,7 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
                 // the string is quoted and ends at the matching quote
                 pEnd = wxStrchr(++pc, wxT('"'));
                 if ( pEnd == NULL ) {
                 // the string is quoted and ends at the matching quote
                 pEnd = wxStrchr(++pc, wxT('"'));
                 if ( pEnd == NULL ) {

-                    wxLogWarning(_("Mime.types file %s, line %d: unterminated "
-                                   "quoted string."),
+                    wxLogWarning(_("Mime.types file %s, line %d: unterminated quoted string."),

                                  strFileName.c_str(), nLine + 1);
                 }
             }
                                  strFileName.c_str(), nLine + 1);
                 }
             }


@@ -2545,9 +2565,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
                             // something is wrong, bail out
                             cont = FALSE;
 
                             // something is wrong, bail out
                             cont = FALSE;
 

-                            wxLogDebug(wxT("Mailcap file %s, line %lu: "
-                                           "'\\' on the end of the last line "
-                                           "ignored."),
+                            wxLogDebug(wxT("Mailcap file %s, line %lu: '\\' on the end of the last line ignored."),

                                        strFileName.c_str(),
                                        (unsigned long)nLine + 1);
                         }
                                        strFileName.c_str(),
                                        (unsigned long)nLine + 1);
                         }


@@ -2611,9 +2629,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
                                 // this might be useful for the programmer
                                 wxLogDebug
                                 (
                                 // this might be useful for the programmer
                                 wxLogDebug
                                 (

-                                    wxT("Mailcap file %s, line %lu: "
-                                        "unknown field '%s' for the "
-                                        "MIME type '%s' ignored."),
+                                    wxT("Mailcap file %s, line %lu: unknown field '%s' for the MIME type '%s' ignored."),

                                     strFileName.c_str(),
                                     (unsigned long)nLine + 1,
                                     curField.c_str(),
                                     strFileName.c_str(),
                                     (unsigned long)nLine + 1,
                                     curField.c_str(),


@@ -2652,8 +2668,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
         // check that we really read something reasonable
         if ( currentToken < Field_Other )
         {
         // check that we really read something reasonable
         if ( currentToken < Field_Other )
         {

-            wxLogWarning(_("Mailcap file %s, line %d: incomplete entry "
-                           "ignored."),
+            wxLogWarning(_("Mailcap file %s, line %d: incomplete entry ignored."),

                          strFileName.c_str(), nLine + 1);
 
             continue;
                          strFileName.c_str(), nLine + 1);
 
             continue;


@@ -2706,9 +2721,10 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
             // have we seen this one before?
             int nIndex = m_aTypes.Index(data.type);
 
             // have we seen this one before?
             int nIndex = m_aTypes.Index(data.type);
 

-            // and if we have, was it in this file?
+            // and if we have, was it in this file? if not, we should
+            // overwrite the previously seen one

             overwrite = nIndex == wxNOT_FOUND ||
             overwrite = nIndex == wxNOT_FOUND ||

-                            aIndicesSeenHere.Index(nIndex) != wxNOT_FOUND;
+                            aIndicesSeenHere.Index(nIndex) == wxNOT_FOUND;

         }
 
         wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"),
         }
 
         wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"),