Changeset 9379 for branches

Timestamp:

Oct 22, 2009, 4:43:52 AM (13 years ago)

Author:

charles

Message:

(1.7x) backports for 1.76: r9175 #2418 cannot open a torrent with the Qt client in KDE4 by right-clicking

Location:

branches/1.7x

Files:

• NEWS (modified) (1 diff)
• qt/app.cc (modified) (4 diffs)

branches/1.7x/NEWS

@@ -23 +23 @@
   * Fix crash when removing expired torrents from the display
   * Fix client from closing, rather than closing to the system tray, when clicking X
+  * Cannot open a torrent in KDE4 with right-clicking
 
 === Transmission 1.75 (2009/09/13) ===

branches/1.7x/qt/app.cc

@@ -49 +49 @@
     getUsage( void )
     {
-        return "Transmission " LONG_VERSION_STRING "\n"
-               "http://www.transmissionbt.com/\n"
-               "A fast and easy BitTorrent client";
+        return "Usage:\n"
+               "  transmission [OPTIONS...] [torrent files]";
     }
 
@@ -99 +98 @@
     const char * optarg;
     const char * configDir = 0;
+    QStringList filenames;
     while( ( c = tr_getopt( getUsage( ), argc, (const char**)argv, opts, &optarg ) ) ) {
         switch( c ) {
@@ -105 +105 @@
             case 'v':        Utils::toStderr( QObject::tr( "transmission %1" ).arg( LONG_VERSION_STRING ) ); exit( 0 ); break;
             case TR_OPT_ERR: Utils::toStderr( QObject::tr( "Invalid option" ) ); showUsage( ); break;
-            default:         Utils::toStderr( QObject::tr( "Got opt %1" ).arg((int)c) ); showUsage( ); break;
+            default:         filenames.append( optarg ); break;
         }
     }
@@ -168 +168 @@
         d->show( );
     }
+
+    for( QStringList::const_iterator it=filenames.begin(), end=filenames.end(); it!=end; ++it )
+        mySession->addTorrent( *it );
 }