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

Bug 235502 nsIMIMEService, nsIMIMEInfo should use nsACString/nsAString instead of string/wstring

Browse Source 
r=bzbarsky sr=darin


git-svn-id: svn://10.0.0.236/trunk@154941 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2004-04-15 20:56:37 +00:00
parent fbd68c22ff
commit 39f2b721ec
50 changed files with 400 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -3885,12 +3885,13 @@ nsresult nsPluginHostImpl::SetUpDefaultPluginInstance(const char *aMimeType, nsI
nsresult result = NS_ERROR_FAILURE;
nsIPluginInstance* instance = NULL;
nsCOMPtr<nsIPlugin> plugin = NULL;
const char* mimetype;
if(!aURL)
return NS_ERROR_FAILURE;
mimetype = aMimeType;
nsCAutoString mimetype;
if (aMimeType)
mimetype = aMimeType;
GetPluginFactory("*", getter_AddRefs(plugin));
@@ -3917,21 +3918,21 @@ nsresult nsPluginHostImpl::SetUpDefaultPluginInstance(const char *aMimeType, nsI
// if we don't have a mimetype, check by file extension
nsXPIDLCString mt;
if(mimetype == nsnull)
if(mimetype.IsEmpty())
{
nsresult res = NS_OK;
nsCOMPtr<nsIMIMEService> ms (do_GetService(NS_MIMESERVICE_CONTRACTID, &res));
if(NS_SUCCEEDED(res))
{
nsXPIDLCString mt;
res = ms->GetTypeFromURI(aURL, getter_Copies(mt));
nsCAutoString mt;
res = ms->GetTypeFromURI(aURL, mt);
if(NS_SUCCEEDED(res))
mimetype = mt;
}
}
// set up the peer for the instance
peer->Initialize(aOwner, mimetype);
peer->Initialize(aOwner, mimetype.get());
nsCOMPtr<nsIPluginInstancePeer> pIpeer;
peer->QueryInterface(kIPluginInstancePeerIID, getter_AddRefs(pIpeer));