diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-11-19 19:36:21 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-11-19 19:36:21 +0000 |
| commit | 3819189ef4c137ac4387fe0b7e7fb20314a994c3 (patch) | |
| tree | 98a8997990754c8d11e4b6f4696dfcd3f3081d69 /src/perl/irc | |
| parent | 99a6a85b858b2bced34396b840770c005cacf3ee (diff) | |
| download | irssi-3819189ef4c137ac4387fe0b7e7fb20314a994c3.zip | |
Irssi::Irc::Dcc::* is now correctly blessed instead of using Irssi::Irc::Dcc
always. did s/irssi_bless/iobject_bless/, added simple_iobject_bless which
DCC uses.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2092 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/perl/irc')
| -rw-r--r-- | src/perl/irc/Dcc.xs | 2 | ||||
| -rw-r--r-- | src/perl/irc/Irc.xs | 6 | ||||
| -rw-r--r-- | src/perl/irc/module.h | 4 | ||||
| -rw-r--r-- | src/perl/irc/typemap | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs index a46f171f..657783a7 100644 --- a/src/perl/irc/Dcc.xs +++ b/src/perl/irc/Dcc.xs @@ -9,7 +9,7 @@ PREINIT: GSList *tmp; PPCODE: for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) - XPUSHs(sv_2mortal(dcc_bless((DCC_REC *) tmp->data))); + XPUSHs(sv_2mortal(simple_iobject_bless((DCC_REC *) tmp->data))); void dcc_register_type(type) diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs index 2f742fad..7b6d0ae5 100644 --- a/src/perl/irc/Irc.xs +++ b/src/perl/irc/Irc.xs @@ -28,12 +28,12 @@ static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc) hv_store(hv, "orig_type", 9, new_pv(dcc_type2str(dcc->orig_type)), 0); hv_store(hv, "created", 7, newSViv(dcc->created), 0); - hv_store(hv, "server", 6, irssi_bless(dcc->server), 0); + hv_store(hv, "server", 6, iobject_bless(dcc->server), 0); hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0); hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0); hv_store(hv, "nick", 4, new_pv(dcc->nick), 0); - hv_store(hv, "chat", 4, dcc_bless(dcc->chat), 0); + hv_store(hv, "chat", 4, simple_iobject_bless(dcc->chat), 0); hv_store(hv, "target", 6, new_pv(dcc->target), 0); hv_store(hv, "arg", 3, new_pv(dcc->arg), 0); @@ -110,7 +110,7 @@ static void perl_netsplit_server_fill_hash(HV *hv, NETSPLIT_SERVER_REC *rec) static void perl_netsplit_channel_fill_hash(HV *hv, NETSPLIT_CHAN_REC *rec) { hv_store(hv, "name", 4, new_pv(rec->name), 0); - hv_store(hv, "nick", 4, irssi_bless(&rec->nick), 0); + hv_store(hv, "nick", 4, iobject_bless(&rec->nick), 0); } static void perl_notifylist_fill_hash(HV *hv, NOTIFYLIST_REC *notify) diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h index d90bb1bf..89aaff06 100644 --- a/src/perl/irc/module.h +++ b/src/perl/irc/module.h @@ -19,10 +19,6 @@ #include "dcc/dcc-send.h" #include "notifylist/notifylist.h" -#define dcc_bless(dcc) \ - ((dcc) == NULL ? &PL_sv_undef : \ - irssi_bless_iobject((dcc)->type, 0, dcc)) - typedef IRC_SERVER_REC *Irssi__Irc__Server; typedef IRC_SERVER_CONNECT_REC *Irssi__Irc__Connect; typedef IRC_CHANNEL_REC *Irssi__Irc__Channel; diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap index 621cec1d..d5604a77 100644 --- a/src/perl/irc/typemap +++ b/src/perl/irc/typemap @@ -29,10 +29,10 @@ T_PlainObj OUTPUT T_IrssiObj - $arg = irssi_bless((SERVER_REC *)$var); + $arg = iobject_bless((SERVER_REC *)$var); T_DccObj - $arg = dcc_bless((DCC_REC *)$var); + $arg = simple_iobject_bless((DCC_REC *)$var); T_PlainObj $arg = plain_bless($var, \"$type\"); |