(trunk) #3045 fix oops from last commit

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 2e9dcdf53ccd83f748dad6a7b532e85e1da07632..78971e621c23bdcaca15fa5fd936f9a1d93987a3 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1579,10 +1579,10 @@ static struct formatter_units size_units;
 
 void
 tr_formatter_size_init( unsigned int kilo,
-                        const char * b, const char * kb,
-                        const char * mb, const char * gb )
+                        const char * kb, const char * mb,
+                        const char * gb, const char * tb )
 {
-    formatter_init( &size_units, kilo, b, kb, mb, gb );
+    formatter_init( &size_units, kilo, kb, mb, gb, tb );
 }
 
 char*
@@ -1597,11 +1597,11 @@ unsigned int tr_speed_K = 0u;
 
 void
 tr_formatter_speed_init( unsigned int kilo,
-                         const char * b, const char * kb,
-                         const char * mb, const char * gb )
+                         const char * kb, const char * mb,
+                         const char * gb, const char * tb )
 {
     tr_speed_K = kilo;
-    formatter_init( &speed_units, kilo, b, kb, mb, gb );
+    formatter_init( &speed_units, kilo, kb, mb, gb, tb );
 }
 
 char*
@@ -1617,11 +1617,11 @@ unsigned int tr_mem_K = 0u;
  
 void
 tr_formatter_mem_init( unsigned int kilo,
-                       const char * b, const char * kb,
-                       const char * mb, const char * gb )
+                       const char * kb, const char * mb,
+                       const char * gb, const char * tb )
 {
     tr_mem_K = kilo;
-    formatter_init( &mem_units, kilo, b, kb, mb, gb );
+    formatter_init( &mem_units, kilo, kb, mb, gb, tb );
 }
 
 char*

diff --git a/libtransmission/utils.h b/libtransmission/utils.h
index 5364c88bc95240c2f607d0439c8783498b7d748a..902048756f75ab2d53dbc2d1dfbd95fb1795cae6 100644 (file)
--- a/libtransmission/utils.h
+++ b/libtransmission/utils.h
@@ -562,16 +562,16 @@ char* tr_realpath( const char *path, char * resolved_path );
 ****
 ***/
 
-/* example: tr_formatter_size_init( 1024, _("B"), _("KiB"), _("MiB"), _("GiB") ); */
+/* example: tr_formatter_size_init( 1024, _("KiB"), _("MiB"), _("GiB"), _("TiB") ); */
 
-void tr_formatter_size_init( unsigned int kilo, const char * b, const char * kb,
-                                                const char * mb, const char * gb );
+void tr_formatter_size_init( unsigned int kilo, const char * kb, const char * mb,
+                                                const char * gb, const char * tb );
 
-void tr_formatter_speed_init( unsigned int kilo, const char * b, const char * kb,
-                                                 const char * mb, const char * gb );
+void tr_formatter_speed_init( unsigned int kilo, const char * kb, const char * mb,
+                                                 const char * gb, const char * tb );
 
-void tr_formatter_mem_init( unsigned int kilo, const char * b, const char * kb,
-                                               const char * mb, const char * gb );
+void tr_formatter_mem_init( unsigned int kilo, const char * kb, const char * mb,
+                                               const char * gb, const char * tb );
 
 /* format a speed into a user-readable string. */
 extern unsigned int tr_speed_K;

diff --git a/macosx/Controller.m b/macosx/Controller.m
index f2ae3b63abfd5559198445634507e028ba65f6b2..811290a0898eda639861999637c8a1dd28507262 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -338,7 +338,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         
         #warning localize and make consistent
         tr_formatter_size_init(1024, "KB", "MB", "GB", "TB");
-        tr_formatter_speed_init(1024, "B/s", "KB/s", "MB/s", "GB/s", "TB/s");
+        tr_formatter_speed_init(1024, "KB/s", "MB/s", "GB/s", "TB/s");
         tr_formatter_mem_init(1024, "KB", "MB", "GB", "TB");
         
         [NSApp setDelegate: self];