(trunk) sync mac, gtk clients with r9863

diff --git a/gtk/details.c b/gtk/details.c
index 35676cd88bab6eadd9177426a47e3d535aa0c0b1..5939df16bc58720a9b37561e2fdc5002f5c96919 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -1993,7 +1993,6 @@ onEditTrackersResponse( GtkDialog * dialog, int response, gpointer data )
         int i, n;
         int tier;
         GtkTextIter start, end;
-        tr_announce_list_err err;
         char * tracker_text;
         char ** tracker_strings;
         tr_tracker_info * trackers;
@@ -2018,19 +2017,14 @@ onEditTrackersResponse( GtkDialog * dialog, int response, gpointer data )
         }
 
         /* update the torrent */
-        err = tr_torrentSetAnnounceList( tor, trackers, n );
-        if( err )
+        if( !tr_torrentSetAnnounceList( tor, trackers, n ) )
         {
             GtkWidget * w;
-            const char * str = NULL;
-            if( err == TR_ANNOUNCE_LIST_HAS_BAD )
-                str = _( "List contains invalid URLs" );
-            else
-                assert( 0 && "unhandled condition" );
+            const char * text = _( "List contains invalid URLs" );
             w = gtk_message_dialog_new( GTK_WINDOW( dialog ),
                                         GTK_DIALOG_MODAL,
                                         GTK_MESSAGE_ERROR,
-                                        GTK_BUTTONS_CLOSE, "%s", str );
+                                        GTK_BUTTONS_CLOSE, "%s", text );
             gtk_dialog_run( GTK_DIALOG( w ) );
             gtk_widget_destroy( w );
             do_destroy = FALSE;

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 6f81812850c8145c05a49b668e44827d104d6a2a..9b4bf773465e16299a5e4c77c9f2dffacf137369 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -634,10 +634,10 @@ int trashDataFile(const char * filename)
     trackerStructs[oldTrackerCount].announce = (char *)[tracker UTF8String];
     trackerStructs[oldTrackerCount].tier = trackerStructs[oldTrackerCount-1].tier + 1;
     
-    const tr_announce_list_err result = tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
+    const BOOL ok = tr_torrentSetAnnounceList(fHandle, trackerStructs, oldTrackerCount+1);
     tr_free(trackerStructs);
     
-    return result == TR_ANNOUNCE_LIST_OK;
+    return ok;
 }
 
 - (void) removeTrackersAtIndexes: (NSIndexSet *) removeIndexes
@@ -654,8 +654,8 @@ int trashDataFile(const char * filename)
     for (NSUInteger oldIndex = [indexes firstIndex]; oldIndex != NSNotFound; oldIndex = [indexes indexGreaterThanIndex: oldIndex])
         trackerStructs[newCount++] = fInfo->trackers[oldIndex];
     
-    const tr_announce_list_err result = tr_torrentSetAnnounceList(fHandle, trackerStructs, newCount);
-    NSAssert1(result == TR_ANNOUNCE_LIST_OK, @"Removing tracker addresses resulted in error: %d", result);
+    const BOOL ok = tr_torrentSetAnnounceList(fHandle, trackerStructs, newCount);
+    NSAssert1(ok, @"Removing tracker addresses resulted in error: %d", result);
     
     tr_free(trackerStructs);
 }