From ff4791022940c1b6330e13bcf02f859a89aa7c0d Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Mar 2005 07:40:25 +0000
Subject: * ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/tkutil.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ext/tk')

diff --git a/ext/tk/tkutil.c b/ext/tk/tkutil.c
index 3a403e74f..9de7aef6b 100644
--- a/ext/tk/tkutil.c
+++ b/ext/tk/tkutil.c
@@ -8,7 +8,7 @@
 
 ************************************************/
 
-#define TKUTIL_RELEASE_DATE "2005-03-07"
+#define TKUTIL_RELEASE_DATE "2005-03-15"
 
 #include "ruby.h"
 #include "rubysig.h"
@@ -229,6 +229,7 @@ static VALUE ary2list2 _((VALUE, VALUE, VALUE));
 static VALUE hash2list _((VALUE, VALUE));
 static VALUE hash2list_enc _((VALUE, VALUE));
 static VALUE hash2kv _((VALUE, VALUE, VALUE));
+static VALUE hash2kv_enc _((VALUE, VALUE, VALUE));
 
 static VALUE
 ary2list(ary, enc_flag, self)
@@ -262,7 +263,11 @@ ary2list(ary, enc_flag, self)
 
         case T_HASH:
             /* RARRAY(dst)->ptr[RARRAY(dst)->len++] = hash2list(val, self); */
-            val = hash2kv(val, enc_flag, self);
+            if (RTEST(enc_flag)) {
+                val = hash2kv_enc(val, Qnil, self);
+            } else {
+                val = hash2kv(val, Qnil, self);
+            }
             size2 = RARRAY(val)->len;
             for(idx2 = 0; idx2 < size2; idx2++) {
                 val2 = RARRAY(val)->ptr[idx2];
-- 
cgit