rpm/ktorrent
SHA256
1
0
Fork 0
forked from pool/ktorrent
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=22

Browse Source
This commit is contained in:
OBS User unknown
2008-02-19 13:12:27 +00:00
committed by Git OBS Bridge
parent 9ae2c98fcf
commit 897dfacfc6
9 changed files with 140 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build-kde-3.4.diff
View File

@@ -1,22 +0,0 @@
--- apps/ktorrent/trayhoverpopup.cpp 2007/08/19 14:30:01 1.1
+++ apps/ktorrent/trayhoverpopup.cpp 2007/08/19 14:30:29
@@ -29,7 +29,7 @@
using namespace bt;
TrayHoverPopup::TrayHoverPopup(const QPixmap & pix,QWidget *parent, const char *name )
- : KPassivePopup(KPassivePopup::Boxed,parent,name),pix(pix)
+ : KPassivePopup(parent,name),pix(pix)
{
setTimeout(0);
setAutoDelete(false);
--- apps/ktorrent/trayicon.cpp 2007/08/19 14:43:47 1.1
+++ apps/ktorrent/trayicon.cpp 2007/08/19 14:43:58
@@ -124,7 +124,7 @@
void TrayIcon::showPassivePopup(const QString & msg,const QString & title)
{
- KPassivePopup* p = KPassivePopup::message(KPassivePopup::Boxed,title,msg,m_kt_pix, this);
+ KPassivePopup* p = KPassivePopup::message(title,msg,m_kt_pix, this);
p->setPalette(QToolTip::palette());
p->setLineWidth(1);
}

166
disable-DHT.diff
View File

@@ -1,166 +0,0 @@
--- apps/ktorrent/ktorrent.cpp
+++ apps/ktorrent/ktorrent.cpp 2006/05/23 15:57:30
@@ -320,6 +320,7 @@
//update QM
m_core->getQueueManager()->orderQueue();
+#if 0
dht::DHTBase & ht = Globals::instance().getDHT();
if (Settings::dhtSupport() && !ht.isRunning())
{
@@ -335,6 +336,7 @@
ht.stop();
ht.start(KGlobal::dirs()->saveLocation("data","ktorrent") + "dht_table",Settings::dhtPort());
}
+#endif
if (Settings::useEncryption())
{
--- libktorrent/ktorrent.kcfg
+++ libktorrent/ktorrent.kcfg 2006/05/23 15:31:53
@@ -79,16 +79,6 @@
<label>GUI update interval</label>
<default>0</default>
</entry>
- <entry name="dhtSupport" type="Bool">
- <label>Support for DHT</label>
- <default>false</default>
- </entry>
- <entry name="dhtPort" type="Int">
- <label>DHT port</label>
- <default>6881</default>
- <min>0</min>
- <max>65535</max>
- </entry>
<entry name="numUploadSlots" type="Int">
<label>Number of upload slots</label>
<default>4</default>
--- apps/ktorrent/pref.cpp 2007/06/18 11:48:38 1.1
+++ apps/ktorrent/pref.cpp 2007/06/18 11:50:55
@@ -173,14 +173,14 @@
Settings::setNumUploadSlots(dp->num_upload_slots->value());
Settings::setMinDiskSpace(dp->intMinDiskSpace->value());
Settings::setMaxSeedTime(dp->max_seed_time->value());
-
+#if 0
if (Settings::dhtSupport() && dp->udp_tracker_port->value() == Settings::dhtPort())
{
QString msg = i18n("The DHT port needs to be different from the UDP tracker port!");
KMessageBox::error(0, msg, i18n("Error"));
return false;
}
-
+#endif
Settings::setUdpTrackerPort(dp->udp_tracker_port->value());
return true;
@@ -228,8 +228,10 @@
updateData();
connect(gp->custom_ip_check, SIGNAL(toggled(bool)),
this, SLOT(customIPChecked(bool)));
+#if 0
connect(gp->use_dht, SIGNAL(toggled(bool)),
this, SLOT(dhtChecked(bool)));
+#endif
connect(gp->use_encryption, SIGNAL(toggled(bool)),
this, SLOT(useEncryptionChecked(bool)));
}
@@ -289,6 +291,7 @@
+#if 0
if (gp->use_dht->isChecked() && gp->dht_port->value() == Settings::udpTrackerPort())
{
QString msg = i18n("The DHT port needs to be different from the UDP tracker port!");
@@ -299,6 +302,7 @@
Settings::setDhtSupport(gp->use_dht->isChecked());
Settings::setDhtPort(gp->dht_port->value());
+#endif
Settings::setUseEncryption(gp->use_encryption->isChecked());
Settings::setAllowUnencryptedConnections(gp->allow_unencrypted->isChecked());
return true;
@@ -322,8 +326,10 @@
void GeneralPrefPage::dhtChecked(bool on)
{
+#if 0
gp->dht_port->setEnabled(on);
gp->dht_port_label->setEnabled(on);
+#endif
}
void GeneralPrefPage::updateData()
@@ -388,12 +394,12 @@
gp->custom_ip_check->setChecked(useExternalIP);
gp->custom_ip->setEnabled(useExternalIP);
gp->custom_ip_label->setEnabled(useExternalIP);
-
+#if 0
gp->use_dht->setChecked(Settings::dhtSupport());
gp->dht_port->setValue(Settings::dhtPort());
gp->dht_port->setEnabled(Settings::dhtSupport());
gp->dht_port_label->setEnabled(Settings::dhtSupport());
-
+#endif
gp->use_encryption->setChecked(Settings::useEncryption());
gp->allow_unencrypted->setChecked(Settings::allowUnencryptedConnections());
gp->allow_unencrypted->setEnabled(Settings::useEncryption());
--- apps/ktorrent/pref.cpp 2007/10/11 12:04:22 1.9
+++ apps/ktorrent/pref.cpp 2007/10/11 12:14:09
@@ -228,6 +228,7 @@
updateData();
connect(gp->custom_ip_check, SIGNAL(toggled(bool)),
this, SLOT(customIPChecked(bool)));
+ gp->groupBox4->setShown(false);
#if 0
connect(gp->use_dht, SIGNAL(toggled(bool)),
this, SLOT(dhtChecked(bool)));
--- plugins/webinterface/php_interface.cpp 2008/01/27 17:09:20 1.1
+++ plugins/webinterface/php_interface.cpp 2008/01/27 17:10:36
@@ -174,7 +174,7 @@
out << QString("\"max_upload_speed\" => \"%1\",").arg(core->getMaxUploadSpeed());
out << QString("\"max_downloads\" => \"%1\",").arg(Settings::maxDownloads());
out << QString("\"max_seeds\"=> \"%1\",").arg(Settings::maxSeeds());
- out << QString("\"dht_support\" => \"%1\",").arg(Settings::dhtSupport());
+ out << QString("\"dht_support\" => \"%1\",").arg(false);
out << QString("\"use_encryption\" => \"%1\"").arg(Settings::useEncryption());
out << ");\n}\n";
}
@@ -208,35 +208,6 @@
switch(it.key()[0])
{
case 'd':
- if(it.key()=="dht")
- {
- if(it.data()=="start")
- {
- Settings::setDhtSupport(true);
- }
- else
- {
- Settings::setDhtSupport(false);
- }
-
- dht::DHTBase & ht = Globals::instance().getDHT();
- if (Settings::dhtSupport() && !ht.isRunning())
- {
- ht.start(kt::DataDir() + "dht_table",kt::DataDir() + "dht_key",Settings::dhtPort());
- ret = true;
- }
- else if (!Settings::dhtSupport() && ht.isRunning())
- {
- ht.stop();
- ret = true;
- }
- else if (Settings::dhtSupport() && ht.getPort() != Settings::dhtPort())
- {
- ht.stop();
- ht.start(kt::DataDir() + "dht_table",kt::DataDir() + "dht_key",Settings::dhtPort());
- ret = true;
- }
- }
break;
case 'e':
if(it.key()=="encription")

3
ktorrent-2.2.5.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d4e05b03ac6b58fe7cba452276c3e038e52b415828e5846224f7bf2aea36be6
size 2593138

3
ktorrent-3.0.0.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:41f9aa9289a27ddfa15442dbcc2158c86aaa6dcb338d08835cb2da1fc41422b4
size 1917047

19
ktorrent-fix-columns.diff
View File

@@ -1,19 +0,0 @@
2005-12-15 Danny Kukawka <danny.kukawka@web.de>
* plugins/infowidget/infowidgetbase.ui,
plugins/infowidget/peerview.cppi,
plugins/infowidget/chunkdownloadview.cpp: Added focus to
all collums in the ListView objects.
Index: plugins/infowidget/peerview.cpp
===================================================================
--- plugins/infowidget/peerview.cpp (Revision 483953)
+++ plugins/infowidget/peerview.cpp (Arbeitskopie)
@@ -89,6 +89,7 @@
addColumn(i18n("Snubbed"));
addColumn(i18n("Availability"));
setShowSortIndicator(true);
+ setAllColumnsShowFocus(true);
menu = new KPopupMenu(this);
ban_id = menu->insertItem(KGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup), i18n("to ban", "Ban Peer"));

5
ktorrent.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 19 14:00:11 CET 2008 - stbinner@suse.de
- update to 3.0, the first KDE4-based release
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 27 18:11:51 CET 2008 - stbinner@suse.de Sun Jan 27 18:11:51 CET 2008 - stbinner@suse.de

138
ktorrent.spec
View File

@@ -1,5 +1,5 @@
# #
# spec file for package ktorrent (Version 2.2.5) # spec file for package ktorrent (Version 3.0.0)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@@ -10,8 +10,9 @@
# norootforbuild # norootforbuild
Name: ktorrent Name: ktorrent
BuildRequires: gmp-devel kdelibs3-devel BuildRequires: gmp-devel kdebase4-workspace-devel libqca2-devel
%if %suse_version > 1020 %if %suse_version > 1020
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
@@ -19,16 +20,13 @@ Url: http://ktorrent.pwsp.net/
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/Networking/File-Sharing Group: Productivity/Networking/File-Sharing
Summary: KDE BitTorrent Client Summary: KDE BitTorrent Client
Version: 2.2.5 Version: 3.0.0
Release: 1 Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rversion %version %define rversion %version
Source: %{name}-%{rversion}.tar.bz2 Source: %{name}-%{rversion}.tar.bz2
Patch2: remove-links.diff Patch2: remove-links.diff
Patch4: no-geoip-db.diff Patch4: no-geoip-db.diff
Patch10: ktorrent-fix-columns.diff
Patch16: disable-DHT.diff
Patch18: build-kde-3.4.diff
%if %suse_version > 1020 %if %suse_version > 1020
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
%endif %endif
@@ -46,80 +44,112 @@ Torrent is a BitTorrent program for KDE. Its main features are: *
Authors:
--------
Jois Guisson <jrois.guisson@gmail.com>
%package devel
Group: Productivity/Networking/File-Sharing
Summary: KDE BitTorrent Client Build Environment
Requires: ktorrent = %{version}
%description devel
This packages include the necessary files to build KTorrent plugins.
Authors: Authors:
-------- --------
Jois Guisson <jrois.guisson@gmail.com> Jois Guisson <jrois.guisson@gmail.com>
%lang_package %lang_package
%prep %prep
%setup -q -n %{name}-%{rversion} %setup -q -n %{name}-%{version}
%patch2 -p1 %patch2
%patch4 -p1 %patch4
%patch10
%patch16
%if %suse_version < 1010
%patch18
%endif
. /etc/opt/kde3/common_options
update_admin
%build %build
%if %suse_version > 1000 %cmake_kde4 -d build -- -DENABLE_DHT_SUPPORT=false
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector" %make_jobs
%endif
. /etc/opt/kde3/common_options
./configure $configkde
do_make %{?jobs:-j %jobs}
%install %install
. /etc/opt/kde3/common_options cd build
make DESTDIR=$RPM_BUILD_ROOT install %makeinstall
%suse_update_desktop_file %name Network FileTransfer %if %suse_version > 1020
%if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT
%fdupes -s $RPM_BUILD_ROOT %endif
%endif %kde_post_install
kde_post_install %find_lang %name
%find_lang %name
%pre %pre
%run_ldconfig %run_ldconfig
%post %post
%run_ldconfig %run_ldconfig
%postun
%run_ldconfig
%if %suse_version > 1020 %if %suse_version > 1020
%files lang -f %name.lang %files lang -f build/%name.lang
%files %files
%else %else
%files -f %name.lang %files -f build/%name.lang
%endif %endif
%defattr(-,root,root) %defattr(-,root,root)
%dir /opt/kde3/share/icons/hicolor/16x16 /usr/bin/ktorrent
%dir /opt/kde3/share/icons/hicolor/32x32 /usr/bin/ktupnptest
%dir /opt/kde3/share/icons/hicolor/128x128 /usr/lib/kde4/ktbwschedulerplugin.so
%dir /opt/kde3/share/icons/hicolor/128x128/apps /usr/lib/kde4/ktinfowidgetplugin.so
%dir /opt/kde3/share/icons/hicolor/16x16/apps /usr/lib/kde4/ktipfilterplugin.so
%dir /opt/kde3/share/icons/hicolor/32x32/apps /usr/lib/kde4/ktlogviewerplugin.so
%dir /opt/kde3/share/icons/hicolor/48x48 /usr/lib/kde4/ktscanfolderplugin.so
%dir /opt/kde3/share/icons/hicolor/48x48/apps /usr/lib/kde4/ktsearchplugin.so
%dir /opt/kde3/share/icons/hicolor/64x64 /usr/lib/kde4/ktstatsplugin.so
%dir /opt/kde3/share/icons/hicolor/64x64/apps /usr/lib/kde4/ktupnpplugin.so
%dir /opt/kde3/share/icons/hicolor/scalable /usr/lib/kde4/ktwebinterfaceplugin.so
%dir /opt/kde3/share/icons/hicolor/scalable/apps /usr/lib/libbtcore.so.*
/opt/kde3/bin/* /usr/lib/libktcore.so.*
/opt/kde3/share/icons/*/*/*/* /usr/lib/libktupnp.so.*
/opt/kde3/share/appl*/*/*.desktop /usr/share/applications/kde4/ktorrent.desktop
/opt/kde3/share/apps/* /usr/share/icons/hicolor/*/apps/ktorrent.*
/opt/kde3/%_lib/kde3/* /usr/share/icons/hicolor/*/mimetypes/torrent.*
/opt/kde3/%_lib/libktorrent.* /usr/share/icons/hicolor/*/actions/ktencrypted.*
/opt/kde3/%_lib/libktorrent-%{version}.so /usr/share/icons/hicolor/*/actions/ktremove.*
/opt/kde3/share/config.kcfg/*.kcfg /usr/share/icons/hicolor/*/actions/ktstart.*
/opt/kde3/share/services/*.desktop /usr/share/icons/hicolor/*/actions/ktstart_all.*
/opt/kde3/share/servicetypes/*.desktop /usr/share/icons/hicolor/*/actions/ktstop.*
/usr/share/icons/hicolor/*/actions/ktstop_all.*
/usr/share/icons/hicolor/*/actions/ktplugins.*
/usr/share/icons/hicolor/*/actions/ktinfowidget.*
/usr/share/icons/hicolor/*/actions/ktqueuemanager.*
/usr/share/icons/hicolor/*/actions/ktupnp.*
/usr/share/icons/hicolor/*/places/ktprefdownloads.*
/usr/share/kde4/apps/cmake/modules/FindBTCore.cmake
/usr/share/kde4/apps/ktorrent
/usr/share/kde4/services/ktbwschedulerplugin.desktop
/usr/share/kde4/services/ktinfowidgetplugin.desktop
/usr/share/kde4/services/ktipfilterplugin.desktop
/usr/share/kde4/services/ktlogviewerplugin.desktop
/usr/share/kde4/services/ktscanfolderplugin.desktop
/usr/share/kde4/services/ktsearchplugin.desktop
/usr/share/kde4/services/ktstatsplugin.desktop
/usr/share/kde4/services/ktupnpplugin.desktop
/usr/share/kde4/services/ktwebinterfaceplugin.desktop
/usr/share/kde4/servicetypes/ktorrentplugin.desktop
%files devel
%defattr(-,root,root)
/usr/lib/libbtcore.so
/usr/lib/libktcore.so
/usr/lib/libktupnp.so
/usr/include/libbtcore
%changelog %changelog
* Tue Feb 19 2008 stbinner@suse.de
- update to 3.0, the first KDE4-based release
* Sun Jan 27 2008 stbinner@suse.de * Sun Jan 27 2008 stbinner@suse.de
- update to 2.2.5, several minor bug fixes - update to 2.2.5, several minor bug fixes
* Thu Nov 22 2007 stbinner@suse.de * Thu Nov 22 2007 stbinner@suse.de

53
no-geoip-db.diff
View File

@@ -1,37 +1,34 @@
diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am ktorrent-2.1beta1/plugins/infowidget/Makefile.am --- plugins/infowidget/peerview.cpp 2008/02/19 10:53:21 1.1
--- ktorrent-2.1beta1.orig/plugins/infowidget/Makefile.am 2006-11-25 13:49:50.000000000 +0100 +++ plugins/infowidget/peerview.cpp 2008/02/19 10:54:10
+++ ktorrent-2.1beta1/plugins/infowidget/Makefile.am 2006-11-25 14:13:45.000000000 +0100 @@ -45,7 +45,7 @@
@@ -27,8 +27,4 @@ static bool icons_loaded = false;
kde_services_DATA = ktinfowidgetplugin.desktop static GeoIP* geo_ip = 0;
kde_kcfg_DATA = ktinfowidgetplugin.kcfg
-
-ktdatadir = $(kde_datadir)/ktorrent/geoip
-
-SUBDIRS = geoip
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff -u -r ktorrent-2.1beta1.orig/plugins/infowidget/peerview.cpp ktorrent-2.1beta1/plugins/infowidget/peerview.cpp
--- ktorrent/plugins/infowidget/peerview.cpp 2007/07/04 09:15:48 1.1
+++ ktorrent/plugins/infowidget/peerview.cpp 2007/07/04 09:17:59
@@ -53,7 +53,7 @@
static QPixmap lock_pix;
static FlagDB flagDB(22, 18); static FlagDB flagDB(22, 18);
static bool yes_no_pix_loaded = false;
- static bool geoip_db_exists = true; - static bool geoip_db_exists = true;
+ static bool geoip_db_exists = false; + static bool geoip_db_exists = false;
static QString geoip_data_file; static QString geoip_data_file;
PeerViewItem::PeerViewItem(PeerView* pv,kt::PeerInterface* peer) : KListViewItem(pv),peer(peer) PeerViewItem::PeerViewItem(PeerView* pv,PeerInterface* peer) : QTreeWidgetItem(pv,QTreeWidgetItem::UserType),peer(peer)
@@ -67,10 +67,10 @@ @@ -57,10 +57,9 @@
yes_pix = iload->loadIcon("button_ok",KIcon::Small); icons_loaded = true;
no_pix = iload->loadIcon("button_cancel",KIcon::Small); flagDB.addFlagSource("data", QString("ktorrent/%1.png"));
lock_pix = iload->loadIcon("ktencrypted",KIcon::Small); flagDB.addFlagSource("locale", QString("l10n/%1/flag.png"));
-#ifdef USE_SYSTEM_GEOIP -#ifdef USE_SYSTEM_GEOIP
+#if 0 +#if 0
geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
geoip_db_exists = (geo_ip != NULL); geoip_db_exists = (geo_ip != NULL);
-#else -#else
+ geoip_db_exists = !KStandardDirs::locate("data", "ktorrent/geoip.dat").isNull();
geoip_db_exists = !locate("data", "ktorrent/geoip/geoip.dat").isNull(); if(geoip_db_exists)
if(geoip_db_exists) { {
geoip_data_file = "ktorrent/geoip/geoip.dat"; --- plugins/infowidget/CMakeLists.txt 2008/02/19 10:52:14 1.1
+++ plugins/infowidget/CMakeLists.txt 2008/02/19 10:55:36
@@ -25,8 +25,6 @@
set(geoip_src GeoIP.c)
endif(WITH_SYSTEM_GEOIP)
-add_subdirectory(geoip)
-
set(ktinfowidgetplugin_SRC
infowidgetplugin.cpp
iwprefpage.cpp

51
remove-links.diff
View File

@@ -1,7 +1,24 @@
diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp ktorrent-2.1beta1/plugins/search/searchenginelist.cpp --- plugins/search/searchprefpage.cpp 2008/02/19 10:41:08 1.1
--- ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp 2006-11-25 13:49:50.000000000 +0100 +++ plugins/search/searchprefpage.cpp 2008/02/19 10:49:33
+++ ktorrent-2.1beta1/plugins/search/searchenginelist.cpp 2006-11-25 13:54:01.000000000 +0100 @@ -180,6 +180,7 @@
@@ -106,6 +106,7 @@ {
newItem( "KTorrents", KUrl("http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0"));
newItem( "bittorrent.com", KUrl("http://search.bittorrent.com/search.jsp?query=FOOBAR"));
+#if 0
newItem( "isohunt.com", KUrl("http://isohunt.com/torrents.php?ihq=FOOBAR&op=and"));
newItem( "mininova.org", KUrl("http://www.mininova.org/search.php?search=FOOBAR"));
newItem( "thepiratebay.org", KUrl("http://thepiratebay.org/search.php?q=FOOBAR"));
@@ -187,6 +188,7 @@
newItem( "bytenova.org", KUrl("http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8"));
newItem( "torrentspy.com", KUrl("http://torrentspy.com/search.asp?query=FOOBAR"));
newItem( "torrentz.com", KUrl("http://www.torrentz.com/search_FOOBAR"));
+#endif
saveSearchEngines();
}
--- plugins/search/searchenginelist.cpp 2008/02/19 10:41:08 1.1
+++ plugins/search/searchenginelist.cpp 2008/02/19 10:41:08
@@ -100,6 +100,7 @@
out << "# SEARCH ENGINES list" << ::endl; out << "# SEARCH ENGINES list" << ::endl;
out << "KTorrents http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0" << ::endl; out << "KTorrents http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0" << ::endl;
out << "bittorrent.com http://www.bittorrent.com/search_result.myt?search=FOOBAR" << ::endl; out << "bittorrent.com http://www.bittorrent.com/search_result.myt?search=FOOBAR" << ::endl;
@@ -9,33 +26,11 @@ diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchenginelist.cpp ktorrent-2
out << "isohunt.com http://isohunt.com/torrents.php?ihq=FOOBAR&op=and" << ::endl; out << "isohunt.com http://isohunt.com/torrents.php?ihq=FOOBAR&op=and" << ::endl;
out << "mininova.org http://www.mininova.org/search.php?search=FOOBAR" << ::endl; out << "mininova.org http://www.mininova.org/search.php?search=FOOBAR" << ::endl;
out << "thepiratebay.org http://thepiratebay.org/search.php?q=FOOBAR" << ::endl; out << "thepiratebay.org http://thepiratebay.org/search.php?q=FOOBAR" << ::endl;
@@ -113,6 +114,7 @@ @@ -107,6 +108,7 @@
out << "bytenova.org http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8" << ::endl; out << "bytenova.org http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8" << ::endl;
out << "torrentspy.com http://torrentspy.com/search.asp?query=FOOBAR" << ::endl; out << "torrentspy.com http://torrentspy.com/search.asp?query=FOOBAR" << ::endl;
out << "torrentz.com http://www.torrentz.com/search_FOOBAR" << ::endl; out << "torrentz.com http://www.torrentz.com/search_FOOBAR" << ::endl;
+#endif +#endif
} }
KURL SearchEngineList::getSearchURL(bt::Uint32 engine) const KUrl SearchEngineList::getSearchURL(bt::Uint32 engine) const
Only in ktorrent-2.1beta1/plugins/search: searchenginelist.cpp~
diff -r -u ktorrent-2.1beta1.orig/plugins/search/searchprefpage.cpp ktorrent-2.1beta1/plugins/search/searchprefpage.cpp
--- ktorrent-2.1beta1.orig/plugins/search/searchprefpage.cpp 2006-11-25 13:49:50.000000000 +0100
+++ ktorrent-2.1beta1/plugins/search/searchprefpage.cpp 2006-11-25 13:53:18.000000000 +0100
@@ -153,7 +153,7 @@
QListViewItem* se = new QListViewItem(m_engines, "KTorrents", "http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0");
se = new QListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR");
-
+#if 0
se = new QListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and");
se = new QListViewItem(m_engines, "mininova.org", "http://www.mininova.org/search.php?search=FOOBAR");
@@ -167,6 +167,7 @@
se = new QListViewItem(m_engines, "torrentspy.com", "http://torrentspy.com/search.asp?query=FOOBAR");
se = new QListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR");
+#endif
}
void SearchPrefPageWidget::removeAllClicked()
Only in ktorrent-2.1beta1/plugins/search: searchprefpage.cpp~