Bug 499596 - Fix DCC Show Folder button. r=silver@warwickcompsoc.co.uk (James Ross), a=NPOTFFB.

git-svn-id: svn://10.0.0.236/trunk@258566 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gijskruitbosch%gmail.com
2009-10-03 20:55:09 +00:00
parent b6d06f2b64
commit 08ee955d7c
2 changed files with 8 additions and 3 deletions

View File

@@ -4528,7 +4528,9 @@ function cmdDCCDecline(e)
function cmdDCCShowFile(e)
{
var f = nsLocalFile(e.file);
var f = getFileFromURLSpec(e.file);
if (f)
f = nsLocalFile(f.path);
if (f && f.parent && f.parent.exists())
{
try

View File

@@ -3245,16 +3245,19 @@ function my_dccfiledisconnect(e)
if (this.state.dir == DCC_DIR_GETTING)
{
var cmd = "dcc-file-show " + this.localPath;
var localURL = getURLSpecFromFile(this.localPath);
var cmd = "dcc-show-file " + localURL;
var msgId = (client.platform == "Mac") ? MSG_DCCFILE_CLOSED_SAVED_MAC :
MSG_DCCFILE_CLOSED_SAVED;
msg = getMsg(msgId, this._getParams().concat(this.localPath, cmd));
msg = getMsg(msgId, this._getParams().concat(localURL, cmd));
}
else
{
msg = getMsg(MSG_DCCFILE_CLOSED_SENT, this._getParams());
}
client.munger.getRule(".inline-buttons").enabled = true;
this.display(msg, "DCC-FILE");
client.munger.getRule(".inline-buttons").enabled = false;
}
var CopyPasteHandler = new Object();