diff options
| author |  Fabio Bas | 2010-10-10 20:03:21 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-10-10 20:03:21 +0000 |
| commit | c87e99c1f0ba253ccfffaff3319c121cc60ef741 (patch) | |
| tree | 883cfadabe694b01fb1594cbc9f0ac91b486c47e /src/modules/addon | |
| parent | Rework /popup so it relays the parameters correctly to /popup.show. Replace t... (diff) | |
| download | KVIrc-c87e99c1f0ba253ccfffaff3319c121cc60ef741.tar.gz KVIrc-c87e99c1f0ba253ccfffaff3319c121cc60ef741.tar.bz2 KVIrc-c87e99c1f0ba253ccfffaff3319c121cc60ef741.zip | |
Reunited all the kvs-escape related functions is a single method supporting different flags;
small fixes to defscript and inputbar escaping in userfriendlymode
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5057 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/addon')
| -rw-r--r-- | src/modules/addon/addonfunctions.cpp | 13 | ||||
| -rw-r--r-- | src/modules/addon/managementdialog.cpp | 1 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp index f9248e977..7efd047e1 100644 --- a/src/modules/addon/addonfunctions.cpp +++ b/src/modules/addon/addonfunctions.cpp @@ -229,17 +229,8 @@ namespace KviAddonFunctions } // Now we have all stuff in ~/.config/KVIrc/tmp/$rand - if(! - KviKvsScript::run( - QString::fromAscii("parse \"%1/install.kvs\"") - .arg( - szUnpackPath - .replace("\\","\\\\") - .replace("\"","\\\"") - ), - g_pActiveWindow - ) - ) + KviQString::escapeKvs(&szUnpackPath, KviQString::EscapeSpace); + if(!KviKvsScript::run(QString::fromAscii("parse %1/install.kvs").arg(szUnpackPath), g_pActiveWindow)) { // Parsing the script failed // However, the user should already be notified via normal script output. diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index fa3e31dd0..bab866c2b 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -267,6 +267,7 @@ void KviScriptManagementDialog::uninstallScript() void KviScriptManagementDialog::getMoreScripts() { + // If change this introducing not-fixed text, remember to escape this using KviQString::escapeKvs()! KviKvsScript::run("openurl http://www.kvirc.net/?id=addons&version=" KVI_VERSION "." KVI_SOURCES_DATE,g_pActiveWindow); } |