From 08ee955d7c24229654463f8cdde3796e5794bb20 Mon Sep 17 00:00:00 2001 From: "gijskruitbosch%gmail.com" Date: Sat, 3 Oct 2009 20:55:09 +0000 Subject: [PATCH] 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 --- mozilla/extensions/irc/xul/content/commands.js | 4 +++- mozilla/extensions/irc/xul/content/handlers.js | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mozilla/extensions/irc/xul/content/commands.js b/mozilla/extensions/irc/xul/content/commands.js index cbe7f36e309..9b1207b3e94 100644 --- a/mozilla/extensions/irc/xul/content/commands.js +++ b/mozilla/extensions/irc/xul/content/commands.js @@ -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 diff --git a/mozilla/extensions/irc/xul/content/handlers.js b/mozilla/extensions/irc/xul/content/handlers.js index ff793f9a0dd..3fa63ee21f2 100644 --- a/mozilla/extensions/irc/xul/content/handlers.js +++ b/mozilla/extensions/irc/xul/content/handlers.js @@ -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();