Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes for qnx ( photon ) platform. They should not affect runtime/building other platforms.

Browse Source 
Removed the usage of network.hosts.socks* from the embedding code, as per BUG:237576.


git-svn-id: svn://10.0.0.236/trunk@154094 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
amardare%qnx.com
2004-03-18 16:22:23 +00:00
parent 12eaf5d78c
commit 01aa644366
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/embedding/browser/photon/src/PtMozilla.cpp
View File

@@ -336,7 +336,7 @@ mozilla_modify( PtWidget_t *widget, PtArg_t const *argt, PtResourceRec_t const *
break;
case Pt_MOZ_COMMAND_FIND: {
PtWebCommand_t *wdata = ( PtWebCommand_t * ) argt->len;
PtWebClient2Command_t *wdata = ( PtWebClient2Command_t * ) argt->len;
nsCOMPtr<nsIWebBrowserFind> finder( do_GetInterface( moz->EmbedRef->mWindow->mWebBrowser ) );
finder->SetSearchString( NS_ConvertASCIItoUCS2(wdata->FindInfo.string).get() );
finder->SetMatchCase( wdata->FindInfo.flags & Pt_WEB_FIND_MATCH_CASE );
@@ -590,10 +590,8 @@ mozilla_set_pref( PtWidget_t *widget, char *option, char *value )
}
/* SOCKS options */
else if( !strcmp( option, "socks_server" ) )
pref->SetCharPref( "network.hosts.socks_server", value );
else if( !strcmp( option, "socks_port" ) )
pref->SetCharPref( "network.hosts.socks_serverport", value );
else if( !strcmp( option, "socks_server" ) ) ; /* not used */
else if( !strcmp( option, "socks_port" ) ) ; /* not used */
else if( !strcmp( option, "socks_user" ) ) ; /* not used */
else if( !strcmp( option, "socks_app" ) ) ; /* not used */
@@ -794,18 +792,6 @@ static void mozilla_get_pref( PtWidget_t *widget, char *option, char *value ) {
strcpy( value, font );
}
/* SOCKS options */
else if( !strcmp( option, "socks_server" ) ) {
char *s = NULL;
pref->CopyCharPref( "network.hosts.socks_server", &s );
if( s ) strcpy( value, s );
}
else if( !strcmp( option, "socks_port" ) ) {
char *s = NULL;
pref->CopyCharPref( "network.hosts.socks_serverport", &s );
if( s ) strcpy( value, s );
}
/* HTTP options */
else if( !strcmp( option, "http_proxy_host" ) ) {
char *s = NULL;