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

List:       kde-commits
Subject:    branches/KDE/3.4/kdelibs/kio/kio branches/KDE/3.5/kdelibs/kio/kio
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-07-28 20:04:58
Message-ID: 1122581098.386925.12125.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439745 by mueller:

fix detection of -fpie/pie executables



 M  +9 -0      branches/KDE/3.4/kdelibs/kio/kio/kmimemagic.cpp  
 M  +9 -0      branches/KDE/3.5/kdelibs/kio/kio/kmimemagic.cpp  
 M  +9 -0      trunk/KDE/kdelibs/kio/kio/kmimemagic.cpp  


--- branches/KDE/3.4/kdelibs/kio/kio/kmimemagic.cpp #439744:439745
@@ -2262,6 +2262,15 @@
 			tmp += "src";
 		r->setMimeType(tmp);
 	}
+	else
+	if ( tmp == "application/x-sharedlib" )
+	{
+		if ( _filename.find( ".so" ) == -1 ) 
+		{
+			tmp = "application/x-executable";
+			r->setMimeType( tmp );
+		}
+	}
 }
 
 KMimeMagicResult *
--- branches/KDE/3.5/kdelibs/kio/kio/kmimemagic.cpp #439744:439745
@@ -2262,6 +2262,15 @@
 			tmp += "src";
 		r->setMimeType(tmp);
 	}
+	else
+	if ( tmp == "application/x-sharedlib" )
+	{
+		if ( _filename.find( ".so" ) == -1 ) 
+		{
+			tmp = "application/x-executable";
+			r->setMimeType( tmp );
+		}
+	}
 }
 
 KMimeMagicResult *
--- trunk/KDE/kdelibs/kio/kio/kmimemagic.cpp #439744:439745
@@ -2262,6 +2262,15 @@
 			tmp += "src";
 		r->setMimeType(tmp);
 	}
+	else
+	if ( tmp == "application/x-sharedlib" )
+	{
+		if ( _filename.find( ".so" ) == -1 ) 
+		{
+			tmp = "application/x-executable";
+			r->setMimeType( tmp );
+		}
+	}
 }
 
 KMimeMagicResult *
[prev in list] [next in list] [prev in thread] [next in thread]