Index: khtml

Index: khtml_ext.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_ext.cpp,v
retrieving revision 1.103
diff -u -5 -d -p -r1.103 khtml_ext.cpp
--- khtml_ext.cpp 25 Oct 2004 12:21:23 -0000 1.103
+++ khtml_ext.cpp 8 Nov 2004 05:29:24 -0000
@@ -543,40 +543,44 @@ void KHTMLPopupGUIClient::slotSaveImageA
saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, QString::null, 0, d->m_suggestedFilename );
}

void KHTMLPopupGUIClient::slotCopyLinkLocation()
{
+ KURL safeURL(d->m_url);
+ safeURL.setPass(QString::null);
#ifndef QT_NO_MIMECLIPBOARD
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
- lst.append( d->m_url );
+ lst.append( safeURL );
QApplication::clipboard()->setSelectionMode(true);
QApplication::clipboard()->setData( new KURLDrag( lst ) );
QApplication::clipboard()->setSelectionMode(false);
QApplication::clipboard()->setData( new KURLDrag( lst ) );
#else
- QApplication::clipboard()->setText( d->m_url.url() ); //FIXME(E): Handle multiple entries
+ QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}

void KHTMLPopupGUIClient::slotStopAnimations()
{
d->m_khtml->stopAnimations();
}

void KHTMLPopupGUIClient::slotCopyImageLocation()
{
+ KURL safeURL(d->m_imageURL);
+ safeURL.setPass(QString::null);
#ifndef QT_NO_MIMECLIPBOARD
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
- lst.append( d->m_imageURL);
+ lst.append( safeURL );
QApplication::clipboard()->setSelectionMode(true);
QApplication::clipboard()->setData( new KURLDrag( lst ) );
QApplication::clipboard()->setSelectionMode(false);
QApplication::clipboard()->setData( new KURLDrag( lst ) );
#else
- QApplication::clipboard()->setText(d->m_imageURL.url()); //FIXME(E): Handle multiple entries
+ QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}

void KHTMLPopupGUIClient::slotViewImage()
{
Index: khtml_part.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
retrieving revision 1.1046
diff -u -5 -d -p -r1.1046 khtml_part.cpp
--- khtml_part.cpp 7 Nov 2004 13:56:07 -0000 1.1046
+++ khtml_part.cpp 8 Nov 2004 05:29:27 -0000
@@ -5978,10 +5978,12 @@ void KHTMLPart::khtmlMouseMoveEvent( kht
// Text or image link...
u = completeURL( d->m_strSelectedURL );
pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
}

+ u.setPass(QString::null);
+
KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
if ( !d->m_referrer.isEmpty() )
urlDrag->metaData()["referrer"] = d->m_referrer;

if( img ) {
@@ -5996,11 +5998,11 @@ void KHTMLPart::khtmlMouseMoveEvent( kht
if ( !pix.isNull() )
drag->setPixmap( pix );

stopAutoScroll();
if(drag)
- drag->drag();
+ drag->drag();

// when we finish our drag, we need to undo our mouse press
d->m_bMousePressed = false;
d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
return;
@@ -6730,11 +6732,11 @@ void KHTMLPart::walletOpened(KWallet::Wa
}

d->m_wallet = wallet;
d->m_bWalletOpened = true;
connect(d->m_wallet, SIGNAL(walletClosed()), SLOT(slotWalletClosed()));
-
+
if (!d->m_statusBarWalletLabel) {
d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
d->m_statusBarWalletLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
d->m_statusBarWalletLabel->setUseCursor(false);