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

List:       kde-commits
Subject:    kdenox/konq-embed
From:       Stefan Eilers <stefan.eilers () basyskom ! de>
Date:       2008-06-09 13:44:59
Message-ID: 1213019099.592050.9837.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 818748 by eilers:

Moved mailto implementation into khtml_part. Thus, mailto in frames is
now supported, too.


 A             kdesrc/khtml/patches/add_mailto_support_3.5.7.patch  
 M  +2 -0      prepare_kde_src  
 M  +0 -71     src/view.cc  


--- trunk/kdenox/konq-embed/prepare_kde_src #818747:818748
@@ -399,6 +399,8 @@
 		patch -s -d ./kdesrc/khtml -p0  -i  patches/fix-khtmlview-for-qtembedded.patch 
 		echo "*** applying fix for wrong javascript screen sizes.."
 		patch -s -d ./kdesrc/khtml -p0  -i patches/kjs_availsizefix.patch
+		echo "*** applying mailto addon.."
+		patch -s -d ./kdesrc/khtml -p0  -i patches/add_mailto_support_3.5.7.patch
 		;;
         3.5.1)
                 echo "*** applying khtml ecma embedded patch..."
--- trunk/kdenox/konq-embed/src/view.cc #818747:818748
@@ -47,70 +47,6 @@
 
 #include <kdebug.h>
 
-#if defined (_QT_QPE_)
-#include <qtopia/services.h>
-#endif
-
-namespace {
-    class MailToHandler
-    {
-	public:
-	    static void send( const KURL& url )
-	    {
-		QMap<QString,QString> parameters = parseURL( url );
-#if defined (_QT_QPE_)
-		ServiceRequest req( "Email", "writeMail(QMap(QString,QString))" );
-		req << parameters;
-		req.send();
-#else
-		qWarning( "Support of protocol \"mailto:\" not implemented!" );
-#endif
-	    }
-	    
-	private:
-	    static QMap<QString, QString> parseURL( const KURL& url )
-	    {
-		QMap<QString,QString> parameters;
-		parameters["to"] =  KURL::decode_string(url.path());
-		
-		QStringList queries = QStringList::split('&', url.query().mid(1));
-		QStringList::Iterator it = queries.begin();
-		const QStringList::Iterator itEnd = queries.end();
-		for (; it != itEnd; ++it)
-		{
-		    if ((*it).startsWith(QString::fromLatin1("to="))){
-			if ( !parameters["to"].isEmpty() )
-			    parameters["to"] += ", ";
-			parameters["to"] += KURL::decode_string((*it).mid(3));
-		    }
-		    else if ((*it).startsWith(QString::fromLatin1("subject="))){
-			parameters["subject"] = KURL::decode_string((*it).mid(8));
-		    }
-		    else if ((*it).startsWith(QString::fromLatin1("cc=")))
-		    {
-			parameters["cc"] = KURL::decode_string((*it).mid(3));
-		    }
-#if 0
-		    // BCC is unsafe and should not be interpreted!
-		    else if ((*it).startsWith(QString::fromLatin1("bcc=")))
-		    {
-			parameters["bcc"] = KURL::decode_string((*it).mid(4));
-		    }
-#endif
-		    else if ((*it).startsWith(QString::fromLatin1("body=")))
-		    {
-			parameters["body"] = KURL::decode_string((*it).mid(5));
-		    }
-		}
-		
-		return parameters;
-	    }
-	    
-    };
-    
-}
-
-
 View::View( QObject *parent, const char *name, KParts::ReadOnlyPart *part )
     : QObject( parent, name ), m_part( part)
 {
@@ -457,13 +393,6 @@
     
     stop();
     
-    if ( url.protocol() == "mailto" )
-    {
-	MailToHandler::send( url );
-	emit locationBarURLChanged( m_locationBarURL );
-	return;
-    }
-    
     m_run = new Run( this, url, args );
     connect( m_run, SIGNAL( error() ),
 	     this, SLOT( runError() ) );
[prev in list] [next in list] [prev in thread] [next in thread]