Changeset 7860 for trunk/gtk/tr-torrent.c

Timestamp:

Feb 9, 2009, 8:08:33 PM (14 years ago)

Author:

charles

Message:

(trunk gtk) #1735: .torrent files are not deleted even if you said so

File:

• trunk/gtk/tr-torrent.c (modified) (3 diffs)

trunk/gtk/tr-torrent.c

@@ -190 +190 @@
 tr_torrent_new_ctor( tr_session   * session,
                      tr_ctor      * ctor,
-                     char        ** err )
+                     int          * errcode )
 {
     tr_torrent * tor;
-    int          errcode;
     uint8_t      doTrash = FALSE;
-
-    errcode = -1;
-    *err = NULL;
 
     /* let the gtk client handle the removal, since libT
@@ -203 +199 @@
     tr_ctorGetDeleteSource( ctor, &doTrash );
     tr_ctorSetDeleteSource( ctor, FALSE );
-    tor = tr_torrentNew( session, ctor, &errcode );
+    tor = tr_torrentNew( session, ctor, errcode );
 
     if( tor && doTrash )
@@ -216 +212 @@
     }
 
-    if( !tor )
-    {
-        const char * filename = tr_ctorGetSourceFile( ctor );
-        if( !filename )
-            filename = "(null)";
-
-        switch( errcode )
-        {
-            case TR_EINVALID:
-                *err =
-                    g_strdup_printf( _(
-                                         "File \"%s\" isn't a valid torrent" ),
-                                     filename );
-                break;
-
-            case TR_EDUPLICATE:
-                *err = g_strdup_printf( _(
-                                            "File \"%s\" is already open" ),
-                                        filename );
-                break;
-
-            default:
-                *err = g_strdup( filename );
-                break;
-        }
-
-        return NULL;
-    }
-
-    return maketorrent( tor );
+    return tor ? maketorrent( tor ) : NULL;
 }