From 338e58cbaddc4f6cec1a2fd5e474a58249757a0b Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Tue, 24 Jul 2001 22:21:48 +0000
Subject: [PATCH] Don't crash when trying to bless NULLs

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1645 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 src/perl/common/typemap | 2 +-
 src/perl/irc/typemap    | 2 +-
 src/perl/perl-signals.c | 2 +-
 src/perl/ui/typemap     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/perl/common/typemap b/src/perl/common/typemap
index 9de29109..f7829f58 100644
--- a/src/perl/common/typemap
+++ b/src/perl/common/typemap
@@ -28,5 +28,5 @@ T_IrssiObj
 	$arg = irssi_bless((SERVER_REC *)$var);
 
 T_PlainObj
-	$arg = irssi_bless_plain(\"$type\", $var);
+	$arg = plain_bless($var, \"$type\");
 
diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap
index 5fb9bdcd..621cec1d 100644
--- a/src/perl/irc/typemap
+++ b/src/perl/irc/typemap
@@ -35,5 +35,5 @@ T_DccObj
 	$arg = dcc_bless((DCC_REC *)$var);
 
 T_PlainObj
-	$arg = irssi_bless_plain(\"$type\", $var);
+	$arg = plain_bless($var, \"$type\");
 
diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c
index 8f47e93f..d0948ad9 100644
--- a/src/perl/perl-signals.c
+++ b/src/perl/perl-signals.c
@@ -124,7 +124,7 @@ static void perl_call_signal(const char *func, int signal_id,
 			perlarg = irssi_bless((SERVER_REC *) arg);
 		} else {
 			/* blessed object */
-			perlarg = irssi_bless_plain(rec->args[n], arg);
+			perlarg = plain_bless(rec->args[n], arg);
 		}
 		XPUSHs(sv_2mortal(perlarg));
 	}
diff --git a/src/perl/ui/typemap b/src/perl/ui/typemap
index ee156e5c..2a16fe44 100644
--- a/src/perl/ui/typemap
+++ b/src/perl/ui/typemap
@@ -12,5 +12,5 @@ T_PlainObj
 OUTPUT
 
 T_PlainObj
-	$arg = irssi_bless_plain(\"$type\", $var);
+	$arg = plain_bless($var, \"$type\");