Changeset 10350

Timestamp:

Mar 10, 2010, 7:16:22 PM (12 years ago)

Author:

charles

Message:

(1.9x gtk) #3011 "'Edit Trackers' dialog not reset after Cancel" -- fixed in 1.9x for 1.92

File:

• branches/1.9x/gtk/details.c (modified) (3 diffs)

branches/1.9x/gtk/details.c

@@ -1820 +1820 @@
 }
 
+static void
+populate_tracker_buffer( GtkTextBuffer * buffer, const tr_torrent * tor )
+{
+    int i;
+    int tier = 0;
+    GString * gstr = g_string_new( NULL );
+    const tr_info * inf = tr_torrentInfo( tor );
+    for( i=0; i<inf->trackerCount; ++i ) {
+        const tr_tracker_info * t = &inf->trackers[i];
+        if( tier != t->tier ) {
+            tier = t->tier;
+            g_string_append_c( gstr, '\n' );
+        }
+        g_string_append_printf( gstr, "%s\n", t->announce );
+    }
+    if( gstr->len > 0 )
+        g_string_truncate( gstr, gstr->len-1 );
+    gtk_text_buffer_set_text( buffer, gstr->str, -1 );
+    g_string_free( gstr, TRUE );
+}
+
 #define TORRENT_PTR_KEY "torrent-pointer"
 
@@ -1867 +1888 @@
     if( ( di->tracker_buffer == NULL ) && ( n == 1 ) )
     {
-        int tier = 0;
-        GString * gstr = g_string_new( NULL );
-        const tr_info * inf = tr_torrentInfo( torrents[0] );
-        for( i=0; i<inf->trackerCount; ++i ) {
-            const tr_tracker_info * t = &inf->trackers[i];
-            if( tier != t->tier ) {
-                tier = t->tier;
-                g_string_append_c( gstr, '\n' );
-            }
-            g_string_append_printf( gstr, "%s\n", t->announce );
-        }
-        if( gstr->len > 0 )
-            g_string_truncate( gstr, gstr->len-1 );
         di->tracker_buffer = gtk_text_buffer_new( NULL );
-        gtk_text_buffer_set_text( di->tracker_buffer, gstr->str, -1 );
-        g_string_free( gstr, TRUE );
+        populate_tracker_buffer( di->tracker_buffer, torrents[0] );
     }
 
@@ -2019 +2026 @@
     }
 
+    if( response == GTK_RESPONSE_CANCEL )
+    {
+        tr_torrent * tor = g_object_get_data( G_OBJECT( dialog ), TORRENT_PTR_KEY );
+        populate_tracker_buffer( di->tracker_buffer, tor );
+    }
+
     if( do_destroy )
         gtk_widget_destroy( GTK_WIDGET( dialog ) );