From 436a081d985d376060908b1db436a6ad2691d593 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 29 May 2000 11:02:40 +0000
Subject: *** empty log message ***

---
 perl-install/ChangeLog          | 1 -
 perl-install/detect_devices.pm  | 6 +++---
 perl-install/interactive_gtk.pm | 4 ++--
 perl-install/my_gtk.pm          | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index f9d177b84..75efebfac 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -40,7 +40,6 @@
 	* partition_table_sun.pm: fixed a bug when reading partition table
 	with unused partition in the middle of the table.
 
->>>>>>> 1.114
 2000-05-23  François Pons  <fpons@mandrakesoft.com>
 
 	* common.pm: update arch to take into account sparc and sparc64. added
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index eedaa33fd..561ba1fd2 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -146,16 +146,16 @@ sub getCompaqSmartArray() {
 }
 
 sub getDAC960() {
-    my @idi;
+    my %idi;
 
     #- We are looking for lines of this format:DAC960#0:
     #- /dev/rd/c0d0: RAID-7, Online, 17928192 blocks, Write Thru0123456790123456789012
     foreach (syslog()) {
 	my ($device, $info) = m|/dev/(rd/.*?): (.*?),| or next;
-	push @idi, { info => $info, type => 'hd', device => $device };
+	$idi{$device} = { info => $info, type => 'hd', device => $device };
 	log::l("DAC960: $device ($info)");
     }
-    @idi;
+    values %idi;
 }
 
 sub net2module() {
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index d3f773fbf..dffcca5cd 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -125,7 +125,7 @@ sub ask_from_treelistW {
     $tree->signal_connect(button_press_event => sub { &$leave if $_[1]{type} =~ /^2/ });
     $tree->signal_connect(key_press_event => sub {
         my ($w, $e) = @_;
-	my $c = chr $e->{keyval};
+	my $c = chr($e->{keyval} & 0xff);
 	$curr or return;
 	if ($e->{keyval} >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' ') {
 	    if ($curr->row->is_leaf) { &$leave }
@@ -261,7 +261,7 @@ sub ask_from_entries_refW {
 		my ($w, $e) = @_;
 		#-don't know why it works, i believe that
 		#-i must say before &$go_to_next, but with it doen't work HACK!
-		$w->signal_emit_stop("key_press_event") if chr($e->{keyval}) eq "\x8d";
+		$w->signal_emit_stop("key_press_event") if chr($e->{keyval} & 0xff) eq "\x8d";
 	    });
 	    $widget->set_text(${$val->[$i]{val}});
 	    $widget->set_visibility(0) if $val->[$i]{hidden};
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index d02aaf8d2..200ada856 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -422,7 +422,7 @@ sub create_treeitem($) {
     my $w = new Gtk::TreeItem($name);
     $w->signal_connect(key_press_event => sub {
         my (undef, $e) = @_;
-        local $_ = chr ($e->{keyval} & 0xff);
+        local $_ = chr ($e->{keyval});
 
 	if ($e->{keyval} > 0x100) {
 	    my $n;
@@ -500,7 +500,7 @@ sub _ask_from_list {
     });
     $list->signal_connect(key_press_event => sub {
         my ($w, $e) = @_;
-	my $c = chr $e->{keyval};
+	my $c = chr($e->{keyval} & 0xff);
 
 	Gtk->timeout_remove($timeout) if $timeout; $timeout = '';
 
@@ -573,7 +573,7 @@ sub _ask_from_list_with_help {
     });
     $list->signal_connect(key_press_event => sub {
         my ($w, $e) = @_;
-	my $c = chr $e->{keyval};
+	my $c = chr($e->{keyval} & 0xff);
 
 	Gtk->timeout_remove($timeout) if $timeout; $timeout = '';
 
-- 
cgit v1.2.1