Changeset 10240


Ignore:
Timestamp:
Feb 20, 2010, 3:57:34 PM (8 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/cli.c

    r10084 r10240  
    411411                                                    '?' ) ? '&' : '?',
    412412                                            escaped );
    413                     tr_httpParseURL( scrape, -1, &host, NULL, NULL );
     413                    tr_urlParse( scrape, -1, NULL, &host, NULL, NULL );
    414414                    ++leftToScrape;
    415415
  • trunk/gtk/tracker-list.c

    r9868 r10240  
    1919
    2020#include <libtransmission/transmission.h>
    21 #include <libtransmission/utils.h> /* tr_httpIsValidURL */
     21#include <libtransmission/utils.h> /* tr_urlIsValidTracker() */
    2222
    2323#include "actions.h"
     
    240240        char * old_text;
    241241        gtk_tree_model_get( model, &iter, TR_COL_ANNOUNCE, &old_text, -1 );
    242         if( tr_httpIsValidURL( new_text ) )
     242        if( tr_urlIsValidTracker( new_text ) )
    243243        {
    244244            if( strcmp( old_text, new_text ) )
     
    250250            }
    251251        }
    252         else if( !tr_httpIsValidURL( old_text ) )
     252        else if( !tr_urlIsValidTracker( old_text ) )
    253253        {
    254254            /* both old and new are invalid...
  • trunk/macosx/CreatorWindowController.m

    r9844 r10240  
    2525#import "CreatorWindowController.h"
    2626#import "NSStringAdditions.h"
    27 #import "utils.h" //tr_httpIsValidURL
     27#import "utils.h" //tr_urlIsValidTracker
    2828
    2929#define TRACKER_ADD_TAG 0
     
    126126        for (NSInteger i = [fTrackers count]-1; i >= 0; i--)
    127127        {
    128             if (!tr_httpIsValidURL([[fTrackers objectAtIndex: i] UTF8String]))
     128            if (!tr_urlIsValidTracker([[fTrackers objectAtIndex: i] UTF8String]))
    129129                [fTrackers removeObjectAtIndex: i];
    130130        }
     
    305305        tracker = [@"http://" stringByAppendingString: tracker];
    306306   
    307     if (!tr_httpIsValidURL([tracker UTF8String]))
     307    if (!tr_urlIsValidTracker([tracker UTF8String]))
    308308    {
    309309        NSBeep();
Note: See TracChangeset for help on using the changeset viewer.