aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar ctrlaltca2017-02-23 10:27:45 +0100
committerGravatar wodim2017-02-23 10:27:45 +0100
commit1dc42d6619238c8e7b2ec25dd048c295d3ec6407 (patch)
treef1f822556f5652938d88c04c6b52b875a5a1ac67
parentmake the repaint timers of kviircview and kviinputeditor faster when selectin... (diff)
downloadKVIrc-1dc42d6619238c8e7b2ec25dd048c295d3ec6407.tar.gz
KVIrc-1dc42d6619238c8e7b2ec25dd048c295d3ec6407.tar.bz2
KVIrc-1dc42d6619238c8e7b2ec25dd048c295d3ec6407.zip
Disable old broken OnURLLinkPopupRequest when restoring default script; fix #2140 (#2183)
-rw-r--r--data/defscript/events.kvs4
-rw-r--r--src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp2
4 files changed, 8 insertions, 2 deletions
diff --git a/data/defscript/events.kvs b/data/defscript/events.kvs
index 2c80c1f09..ce2565a1a 100644
--- a/data/defscript/events.kvs
+++ b/data/defscript/events.kvs
@@ -163,6 +163,10 @@ event(OnURLLinkClick,default)
openurl $0
}
+# Fix bug https://github.com/kvirc/KVIrc/issues/2140
+eventctl -d -q OnURLLinkPopupRequest "URL popup"
+eventctl -d -q OnURLLinkPopupRequest "URLpopup"
+
event(OnURLLinkPopupRequest,default)
{
popup.show urlpopup $0
diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
index 13804ee00..f717088d0 100644
--- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
+++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
@@ -532,7 +532,7 @@ namespace KviKvsCoreCallbackCommands
or a numeric code (from 0 to 999) of a RAW server message.[br]
If the -q switch is specified then the command runs in quiet mode.
@seealso:
- [cmd]eventctl[/cmd]
+ [cmd]eventctl[/cmd] [fnc]$iseventenabled[/fnc]
*/
KVSCCC(event)
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index 63bf27eea..acf986e26 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -693,6 +693,8 @@ namespace KviKvsCoreFunctions
<boolean> $isEventEnabled(<event_name:string>,<handler_name:string>)
@description:
Returns [b]1[/b] if the event handler is enabled.
+ @seealso:
+ [cmd]event[/cmd] [cmd]eventctl[/cmd]
*/
KVSCF(isEventEnabled)
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index 8972136bc..a66ffac23 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -1469,7 +1469,7 @@ namespace KviKvsCoreSimpleCommands
The <event_name> may be one of the kvirc-builtin event names
or a numeric code (from 0 to 999) of a raw server message.[br]
@seealso:
- [cmd]event[/cmd]
+ [cmd]event[/cmd] [fnc]$iseventenabled[/fnc]
*/
KVSCSC(eventctl)
{