[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - solenv/bin

[Robert Nagy]

 solenv/bin/build.pl |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 709068ae9b052c6d38e6a398c7aaaddc28232315
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Jan 5 13:39:04 2011 +0000

    ignore SIGPIPE for zenity

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index e6a7d96..896f90a 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2160,6 +2160,7 @@ sub zenity_enabled {
 
 sub zenity_open {
     if (zenity_enabled()) {
+	$SIG{PIPE} = 'IGNORE';
         my $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
                                "zenity --notification --listen");
     };
commit 7223f65beb36f1061e8bc12b418c7ecf9a9ed0e9
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Jan 5 13:36:37 2011 +0000

    only enable zenity for local (unix socket) displays

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 506c345..e6a7d96 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2152,9 +2152,10 @@ sub print_announce {
 };
 
 sub zenity_enabled {
-    return 0 if (!defined $ENV{DISPLAY});
     return 0 if ($ENV{ENABLE_ZENITY} ne "TRUE");
-    return 1;
+    return 0 if (!defined $ENV{DISPLAY});
+    return 1 if ($ENV{DISPLAY} =~ m/^:/); # local displays only
+    return 0;
 }
 
 sub zenity_open {