Changeset 6182 for branches/1.2x

Timestamp:

Jun 13, 2008, 9:12:49 PM (14 years ago)

Author:

charles

Message:

(gtk) #963: "404 error for 1.2x help" backported to 1.2x

Location:

branches/1.2x/gtk

Files:

• main.c (modified) (1 diff)
• tr-prefs.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

branches/1.2x/gtk/main.c

@@ -1190 +1190 @@
     else if (!strcmp (action_name, "help"))
     {
-        gtr_open_file( "http://www.transmissionbt.com/help/gtk/"
-                       SHORT_VERSION_STRING );
+        char * url = gtr_get_help_url( );
+        gtr_open_file( url );
+        g_free( url );
     }
     else if (!strcmp (action_name, "toggle-main-window"))

branches/1.2x/gtk/tr-prefs.c

@@ -104 +104 @@
 response_cb( GtkDialog * dialog, int response, gpointer unused UNUSED )
 {
-    if( response == GTK_RESPONSE_HELP )
-        gtr_open_file( "http://www.transmissionbt.com/help/gtk/"
-                       SHORT_VERSION_STRING "/html/preferences.html" );
+    if( response == GTK_RESPONSE_HELP ) {
+        char * base = gtr_get_help_url( );
+        char * url = g_strdup_printf( "%s/html/preferences.html", base );
+        gtr_open_file( url );
+        g_free( url );
+        g_free( base );
+    }
 
     if( response == GTK_RESPONSE_CLOSE )

branches/1.2x/gtk/util.c

@@ -429 +429 @@
 }
 
+char*
+gtr_get_help_url( void )
+{
+    const char * fmt = "http://www.transmissionbt.com/help/gtk/%d.%dx";
+    int major, minor;
+    sscanf( SHORT_VERSION_STRING, "%d.%d", &major, &minor );
+    return g_strdup_printf( fmt, major, minor/10 );
+}
+
 void
 gtr_open_file( const char * path )

branches/1.2x/gtk/util.h

@@ -90 +90 @@
 void gtr_uninhibit_hibernation( guint );
 
+char* gtr_get_help_url( void );
 #ifdef GTK_MAJOR_VERSION