Changeset 9275

Timestamp:

Oct 10, 2009, 7:24:46 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) #2489: tr_torrentSetAnnounceList() should check for invalid and duplicate announce URLs

File:

• trunk/gtk/details.c (modified) (4 diffs)

trunk/gtk/details.c

@@ -1869 +1869 @@
 onEditTrackersResponse( GtkDialog * dialog, int response, gpointer data )
 {
+    gboolean do_destroy = TRUE;
     struct DetailsImpl * di = data;
 
@@ -1876 +1877 @@
         int tier;
         GtkTextIter start, end;
+        tr_announce_list_err err;
         char * tracker_text;
         char ** tracker_strings;
@@ -1900 +1902 @@
 
         /* update the torrent */
-        tr_torrentSetAnnounceList( tor, trackers, n );
-        di->trackers = NULL;
-        di->tracker_buffer = NULL;
+        err = tr_torrentSetAnnounceList( tor, trackers, n );
+        if( err )
+        {
+            GtkWidget * w;
+            const char * str = NULL;
+            if( err == TR_ANNOUNCE_LIST_HAS_DUPLICATES )
+                str = _( "List contains duplicate URLs" );
+            else if( err == TR_ANNOUNCE_LIST_HAS_BAD )
+                str = _( "List contains invalid URLs" );
+            else
+                assert( 0 && "unhandled condition" );
+            w = gtk_message_dialog_new( GTK_WINDOW( dialog ),
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_ERROR,
+                                        GTK_BUTTONS_CLOSE, "%s", str );
+            gtk_dialog_run( GTK_DIALOG( w ) );
+            gtk_widget_destroy( w );
+            do_destroy = FALSE;
+        }
+        else
+        {
+            di->trackers = NULL;
+            di->tracker_buffer = NULL;
+        }
 
         /* cleanup */
@@ -1910 +1933 @@
     }
 
-    gtk_widget_destroy( GTK_WIDGET( dialog ) );
+    if( do_destroy )
+        gtk_widget_destroy( GTK_WIDGET( dialog ) );
 }