Commit 9ed8165a authored by Cristian Greco's avatar Cristian Greco

Imported Upstream version 2.4.11

parent fd5f8297
* Sun Nov 21 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.11
- BUGFIX: Do not report a progress of 100% in the Web UI unless the
torrent is really complete (closes #674349)
- BUGFIX: Fix possible incorrect behavior with queueing
- BUGFIX: Fix RSS refresh interval saving
- BUGFIX: Fix possible crash when setting RSS proxy (closes #676288)
- BUGFIX: Fix HTTP redirect issue that would cause the torrent addition to
show up for automated RSS downloads (Closes #677565)
* Wed Nov 10 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.10
- BUGFIX: Fix possible crash when selecting a RSS item (really closes #575624)
- BUGFIX: Improved IPv6 support (IP filter and Peer list)
......
[Desktop Entry]
Categories=Qt;Network;P2P;
Comment=V2.4.10
Comment=V2.4.11
Exec=qbittorrent %f
GenericName=Bittorrent client
GenericName[ar]=العميل Bittorrent
......
......@@ -47,7 +47,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>2.4.10</string>
<string>2.4.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleExecutable</key>
......
......@@ -2281,7 +2281,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
else if (file_error_alert* p = dynamic_cast<file_error_alert*>(a.get())) {
QTorrentHandle h(p->handle);
if(h.is_valid()) {
h.auto_managed(false);
h.pause();
std::cerr << "File Error: " << p->message().c_str() << std::endl;
addConsoleMessage(tr("An I/O error occured, '%1' paused.").arg(h.name()));
addConsoleMessage(tr("Reason: %1").arg(misc::toQString(p->message())));
......
......@@ -73,8 +73,12 @@ void CookiesDlg::on_del_btn_clicked() {
QList<QByteArray> CookiesDlg::getCookies() const {
QList<QByteArray> ret;
for(int i=0; i<ui->cookiesTable->rowCount(); ++i) {
QString key = ui->cookiesTable->item(i, COOKIE_KEY)->text().trimmed();
QString value = ui->cookiesTable->item(i, COOKIE_VALUE)->text().trimmed();
QString key;
if(ui->cookiesTable->item(i, COOKIE_KEY))
key = ui->cookiesTable->item(i, COOKIE_KEY)->text().trimmed();
QString value;
if(ui->cookiesTable->item(i, COOKIE_VALUE))
value = ui->cookiesTable->item(i, COOKIE_VALUE)->text().trimmed();
if(!key.isEmpty() && !value.isEmpty()) {
const QString raw_cookie = key+"="+value;
qDebug("Cookie: %s", qPrintable(raw_cookie));
......
......@@ -51,7 +51,7 @@ downloadThread::downloadThread(QObject* parent) : QObject(parent) {
}
void downloadThread::processDlFinished(QNetworkReply* reply) {
QString url = reply->url().toEncoded().data();
QString url = reply->url().toString();
qDebug("Download finished: %s", qPrintable(url));
if(reply->error() != QNetworkReply::NoError) {
// Failure
......
......@@ -3,11 +3,12 @@
#include <QFileSystemWatcher>
#include <QDir>
#ifndef Q_WS_WIN
#include <QTimer>
#include <QPointer>
#include <QStringList>
#include <QTimer>
#include <QHash>
#ifndef Q_WS_WIN
#include <QSet>
#include <iostream>
#include <errno.h>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -652,5 +652,5 @@ RSSImp::~RSSImp(){
void RSSImp::on_settingsButton_clicked() {
RssSettings rssSettingsDlg(this);
if(rssSettingsDlg.exec())
updateRefreshInterval(Preferences::getRefreshInterval());
updateRefreshInterval(Preferences::getRSSRefreshInterval());
}
......@@ -31,6 +31,8 @@
#ifndef SESSIONAPPLICATION_H
#define SESSIONAPPLICATION_H
#include <QtCore/QtGlobal>
#ifdef Q_WS_MAC
#include "qmacapplication.h"
#else
......
......@@ -12,13 +12,13 @@ CONFIG += qt \
# Update this VERSION for each release
os2 {
DEFINES += VERSION=\'\"v2.4.10\"\'
DEFINES += VERSION=\'\"v2.4.11\"\'
} else {
DEFINES += VERSION=\\\"v2.4.10\\\"
DEFINES += VERSION=\\\"v2.4.11\\\"
}
DEFINES += VERSION_MAJOR=2
DEFINES += VERSION_MINOR=4
DEFINES += VERSION_BUGFIX=10
DEFINES += VERSION_BUGFIX=11
# NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
DEFINES += VERSION_TYPE=NORMAL
......
......@@ -104,9 +104,6 @@
<property name="text">
<string>Announce urls (trackers):</string>
</property>
<property name="buddy">
<cstring></cstring>
</property>
</widget>
</item>
<item>
......@@ -139,9 +136,6 @@
<property name="text">
<string>Comment (optional):</string>
</property>
<property name="buddy">
<cstring>txt_comment</cstring>
</property>
</widget>
</item>
</layout>
......
......@@ -259,6 +259,8 @@ window.addEvent('load', function(){
row[2] = event.priority
row[3] = event.size;
row[4] = (event.progress*100).round(1);
if(row[4] == 100.0 && event.progress != 1.0)
row[4] = 99.9;
row[5] = event.num_seeds;
row[6] = event.num_leechs;
row[7] = event.dlspeed;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment