Changeset 11551


Ignore:
Timestamp:
Dec 20, 2010, 12:19:59 PM (11 years ago)
Author:
charles
Message:

(2.0x) backport #3837, #3838, #3834, #3719, #3826 to the 2.0x branch

Location:
branches/2.0x
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0x/NEWS

    r11487 r11551  
     1=== Transmission 2.05 (xxxx/yy/zz) ===
     2Backport of bugfixes for a maintenance 2.0x release.
     3==== All Platforms ====
     4  * backport r11530 + r11531 from #3826 "don't use pread() or pwrite() on uClibc"
     5==== GTK+ ====
     6  * backport r11547 from #3837 "Dangling pointer after quit cancel"
     7  * backport r11546 from #3838 "Unselected active torrents not counted for quit check"
     8  * backport r11545 from #3834 "'Origin' field in Torrent Properties dialog should be ellipsized"
     9  * backport r11511 from #3719 "handle API changes to libnotify"
     10
    111=== Transmission 2.05 (2010/12/05) ===
    2 Backport of 2.1x bugfixes for a maintenance 2.0x release.
    3   * (2.0x) backport r11302 for #3620 "syntax error in configure.ac"
    4   * (2.0x) backport r11383 for #3715 "README file is outdated"
    5   * (2.0x cli) #3758: Syntax error in transmission-cli.1
    6   * (2.0x daemon) #3508: --download-dir does not work properly
    7   * (2.0x miniupnp) backport r11381 for #3707 "Remove dependancy to which."
    8   * (2.0x qt) backport r11222 for #3496 "Crash when changing to/from compact mode"
    9   * (2.0x qt) backport r11306 for #3627 "off-by-one in FileTreeView causes potential invalid memory read / crash"
    10   * (2.0x qt) backport r11340 for #3650 "Link transmission-qt with libz explicitly"
    11   * (2.0x qt) backport r11289 for #3593 "rpc authentication setting broken in qt client"
    12   * (2.0x gtk) backport r10915 for #3380 "Increase size of 'Add URL' text field."
    13   * (2.0x gtk) backport r11217 for #3529 "Slow priority-sorting in filelist"
    14   * (2.0x gtk) backport r11267 for #3585 "possible rendering issue in torrent_cell_renderer_get_size()"
    15   * (2.0x gtk) backport r11259 for #3619 "memory leak that may cause events to be fired to invalid listeners"
    16   * (2.0x gtk) backport r11344 for #3639 "Hibernation inhibition broke in transmission-gtk 2.00"
    17   * (2.0x gtk) backport r11439 for #3701 "Un-blur statusbar icons"
    18   * (2.0x gtk) backport r11443 for #3777 "Ellipsize Error: line"
    19   * (2.0x libT) backport r11449 for #3787 "'No Announce Scheduled' tracker error"
    20   * (2.0x libT) backport r11264 for #3453 "Torrent does not stop when set per torrent seed ratio is reached before torrent is completed"
    21   * (2.0x libT) backport r11226 for #3566 "Memory leak in libtransmission/torrent.c: refreshCurrentDir()"
    22   * (2.0x libT) backport r11243 for #3571 "Torrent done script clears important env vars."
    23   * (2.0x libT) backport r11295 for #3610 "Unused fields in tr_peer"
    24   * (2.0x libT) backport r11304 for #3628 "remove dead variable pieceBytesRead from libtransmission/verify.c"
    25   * (2.0x libT) backport r11357 for #3681 "tr-lpd.c's lpd_configureSocket() function is redundant"
    26   * (2.0x libT) backport r11237 for #3539 "Transmission sending corrupt data in metadata exchange"
    27   * (2.0x libT) backport r11300 for #3614 "Can't save benc files under uClibc 0.9.31"
    28   * (2.0x libT) backport r11356 for #3678 "benc walking could be more efficient"
    29   * (2.0x libT) backport r11359 for #3687 "The V=XXXX key/val pair in our DHT messages seems to have no purpose"
    30   * (2.0x libT) backport tr_truncd() fix for #3521 "rounding issue in tr_truncd()"
    31   * (2.0x web) backport r11309 and r11317 for #3630 "web client needs a link to Transmission's homepage"
     12Backport of bugfixes for a maintenance 2.0x release.
     13==== All Platforms ====
     14  * backport r11302 from #3620 "syntax error in configure.ac"
     15  * backport r11383 from #3715 "README file is outdated"
     16  * backport r11449 from #3787 "'No Announce Scheduled' tracker error"
     17  * backport r11264 from #3453 "Torrent does not stop when set per torrent seed ratio is reached before torrent is completed"
     18  * backport r11226 from #3566 "Memory leak in libtransmission/torrent.c: refreshCurrentDir()"
     19  * backport r11243 from #3571 "Torrent done script clears important env vars."
     20  * backport r11295 from #3610 "Unused fields in tr_peer"
     21  * backport r11304 from #3628 "remove dead variable pieceBytesRead from libtransmission/verify.c"
     22  * backport r11357 from #3681 "tr-lpd.c's lpd_configureSocket() function is redundant"
     23  * backport r11237 from #3539 "Transmission sending corrupt data in metadata exchange"
     24  * backport r11300 from #3614 "Can't save benc files under uClibc 0.9.31"
     25  * backport r11356 from #3678 "benc walking could be more efficient"
     26  * backport r11359 from #3687 "The V=XXXX key/val pair in our DHT messages seems to have no purpose"
     27  * backport tr_truncd() fix from #3521 "rounding issue in tr_truncd()"
     28  * backport r11381 from #3707 "Remove dependancy to which."
     29==== GTK+ ====
     30  * backport r10915 from #3380 "Increase size of 'Add URL' text field."
     31  * backport r11217 from #3529 "Slow priority-sorting in filelist"
     32  * backport r11267 from #3585 "possible rendering issue in torrent_cell_renderer_get_size()"
     33  * backport r11259 from #3619 "memory leak that may cause events to be fired to invalid listeners"
     34  * backport r11344 from #3639 "Hibernation inhibition broke in transmission-gtk 2.00"
     35  * backport r11439 from #3701 "Un-blur statusbar icons"
     36  * backport r11443 from #3777 "Ellipsize Error: line"
     37==== Qt ====
     38  * backport r11222 from #3496 "Crash when changing to/from compact mode"
     39  * backport r11306 from #3627 "off-by-one in FileTreeView causes potential invalid memory read / crash"
     40  * backport r11340 from #3650 "Link transmission-qt with libz explicitly"
     41  * backport r11289 from #3593 "rpc authentication setting broken in qt client"
     42==== Daemon ====
     43  * #3508: --download-dir does not work properly
     44==== Web Client ====
     45  * backport r11309 and r11317 for #3630 "web client needs a link to Transmission's homepage"
     46==== CLI ====
     47  * #3758: Syntax error in transmission-cli.1
    3248
    3349=== Transmission 2.04 (2010/08/06) ===
  • branches/2.0x/gtk/details.c

    r11466 r11551  
    10031003
    10041004        /* origins */
    1005         l = gtk_label_new( NULL );
     1005        l = g_object_new( GTK_TYPE_LABEL, "selectable", TRUE,
     1006                                          "ellipsize", PANGO_ELLIPSIZE_END,
     1007                                          NULL );
    10061008        hig_workarea_add_row( t, &row, _( "Origin:" ), l, NULL );
    10071009        di->origin_lb = l;
  • branches/2.0x/gtk/main.c

    r11007 r11551  
    8585    GSList            * details;
    8686    GtkTreeSelection  * sel;
    87     GtkWidget         * quit_dialog;
     87    gpointer            quit_dialog;
    8888};
    8989
     
    348348
    349349    {
    350         const int total = tr_core_get_torrent_count( data->core );
    351         const int active = tr_core_get_active_torrent_count( data->core );
     350        const size_t total = tr_core_get_torrent_count( data->core );
     351        const size_t active = tr_core_get_active_torrent_count( data->core );
    352352        action_sensitize( "pause-all-torrents", active != 0 );
    353353        action_sensitize( "start-all-torrents", active != total );
     
    808808shouldConfirmBeforeExiting( struct cbdata * data )
    809809{
    810     if( !pref_flag_get( PREF_KEY_ASKQUIT ) )
    811         return FALSE;
    812     else {
    813         struct counts_data counts;
    814         getTorrentCounts( data, &counts );
    815         return counts.activeCount > 0;
    816     }
     810    return pref_flag_get( PREF_KEY_ASKQUIT )
     811        && tr_core_get_active_torrent_count( data->core );
    817812}
    818813
     
    823818        wannaquit( cbdata );
    824819    else {
    825         if( cbdata->quit_dialog == NULL )
     820        if( cbdata->quit_dialog == NULL ) {
    826821            cbdata->quit_dialog = askquit( cbdata->core, cbdata->wind, wannaquit, cbdata );
     822            g_object_add_weak_pointer( G_OBJECT( cbdata->quit_dialog ), &cbdata->quit_dialog );
     823        }
    827824        gtk_window_present( GTK_WINDOW( cbdata->quit_dialog ) );
    828825    }
  • branches/2.0x/gtk/notify.c

    r9989 r11551  
    157157    {
    158158        NotifyNotification * n = notify_notification_new(
    159             _( "Torrent Added" ), name, NULL, NULL );
     159            _( "Torrent Added" ), name, NULL
     160/* the fourth argument was removed in libnotify 0.7.0 */
     161#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
     162            , NULL
     163#endif
     164            );
    160165        addIcon( n );
    161166        notify_notification_set_timeout( n, NOTIFY_EXPIRES_DEFAULT );
  • branches/2.0x/gtk/tr-core.c

    r11464 r11551  
    17461746}
    17471747
    1748 int
     1748size_t
    17491749tr_core_get_torrent_count( TrCore * core )
    17501750{
     
    17521752}
    17531753
    1754 int
     1754size_t
    17551755tr_core_get_active_torrent_count( TrCore * core )
    17561756{
    17571757    GtkTreeIter iter;
    17581758    GtkTreeModel * model = tr_core_model( core );
    1759     int activeCount = 0;
     1759    size_t activeCount = 0;
    17601760
    17611761    if( gtk_tree_model_get_iter_first( model, &iter ) ) do
  • branches/2.0x/gtk/tr-core.h

    r11113 r11551  
    100100tr_session *   tr_core_session( TrCore * self );
    101101
    102 int            tr_core_get_active_torrent_count( TrCore * self );
    103 
    104 int            tr_core_get_torrent_count( TrCore * self );
     102size_t         tr_core_get_active_torrent_count( TrCore * self );
     103
     104size_t         tr_core_get_torrent_count( TrCore * self );
    105105
    106106/******
  • branches/2.0x/libtransmission/fdlimit.c

    r10928 r11551  
    199199/* Like pread and pwrite, except that the position is undefined afterwards.
    200200   And of course they are not thread-safe. */
     201
     202/* https://trac.transmissionbt.com/ticket/3826 */
     203#ifdef __UCLIBC__
     204#define TR_UCLIBC_CHECK_VERSION(major,minor,micro) \
     205    (__UCLIBC_MAJOR__ > (major) || \
     206    (__UCLIBC_MAJOR__ == (major) && __UCLIBC_MINOR__ > (minor)) || \
     207    (__UCLIBC_MAJOR__ == (major) && __UCLIBC_MINOR__ == (minor) && \
     208    __UCLIBC_SUBLEVEL__ >= (micro)))
     209#if !TR_UCLIBC_CHECK_VERSION(0,9,28)
     210 #undef HAVE_PREAD
     211 #undef HAVE_PWRITE
     212#endif
     213#endif
    201214
    202215#ifdef SYS_DARWIN
Note: See TracChangeset for help on using the changeset viewer.