From: bw1 <redacted>
Date: Mon, 12 Jun 2017 21:56:49 +0000 (+0200)
Subject: [osd] include packet xosd-bin
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=11838ca0da3ba560ad7a863c83d0ac3f97b648f1;p=irssi-scripts.irssi.org.git

[osd] include packet xosd-bin
---

diff --git a/_testing/config.yml b/_testing/config.yml
index 907ac83..0d4e034 100644
--- a/_testing/config.yml
+++ b/_testing/config.yml
@@ -27,6 +27,7 @@ additional_system_deps:
   - libtext-glob-perl
   - libterm-readline-perl-perl
   - gir1.2-notify-0.7 # for desktop-notify
+  - xosd-bin # osd
 cpan:
   broken_tests:
     - Geo::Weather
@@ -47,7 +48,6 @@ whitelist:
   - log2ansi
   - oidenty
   - 'on'
-  - osd
   - stocks
   - tvmusor
   - xetra
diff --git a/scripts/osd.pl b/scripts/osd.pl
index ab2a690..1099c53 100644
--- a/scripts/osd.pl
+++ b/scripts/osd.pl
@@ -3,7 +3,7 @@ use IO::Handle;
 use vars qw($VERSION %IRSSI);
 
 use Irssi;
-$VERSION = '0.3.3';
+$VERSION = '0.3.4';
 %IRSSI = (
 	authors     => 'Jeroen Coekaerts, Koenraad Heijlen',
 	contact     => 'vipie@ulyssis.org, jeroen@coekaerts.be',
@@ -11,7 +11,7 @@ $VERSION = '0.3.3';
 	description => 'An OnScreenDisplay (osd) it show\'s who is talking to you, on what IRC Network.',
 	license     => 'BSD',
 	url         => 'http://vipie.studentenweb.org/dev/irssi/',
-	changed     => '2004-01-09'
+	changed     => '2017-06-12'
 );
 
 #--------------------------------------------------------------------
@@ -201,7 +201,8 @@ sub pipe_open {
 		}
 	}
 	
-	$command = "|DISPLAY=".Irssi::settings_get_str('osd_display') .
+	$command = 
+		"env DISPLAY=".Irssi::settings_get_str('osd_display') .
 		" osd_cat $place " .
 		" --color=".Irssi::settings_get_str('osd_color').
 		" --delay=".Irssi::settings_get_str('osd_delay').