summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-02-17 03:31:00 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-02-17 03:31:00 +0000
commit1f0d82e30a76e7b698e006c0b23ef4ba43d716db (patch)
tree71740acf58d3dc2cadad8ebbfe1669f80226a1ea /kde-base/konqueror/files
parentSpring Cleaning (diff)
downloadhistorical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.tar.gz
historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.tar.bz2
historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.zip
Spring cleaning.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'kde-base/konqueror/files')
-rw-r--r--kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff49
-rw-r--r--kde-base/konqueror/files/konqueror-3.5.7-location.patch12
-rw-r--r--kde-base/konqueror/files/konqueror-4.0.0-linkage.patch38
3 files changed, 0 insertions, 99 deletions
diff --git a/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff b/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff
deleted file mode 100644
index 0d6e44ef4f82..000000000000
--- a/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- konqueror/konq_combo.cc
-+++ konqueror/konq_combo.cc
-@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
- "addToCombo(QString,QCString)", data);
- }
-+ // important security consideration: always display the beginning
-+ // of the url rather than its end to prevent spoofing attempts.
-+ lineEdit()->setCursorPosition( 0 );
- }
-
- void KonqCombo::setTemporary( const QString& text )
---- konqueror/konq_mainwindow.cc
-+++ konqueror/konq_mainwindow.cc
-@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
- }
- else // no known serviceType, use KonqRun
- {
-- if ( ( view && view == m_currentView ) ||
-- ( !view && !req.newTab ) ) // startup with argument
-+ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument
- {
- // Show it for now in the location bar, but we'll need to store it in the view
- // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called).
-- kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
-+ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl;
- setLocationBarURL( url );
- }
-
-@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
- if ( childView )
- {
- enableAllActions( true );
--
-- m_pViewManager->setActivePart( childView->part() );
- m_currentView = childView;
- }
- }
---- konqueror/konq_viewmgr.cc
-+++ konqueror/konq_viewmgr.cc
-@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
-
- void KonqViewManager::emitActivePartChanged()
- {
-+ // prevent unnecessary multiple calls to slotPartActivated:
-+ m_activePartChangedTimer->stop();
- m_pMainWindow->slotPartActivated( activePart() );
- }
-
diff --git a/kde-base/konqueror/files/konqueror-3.5.7-location.patch b/kde-base/konqueror/files/konqueror-3.5.7-location.patch
deleted file mode 100644
index 7061e6a1b940..000000000000
--- a/kde-base/konqueror/files/konqueror-3.5.7-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: konqueror/konq_combo.cc
-===================================================================
---- konqueror/konq_combo.cc (revision 643782)
-+++ konqueror/konq_combo.cc (working copy)
-@@ -158,6 +158,7 @@
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
- "addToCombo(QString,QCString)", data);
- }
-+ lineEdit()->setCursorPosition( 0 );
- }
-
- void KonqCombo::setTemporary( const QString& text )
diff --git a/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch b/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch
deleted file mode 100644
index e661ac7b335d..000000000000
--- a/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-SVN revision 758314
-Author: dfaure <dfaure@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
-Date: Mon Jan 7 15:54:16 2008 +0000
-
- doesn't need to link to libkonq anymore
-
-SVN revision 758304
-Author: dfaure <dfaure@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
-Date: Mon Jan 7 15:14:42 2008 +0000
-
- doesn't use libkonq anymore
-
-diff --git a/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt b/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt
-index ddbad19..64919ce 100644
---- a/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt
-+++ b/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt
-@@ -7,7 +7,7 @@ set(konq_shellcmdplugin_PART_SRCS kshellcmdexecutor.cpp kshellcmddialog.cpp kshe
- kde4_add_plugin(konq_shellcmdplugin ${konq_shellcmdplugin_PART_SRCS})
-
-
--target_link_libraries(konq_shellcmdplugin konq ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS})
-+target_link_libraries(konq_shellcmdplugin ${KDE4_KPARTS_LIBS} ${KDE4_KDESU_LIBS})
-
- install(TARGETS konq_shellcmdplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-diff --git a/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt b/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt
-index bb92516..160f1a2 100644
---- a/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt
-+++ b/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt
-@@ -6,7 +6,7 @@ set(konq_remoteencoding_PART_SRCS kremoteencodingplugin.cpp )
- kde4_add_plugin(konq_remoteencoding ${konq_remoteencoding_PART_SRCS})
-
-
--target_link_libraries(konq_remoteencoding ${KDE4_KDECORE_LIBS} konq )
-+target_link_libraries(konq_remoteencoding ${KDE4_KPARTS_LIBS} )
-
- install(TARGETS konq_remoteencoding DESTINATION ${PLUGIN_INSTALL_DIR} )
-