From b8fa764d866874104c7f2f986804966c0328faf5 Mon Sep 17 00:00:00 2001
From: pad <pad@mandriva.com>
Date: Mon, 6 Sep 1999 22:57:36 +0000
Subject: zork dont know zhy

---
 perl-install/interactive.pm     |  9 +++++----
 perl-install/interactive_gtk.pm |  8 ++++++--
 perl-install/share/po/no.po     | 14 +++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 2f3fb4c15..fe941bd30 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -89,12 +89,13 @@ sub ask_many_from_list($$$$;$) {
       [ map { $$_ } @$val ] : undef;
 }
 
-sub ask_from_entry($$$;$) {
-    my ($o, $title, $message, $def) = @_;
+sub ask_from_entry($$$;$%) {
+    my ($o, $title, $message, $def, %callback) = @_;
 
+    
     $message = ref $message ? $message : [ $message ];
-
-    $o->ask_from_entryW($title, $message, $def);
+    $o->ask_from_entries($title, $message, [$def], %callback);
+#    $o->ask_from_entryW($title, $message, $def);
 }
 
 sub ask_from_entries($$$$;$%) {
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 53528aac1..0403b188a 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -149,8 +149,12 @@ sub ask_from_entries_refW {
 	$entry->signal_connect(key_press_event => sub {
 	   my ($w, $e) = @_;
 	   my $c = chr $e->{keyval};
-	   &$go_to_next if $c eq "\x8d";
-	   });
+	   if ($c eq "\x8d")
+	     {
+		 $w->signal_emit_stop("key_press_event");
+	     }
+	    ;
+	    });
 	
 	$entry->set_text(${$val->[$i]{val}})  if ${$val->[$i]{val}};
 	$entry->set_visibility(0) if $val->[$i]{hidden};
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index edbc5c8bb..7f5dd1999 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: panoramix VERSION\n"
-"POT-Creation-Date: 1999-09-06 22:38+0200\n"
+"POT-Creation-Date: 1999-09-07 00:43+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -1551,23 +1551,23 @@ msgid "Starting step `%s'\n"
 msgstr "Starter steg `%s'\n"
 
 #: ../interactive.pm_.c:47 ../interactive.pm_.c:57 ../my_gtk.pm_.c:174
-#: ../my_gtk.pm_.c:318 ../my_gtk.pm_.c:401
+#: ../my_gtk.pm_.c:319 ../my_gtk.pm_.c:402
 msgid "Ok"
 msgstr "Ok"
 
-#: ../interactive.pm_.c:52 ../my_gtk.pm_.c:317
+#: ../interactive.pm_.c:52 ../my_gtk.pm_.c:318
 msgid "No"
 msgstr "Nei"
 
-#: ../interactive.pm_.c:52 ../my_gtk.pm_.c:317
+#: ../interactive.pm_.c:52 ../my_gtk.pm_.c:318
 msgid "Yes"
 msgstr "Ja"
 
-#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:175 ../my_gtk.pm_.c:318
+#: ../interactive.pm_.c:57 ../my_gtk.pm_.c:175 ../my_gtk.pm_.c:319
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../interactive.pm_.c:132
+#: ../interactive.pm_.c:133
 msgid "Please wait"
 msgstr "Vennligst vent"
 
@@ -1718,7 +1718,7 @@ msgstr ""
 msgid "Yugoslavian (latin layout)"
 msgstr ""
 
-#: ../my_gtk.pm_.c:318
+#: ../my_gtk.pm_.c:319
 msgid "Is it ok?"
 msgstr "Er det ok?"
 
-- 
cgit v1.2.1