Changeset 10853

Timestamp:

Jun 25, 2010, 5:49:53 PM (13 years ago)

Author:

charles

Message:

(2.0x gtk) #3350 "Add URL doesn't warn upon corrupt torrents" -- fixed

File:

• branches/2.0x/gtk/tr-core.c (modified) (5 diffs)

branches/2.0x/gtk/tr-core.c

@@ -1019 +1019 @@
     TrCore * core;
     tr_ctor * ctor;
-    GtkDialog * dialog;
+    char * url;
+    long response_code;
 };
 
@@ -1026 +1027 @@
 {
     struct url_dialog_data * data = vdata;
-    tr_core_add_ctor( data->core, data->ctor );
+    const gboolean doPrompt = pref_flag_get( PREF_KEY_OPTIONS_PROMPT ); 
+    const gboolean doNotify = FALSE; 
+    const int err = add_ctor( data->core, data->ctor, doPrompt, doNotify ); 
+
+    if( err == TR_PARSE_ERR ) 
+        tr_core_errsig( data->core, TR_PARSE_ERR, data->url ); 
+    
+     tr_core_torrents_added( data->core ); 
+
+    /* cleanup */
+    g_free( data->url );
     g_free( data );
     return FALSE;
@@ -1033 +1044 @@
 static void
 onURLDone( tr_session       * session,
-           long               response_code UNUSED,
+           long               response_code,
            const void       * response,
            size_t             response_byte_count,
@@ -1039 +1050 @@
 {
     struct url_dialog_data * data = vdata;
-    tr_ctor * ctor = tr_ctorNew( session );
-
-    /* FIME: error dialog */
-
-    if( tr_ctorSetMetainfo( ctor, response, response_byte_count ) )
-    {
-        tr_ctorFree( ctor );
-        g_free( data );
-    }
-    else /* move the work back to the gtk thread */
-    {
-        data->ctor = ctor;
-        gtr_idle_add( onURLDoneIdle, data );
-    }
+
+    data->response_code = response_code; 
+    data->ctor = tr_ctorNew( session ); 
+    tr_core_apply_defaults( data->ctor ); 
+    tr_ctorSetMetainfo( data->ctor, response, response_byte_count ); 
+
+    gtr_idle_add( onURLDoneIdle, data ); 
 }
 
@@ -1085 +1089 @@
         struct url_dialog_data * data = g_new( struct url_dialog_data, 1 );
         data->core = core;
+        data->url = g_strdup( url );
         tr_webRun( session, url, NULL, onURLDone, data );
     }