X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite-irssi.pl;h=f5c6ef1ee2ef4726d69484278fccfb4dc7a7c093;hb=6a9455d53fe12634ee4b587a3ed1a9d13e66e2e7;hp=ecc7c401b5786704ac3d7a7763b60a2f1ade5305;hpb=5160262f35ac74f803164ac4e734381c7cea1c74;p=videosite.git

diff --git a/videosite-irssi.pl b/videosite-irssi.pl
index ecc7c40..f5c6ef1 100644
--- a/videosite-irssi.pl
+++ b/videosite-irssi.pl
@@ -26,6 +26,14 @@ my %foreground_colors = (
 );
 
 #
+# This is a canary value used in the config system as the default
+# value. As irssi does not have a way to test if a setting exists
+# this is used instead. A config value is never expected to be set
+# to this value and be valid.
+#
+my $config_canary = "\1";
+
+#
 # Initialize the config subsystem. Called by the core.
 #
 # Due to historic reasons this has to deal with a number of possible config sources:
@@ -140,10 +148,10 @@ sub config_get {
     my $val;
 
 
-    Irssi::settings_add_str('videosite', $item, "\0");
+    Irssi::settings_add_str('videosite', $item, $config_canary);
     $val = Irssi::settings_get_str($item);
 
-    return ($val ne "\0")?$val:undef;
+    return ($val ne $config_canary)?$val:undef;
 }
 
 #
@@ -153,8 +161,8 @@ sub config_has {
     my $path = shift;
     my $item = join('.', 'videosite', @{$path});
 
-    Irssi::settings_add_str('videosite', $item, "\0");
-    return Irssi::settings_get_str($item) ne "\0";
+    Irssi::settings_add_str('videosite', $item, $config_canary);
+    return Irssi::settings_get_str($item) ne $config_canary;
 }
 
 #
@@ -165,18 +173,21 @@ sub config_set {
     my $value = shift;
     my $item = join('.', 'videosite', @{$path});
 
-    Irssi::settings_add_str('videosite', $item, "\0");
+    Irssi::settings_add_str('videosite', $item, $config_canary);
     Irssi::settings_set_str($item, $value);
 }
 
 #
 # Delete a configuration value. Called by the core.
 #
+# Now, according to the configuration Irssi::settings_remove() removes a
+# config settings. This does not work in any irssi version available to me.
+# So just set the key to the canary value.
+#
 sub config_del {
     my $path = shift;
-    my $item = join('.', 'videosite', @{$path});
 
-    Irssi::settings_remove($item);
+    config_set($path, $config_canary);
 }
 
 #