Changeset 10101

Timestamp:

Feb 5, 2010, 1:59:44 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) #2864 "when adding a non-BitTorrent? magnet link fails, explain why to the user" -- implemented for GTK+ client for 1.90

Location:

trunk/gtk

Files:

• add-dialog.c (modified) (1 diff)
• tr-core.c (modified) (3 diffs)
• util.c (modified) (5 diffs)
• util.h (modified) (1 diff)

trunk/gtk/add-dialog.c

@@ -492 +492 @@
             else
             {
-                GtkWidget * w = gtk_message_dialog_new( GTK_WINDOW( dialog ), 0,
-                                                        GTK_MESSAGE_ERROR,
-                                                        GTK_BUTTONS_CLOSE,
-                                                        "%s", _( "Unrecognized URL" ) );
-                gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ),
-                    _( "Transmission doesn't know how to use \"%s\"" ), url );
-                g_signal_connect_swapped( w, "response",
-                                          G_CALLBACK( gtk_widget_destroy ), w );
-                gtk_widget_show( w );
+                gtr_unrecognized_url_dialog( GTK_WIDGET( dialog ), url );
                 destroy = FALSE;
             }

trunk/gtk/tr-core.c

@@ -1043 +1043 @@
 {
     tr_session * session = tr_core_session( core );
-
-    if( gtr_is_magnet_link( url ) || gtr_is_hex_hashcode( url ) )
+    const gboolean is_magnet_link = gtr_is_magnet_link( url );
+
+    if( is_magnet_link || gtr_is_hex_hashcode( url ) )
     {
         int err;
@@ -1055 +1056 @@
         err = tr_ctorSetMetainfoFromMagnetLink( ctor, url );
 
-        if( !err )
+        if( err )
+        {
+            gtr_unrecognized_url_dialog( NULL, url );
+            tr_ctorFree( ctor );
+        }
+        else
         {
             tr_session * session = tr_core_session( core );
@@ -1063 +1069 @@
             else
                 g_message( "tr_torrent_new_ctor err %d", err );
-        }
-        else
-        {
-            GtkWidget * w = gtk_message_dialog_new( NULL, 0,
-                                                    GTK_MESSAGE_ERROR,
-                                                    GTK_BUTTONS_CLOSE,
-                                                    "%s", _( "Unrecognized URL" ) );
-            gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ),
-                _( "Transmission doesn't know how to use \"%s\"" ), url );
-            g_signal_connect_swapped( w, "response",
-                                      G_CALLBACK( gtk_widget_destroy ), w );
-            gtk_widget_show( w );
-            tr_ctorFree( ctor );
         }
 

trunk/gtk/util.c

@@ -352 +352 @@
 }
 
+static GtkWindow *
+getWindow( GtkWidget * w )
+{
+    if( w == NULL )
+        return NULL;
+
+    if( GTK_IS_WINDOW( w ) )
+        return GTK_WINDOW( w );
+
+    return GTK_WINDOW( gtk_widget_get_ancestor( w, GTK_TYPE_WINDOW ) );
+}
+
 void
 addTorrentErrorDialog( GtkWidget *  child,
@@ -357 +369 @@
                        const char * filename )
 {
-    GtkWidget *  w;
-    GtkWidget *  win;
+    char * secondary;
     const char * fmt;
-    char *       secondary;
+    GtkWidget * w;
+    GtkWindow * win = getWindow( child );
 
     switch( err )
@@ -369 +381 @@
     }
     secondary = g_strdup_printf( fmt, filename );
-    win = ( !child || GTK_IS_WINDOW( child ) )
-          ? child
-          : gtk_widget_get_ancestor( child ? GTK_WIDGET(
-                                         child ) : NULL, GTK_TYPE_WINDOW );
-    w = gtk_message_dialog_new( GTK_WINDOW( win ),
-                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                               GTK_MESSAGE_ERROR,
-                               GTK_BUTTONS_CLOSE,
-                               "%s", _( "Error opening torrent" ) );
+
+    w = gtk_message_dialog_new( win,
+                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                GTK_MESSAGE_ERROR,
+                                GTK_BUTTONS_CLOSE,
+                                "%s", _( "Error opening torrent" ) );
     gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ),
                                               "%s", secondary );
@@ -385 +394 @@
     g_free( secondary );
 }
+
 typedef void ( PopupFunc )( GtkWidget*, GdkEventButton* );
 
@@ -807 +817 @@
 #endif
 }
+
+void
+gtr_unrecognized_url_dialog( GtkWidget * parent, const char * url )
+{
+    const char * xt = "xt=urn:btih";
+
+    GtkWindow * window = getWindow( parent );
+
+    GString * gstr = g_string_new( NULL );
+
+    GtkWidget * w = gtk_message_dialog_new( window, 0,
+                                            GTK_MESSAGE_ERROR,
+                                            GTK_BUTTONS_CLOSE,
+                                            "%s", _( "Unrecognized URL" ) );
+
+    g_string_append_printf( gstr, _( "Transmission doesn't know how to use \"%s\"" ), url );
+
+    if( gtr_is_magnet_link( url ) && ( strstr( url, xt ) == NULL ) )
+    {
+        g_string_append_printf( gstr, "\n \n" );
+        g_string_append_printf( gstr, _( "This magnet link appears to be intended for something other than BitTorrent.  BitTorrent magnet links have a section containing \"%s\"." ), xt ); 
+    }
+
+    gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ), "%s", gstr->str );
+    g_signal_connect_swapped( w, "response", G_CALLBACK( gtk_widget_destroy ), w );
+    gtk_widget_show( w );
+    g_string_free( gstr, TRUE );
+}

trunk/gtk/util.h

@@ -134 +134 @@
 ***/
 
+void gtr_unrecognized_url_dialog( GtkWidget * parent, const char * url );
+
+
 void addTorrentErrorDialog( GtkWidget  * window_or_child,
                             int          err,