← Back to branch summary

~ubuntu-branches/ubuntu/karmic/transmission/karmic

« back to all changes in this revision

Viewing changes to qt/torrent.cc

  • Committer: Bazaar Package Importer
  • Author(s): Hew McLachlan, Hew McLachlan, Krzysztof Klimonda
  • Date: 2009-06-12 22:41:35 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20090612224135-t0q5q83h2pr5pa8d
Tags: 1.71-1ubuntu1
https://launchpad.net/bugs/384215
https://launchpad.net/bugs/317576
https://launchpad.net/bugs/359319
[ Hew McLachlan ]
* Merge from debian unstable (LP: #384215), remaining changes:
  - debian/control:
    + Added replaces & provides clutch (now included as part of transmission).
    + add quilt, liblaunchpad-integration and libtool to Build-Depends
  - debian/rules:
    + Create a PO template during package build.
    + re-enable quilt
    + run autoreconf for launchpad-integration
  - debian/patches/01_lpi.patch:
    + Integrate Transmission with Launchpad
  - debian/patches/20_add_X-Ubuntu-Gettext-Domain.diff:
    + Add X-Ubuntu-Gettext-Domain to .desktop file.
* Closes Launchpad bugs:
  - debian/transmission-daemon.default: comment typo (LP: #317576)
  - transmission crashed with SIGSEGV in g_main_context_dispatch() (LP: #359319)

[ Krzysztof Klimonda ]
  - Rename launchpad_integration.patch to 01_lpi.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/torrent.cc
7
7
 * This exemption does not extend to derived works not owned by
8
8
 * the Transmission project.
9
9
 *
10
 
 * $Id:$
 
10
 * $Id: torrent.cc 8570 2009-05-31 19:33:48Z charles $
11
11
 */
12
12
 
13
13
#include <cassert>
340
340
            break;
341
341
 
342
342
        case TR_RATIOLIMIT_GLOBAL:
343
 
            if(( isLimited = myPrefs.getBool( Prefs :: SEED_RATIO_LIMITED )))
344
 
                ratio = myPrefs.getDouble( Prefs :: SEED_RATIO_LIMIT );
 
343
            if(( isLimited = myPrefs.getBool( Prefs :: RATIO_ENABLED )))
 
344
                ratio = myPrefs.getDouble( Prefs :: RATIO );
345
345
            break;
346
346
 
347
347
        case TR_RATIOLIMIT_UNLIMITED: