[libconfig-model-tkui-perl] 08/09: removed patch (applied upstream)

dod at debian.org dod at debian.org
Wed Mar 5 13:15:41 UTC 2014


This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-tkui-perl.

commit 3ad8893de57cc146ee3b8203eb934d5650f60257
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Mar 5 14:04:07 2014 +0100

    removed patch (applied upstream)
---
 debian/patches/fix-green-arrow-and-show-hide.patch | 40 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/fix-green-arrow-and-show-hide.patch b/debian/patches/fix-green-arrow-and-show-hide.patch
deleted file mode 100644
index 18dcc6e..0000000
--- a/debian/patches/fix-green-arrow-and-show-hide.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix green arrow and show hide.patch
- This patch fixes the logic used to display the
- green arrow. 
- Also don't hide values which have errors or warnings.
- when 
- the 'show only custom values' checkbox is set.
-Bug-Debian: 688097
-Forwarded: yes
-Author: dod
---- a/lib/Config/Model/TkUI.pm
-+++ b/lib/Config/Model/TkUI.pm
-@@ -835,13 +835,15 @@
-     my $value = $leaf_object->fetch(check => 'no', silent => 1) ;
-     my $tkt = $cw->{tktree} ;
- 
--    my ($is_customised, $img) ;
-+    my ($is_customised, $img,$has_error,$has_warning) ;
-     {
- 	no warnings qw/uninitialized/ ;
--        $is_customised = ! ( $std_v eq $value)  ;
-+        $is_customised = !! ( defined $value and ( $std_v ne $value ))  ;
- 	$img = $cust_img if $is_customised ;
--	$img = $warn_img if $leaf_object->warning_msg ;
--	$img = $error_img if $leaf_object->error_msg;
-+	$has_warning = !! $leaf_object->warning_msg ;
-+	$img = $warn_img if $has_warning ;
-+	$has_error = !! $leaf_object->error_msg;
-+	$img = $error_img if $has_error;
-     }
- 
-     if (defined $img) {
-@@ -859,7 +861,7 @@
- 
-     $tkt->itemCreate($path,3, -text => $cw->trim_value($std_v)) ;
-     
--    my $meth = ($cw->{show_only_custom} and not $is_customised) ? 'hide' : 'show' ;
-+    my $meth = ($cw->{show_only_custom} and not ($is_customised or $has_error or $has_warning)) ? 'hide' : 'show' ;
-     $tkt->$meth(entry => $path) ; 
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index aedae18..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-green-arrow-and-show-hide.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-tkui-perl.git



More information about the Pkg-perl-cvs-commits mailing list