Changeset 7693

Timestamp:

Jan 13, 2009, 1:44:59 AM (12 years ago)

Author:

charles

Message:

(trunk gtk) #1690: Torrent is completed without ever starting (because there's nothing to download)

Location:

trunk/gtk

Files:

• tr-torrent.c (modified) (1 diff)
• util.c (modified) (2 diffs)

trunk/gtk/tr-torrent.c

@@ -163 +163 @@
 
 static void
-completenessChangedCallback( tr_torrent       * tor UNUSED,
+completenessChangedCallback( tr_torrent       * tor,
                              tr_completeness    completeness,
                              void *             user_data )
 {
-    if( completeness != TR_LEECH )
+    if( ( completeness != TR_LEECH ) && ( tr_torrentStat( tor )->sizeWhenDone != 0 ) )
         g_idle_add( notifyInMainThread, user_data );
 }

trunk/gtk/util.c

@@ -24 +24 @@
 
 #include <ctype.h> /* isxdigit() */
+#include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h> /* free() */
@@ -522 +523 @@
         gboolean trashed = FALSE;
 #ifdef HAVE_GIO
+        GError * err = NULL;
         GFile *  file = g_file_new_for_path( filename );
-        trashed = g_file_trash( file, NULL, NULL );
+        trashed = g_file_trash( file, NULL, &err );
+        if( err )
+            g_message( "Unable to trash file \"%s\": %s", filename, err->message );
+        g_clear_error( &err );
         g_object_unref( G_OBJECT( file ) );
-#endif
-        if( !trashed )
-            g_unlink( filename );
+       
+        
+#endif
+        if( !trashed ) {
+            if( g_unlink( filename ) ) {
+                const int err = errno;
+                g_message( "Unable to unlink file \"%s\": %s", filename, g_strerror( err ) );
+            }
+        }
     }