← Back to branch summary

~ubuntu-branches/ubuntu/lucid/transmission/lucid

« back to all changes in this revision

Viewing changes to daemon/daemon.c

  • Committer: Bazaar Package Importer
  • Author(s): Krzysztof Klimonda, Krzysztof Klimonda, Chris Coulson
  • Date: 2010-03-03 02:55:26 UTC
  • mfrom: (1.1.34 upstream) (2.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100303025526-qcjmpnlvk9jv3y5o
Tags: 1.92-0ubuntu1
https://launchpad.net/bugs/538034
https://launchpad.net/bugs/518692
https://launchpad.net/bugs/529037
https://launchpad.net/bugs/527299
https://launchpad.net/bugs/505861
https://launchpad.net/bugs/542194
[ Krzysztof Klimonda ]
* New upstream release (LP: #538034), rebased on debian testing.
  Remaining changes:
  - debian/control:
    + Added replaces & provides clutch (now included as part of transmission).
      Can be removed in lucid+1
    + Added liblaunchpad-integration-dev and lsb-release to Build-Depends
  - debian/rules:
    + create a po template during package build.
  - 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.
  - debian/transmission-daemon.default:
    - remove --auth from OPTIONS
  - debian/control, debian/rules:
    + build transmission gtk+ client with both gconf and libcanberra support.
  - debian/patches/dont_build_libevent.patch:
    + disable libevent in configure.ac and Makefile.am because we use autotools
      to regenerate build files.
  - lucid/debian/patches/updateminiupnpcstrings_double_escape_slash.patch:
    + Deleted as the bug is fixed upstream
* Fixes bugs:
  - Fix directory selection error in GTK+ 2.19 (LP: #518692)
  - Transmission "Set Location" - dialog doesn't disappear (LP: #529037)
  - The "Torrent Options" dialog's Torrent Priority row gets too much
    vertical stretch (LP: #527299)
  - "Open Folder" behavior can be confusing for single-file torrents
    (LP: #505861)
* Refreshed 99_autoreconf.patch

[ Chris Coulson ]
* debian/patches/disable_web_ui.patch:
  - Disable the web UI by default again (LP: #542194)

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/daemon.c
7
7
 * This exemption does not extend to derived works not owned by
8
8
 * the Transmission project.
9
9
 *
10
 
 * $Id: daemon.c 10228 2010-02-19 05:40:19Z charles $
 
10
 * $Id: daemon.c 10281 2010-02-24 18:14:40Z charles $
11
11
 */
12
12
 
13
13
#include <errno.h>
56
56
           "A fast and easy BitTorrent client\n"
57
57
           "\n"
58
58
           MY_NAME " is a headless Transmission session\n"
59
 
           "that can be controlled via transmission-remote or Clutch.\n"
 
59
           "that can be controlled via transmission-remote\n"
 
60
           "or the web interface.\n"
60
61
           "\n"
61
62
           "Usage: " MY_NAME " [options]";
62
63
}
118
119
            const char * configDir = tr_sessionGetConfigDir( mySession );
119
120
            tr_inf( "Reloading settings from \"%s\"", configDir );
120
121
            tr_bencInitDict( &settings, 0 );
 
122
            tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_ENABLED, TRUE );
121
123
            tr_sessionLoadSettings( &settings, configDir, MY_NAME );
122
124
            tr_sessionSet( mySession, &settings );
123
125
            tr_bencFree( &settings );
462
464
        pumpLogMessages( logfile );
463
465
    }
464
466
 
465
 
    closelog( );
466
 
 
467
467
    /* shutdown */
468
468
#if HAVE_SYSLOG
469
469
    if( !foreground )
 
470
    {
470
471
        syslog( LOG_INFO, "%s", "Closing session" );
 
472
        closelog( );
 
473
    }
471
474
#endif
 
475
 
472
476
    printf( "Closing transmission session..." );
473
477
    tr_sessionSaveSettings( mySession, configDir, &settings );
474
478
    dtr_watchdir_free( watchdir );