mirror of
https://github.com/irssi/irssi.git
synced 2026-08-19 08:32:07 +02:00
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
This commit is contained in:
parent
99a6a85b85
commit
3819189ef4
14 changed files with 35 additions and 31 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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\");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue