[SCM] Debian packaging of libconfig-model-tkui-perl branch, master, updated. debian/1.337-1-4-g30282db
Dominique Dumont
dod at debian.org
Wed Sep 19 15:16:39 UTC 2012
The following commit has been merged in the master branch:
commit 47e8f978601a6d78388d539576a95fcf2a70f00d
Author: Dominique Dumont <dod at debian.org>
Date: Wed Sep 19 14:04:21 2012 +0200
added patch to fix green arrow display
diff --git a/debian/patches/fix-green-arrow-and-show-hide.patch b/debian/patches/fix-green-arrow-and-show-hide.patch
new file mode 100644
index 0000000..8185f56
--- /dev/null
+++ b/debian/patches/fix-green-arrow-and-show-hide.patch
@@ -0,0 +1,33 @@
+diff --git a/lib/Config/Model/TkUI.pm b/lib/Config/Model/TkUI.pm
+index ef11807..f69dfc5 100644
+--- a/lib/Config/Model/TkUI.pm
++++ b/lib/Config/Model/TkUI.pm
+@@ -823,13 +823,15 @@ sub disp_leaf {
+ 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) {
+@@ -847,7 +849,7 @@ sub disp_leaf {
+
+ $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
index e69de29..aedae18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-green-arrow-and-show-hide.patch
--
Debian packaging of libconfig-model-tkui-perl
More information about the Pkg-perl-cvs-commits
mailing list