Fix Firefox Xremote on the trunk by bringing blizzard's patch for bug 244060 over from the Aviary branch. r=bsmedberg, sr=bryner.
git-svn-id: svn://10.0.0.236/trunk@158790 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
7fd5078c36
commit
fe67a1bf60
@ -413,9 +413,21 @@ XRemoteService::AddBrowserInstance(nsIDOMWindowInternal *aBrowser)
|
||||
nsCAutoString profile;
|
||||
GetProfileName(profile);
|
||||
|
||||
// Make sure that the profile is actually set to something.
|
||||
const char *profileTmp = NULL;
|
||||
if (profile.Length())
|
||||
profileTmp = profile.get();
|
||||
|
||||
// Normalize program names to lower case and make sure it actually
|
||||
// has a value.
|
||||
ToLowerCase(mProgram);
|
||||
const char *programTmp = NULL;
|
||||
if (mProgram.Length())
|
||||
programTmp = mProgram.get();
|
||||
|
||||
nsresult rv;
|
||||
rv = widgetHelper->EnableXRemoteCommands(mainWidget, profile.get(),
|
||||
mProgram.get());
|
||||
rv = widgetHelper->EnableXRemoteCommands(mainWidget, profileTmp,
|
||||
programTmp);
|
||||
if (NS_FAILED(rv)) {
|
||||
NS_WARNING("failed to enable x remote commands for widget");
|
||||
return rv;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user