Changeset 10240

Timestamp:

Feb 20, 2010, 3:57:34 PM (13 years ago)

Author:

charles

Message:

(trunk) #2938 -- sync gtk, mac, and cli clients with previous commit

Location:

trunk

Files:

• cli/cli.c (modified) (1 diff)
• gtk/tracker-list.c (modified) (3 diffs)
• macosx/CreatorWindowController.m (modified) (3 diffs)

trunk/cli/cli.c

@@ -411 +411 @@
                                                     '?' ) ? '&' : '?',
                                             escaped );
-                    tr_httpParseURL( scrape, -1, &host, NULL, NULL );
+                    tr_urlParse( scrape, -1, NULL, &host, NULL, NULL );
                     ++leftToScrape;
 

trunk/gtk/tracker-list.c

@@ -19 +19 @@
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h> /* tr_httpIsValidURL */
+#include <libtransmission/utils.h> /* tr_urlIsValidTracker() */
 
 #include "actions.h"
@@ -240 +240 @@
         char * old_text;
         gtk_tree_model_get( model, &iter, TR_COL_ANNOUNCE, &old_text, -1 );
-        if( tr_httpIsValidURL( new_text ) )
+        if( tr_urlIsValidTracker( new_text ) )
         {
             if( strcmp( old_text, new_text ) )
@@ -250 +250 @@
             }
         }
-        else if( !tr_httpIsValidURL( old_text ) )
+        else if( !tr_urlIsValidTracker( old_text ) )
         {
             /* both old and new are invalid...

trunk/macosx/CreatorWindowController.m

@@ -25 +25 @@
 #import "CreatorWindowController.h"
 #import "NSStringAdditions.h"
-#import "utils.h" //tr_httpIsValidURL
+#import "utils.h" //tr_urlIsValidTracker
 
 #define TRACKER_ADD_TAG 0
@@ -126 +126 @@
         for (NSInteger i = [fTrackers count]-1; i >= 0; i--)
         {
-            if (!tr_httpIsValidURL([[fTrackers objectAtIndex: i] UTF8String]))
+            if (!tr_urlIsValidTracker([[fTrackers objectAtIndex: i] UTF8String]))
                 [fTrackers removeObjectAtIndex: i];
         }
@@ -305 +305 @@
         tracker = [@"http://" stringByAppendingString: tracker];
     
-    if (!tr_httpIsValidURL([tracker UTF8String]))
+    if (!tr_urlIsValidTracker([tracker UTF8String]))
     {
         NSBeep();