Changeset 9864

Timestamp:

Jan 4, 2010, 8:18:21 PM (12 years ago)

Author:

charles

Message:

(trunk) sync mac, gtk clients with r9863

Location:

trunk

Files:

• gtk/details.c (modified) (2 diffs)
• macosx/Torrent.m (modified) (2 diffs)

trunk/gtk/details.c

@@ -1994 +1994 @@
         int tier;
         GtkTextIter start, end;
-        tr_announce_list_err err;
         char * tracker_text;
         char ** tracker_strings;
@@ -2019 +2018 @@
 
         /* 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 );

trunk/macosx/Torrent.m

@@ -635 +635 @@
     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;
 }
 
@@ -655 +655 @@
         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);