Changeset 11551

Timestamp:

Dec 20, 2010, 12:19:59 PM (12 years ago)

Author:

charles

Message:

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

Location:

branches/2.0x

Files:

• NEWS (modified) (1 diff)
• gtk/details.c (modified) (1 diff)
• gtk/main.c (modified) (4 diffs)
• gtk/notify.c (modified) (1 diff)
• gtk/tr-core.c (modified) (2 diffs)
• gtk/tr-core.h (modified) (1 diff)
• libtransmission/fdlimit.c (modified) (1 diff)

branches/2.0x/NEWS

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

branches/2.0x/gtk/details.c

@@ -1003 +1003 @@
 
         /* origins */
-        l = gtk_label_new( NULL );
+        l = g_object_new( GTK_TYPE_LABEL, "selectable", TRUE,
+                                          "ellipsize", PANGO_ELLIPSIZE_END,
+                                          NULL );
         hig_workarea_add_row( t, &row, _( "Origin:" ), l, NULL );
         di->origin_lb = l;

branches/2.0x/gtk/main.c

@@ -85 +85 @@
     GSList            * details;
     GtkTreeSelection  * sel;
-    GtkWidget         * quit_dialog;
+    gpointer            quit_dialog;
 };
 
@@ -348 +348 @@
 
     {
-        const int total = tr_core_get_torrent_count( data->core );
-        const int active = tr_core_get_active_torrent_count( data->core );
+        const size_t total = tr_core_get_torrent_count( data->core );
+        const size_t active = tr_core_get_active_torrent_count( data->core );
         action_sensitize( "pause-all-torrents", active != 0 );
         action_sensitize( "start-all-torrents", active != total );
@@ -808 +808 @@
 shouldConfirmBeforeExiting( struct cbdata * data )
 {
-    if( !pref_flag_get( PREF_KEY_ASKQUIT ) )
-        return FALSE;
-    else {
-        struct counts_data counts;
-        getTorrentCounts( data, &counts );
-        return counts.activeCount > 0;
-    }
+    return pref_flag_get( PREF_KEY_ASKQUIT )
+        && tr_core_get_active_torrent_count( data->core );
 }
 
@@ -823 +818 @@
         wannaquit( cbdata );
     else {
-        if( cbdata->quit_dialog == NULL )
+        if( cbdata->quit_dialog == NULL ) {
             cbdata->quit_dialog = askquit( cbdata->core, cbdata->wind, wannaquit, cbdata );
+            g_object_add_weak_pointer( G_OBJECT( cbdata->quit_dialog ), &cbdata->quit_dialog );
+        }
         gtk_window_present( GTK_WINDOW( cbdata->quit_dialog ) );
     }

branches/2.0x/gtk/notify.c

@@ -157 +157 @@
     {
         NotifyNotification * n = notify_notification_new(
-            _( "Torrent Added" ), name, NULL, NULL );
+            _( "Torrent Added" ), name, NULL
+/* the fourth argument was removed in libnotify 0.7.0 */
+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
+            , NULL
+#endif
+            );
         addIcon( n );
         notify_notification_set_timeout( n, NOTIFY_EXPIRES_DEFAULT );

branches/2.0x/gtk/tr-core.c

@@ -1746 +1746 @@
 }
 
-int
+size_t
 tr_core_get_torrent_count( TrCore * core )
 {
@@ -1752 +1752 @@
 }
 
-int
+size_t
 tr_core_get_active_torrent_count( TrCore * core )
 {
     GtkTreeIter iter;
     GtkTreeModel * model = tr_core_model( core );
-    int activeCount = 0;
+    size_t activeCount = 0;
 
     if( gtk_tree_model_get_iter_first( model, &iter ) ) do

branches/2.0x/gtk/tr-core.h

@@ -100 +100 @@
 tr_session *   tr_core_session( TrCore * self );
 
-int            tr_core_get_active_torrent_count( TrCore * self );
-
-int            tr_core_get_torrent_count( TrCore * self );
+size_t         tr_core_get_active_torrent_count( TrCore * self );
+
+size_t         tr_core_get_torrent_count( TrCore * self );
 
 /******

branches/2.0x/libtransmission/fdlimit.c

@@ -199 +199 @@
 /* Like pread and pwrite, except that the position is undefined afterwards.
    And of course they are not thread-safe. */
+
+/* https://trac.transmissionbt.com/ticket/3826 */
+#ifdef __UCLIBC__
+#define TR_UCLIBC_CHECK_VERSION(major,minor,micro) \
+    (__UCLIBC_MAJOR__ > (major) || \
+    (__UCLIBC_MAJOR__ == (major) && __UCLIBC_MINOR__ > (minor)) || \
+    (__UCLIBC_MAJOR__ == (major) && __UCLIBC_MINOR__ == (minor) && \
+    __UCLIBC_SUBLEVEL__ >= (micro)))
+#if !TR_UCLIBC_CHECK_VERSION(0,9,28) 
+ #undef HAVE_PREAD
+ #undef HAVE_PWRITE
+#endif
+#endif
 
 #ifdef SYS_DARWIN