Changeset 69cb623 for irc_commands.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

File:

• irc_commands.c (modified) (5 diffs)

irc_commands.c

@@ -150 +150 @@
                 irc_part( irc, u, c->channel );
                 
-                if( c->gc && c->gc->prpl )
+                if( c->gc )
                 {
                         c->joined = 0;
-                        c->gc->prpl->chat_leave( c->gc, c->id );
+                        c->gc->acc->prpl->chat_leave( c->gc, c->id );
                 }
         }
@@ -173 +173 @@
                         user_t *u = user_find( irc, cmd[1] + 1 );
                         
-                        if( u && u->gc && u->gc->prpl && u->gc->prpl->chat_open )
+                        if( u && u->gc && u->gc->acc->prpl->chat_open )
                         {
                                 irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] );
                                 
-                                if( !u->gc->prpl->chat_open( u->gc, u->handle ) )
+                                if( !u->gc->acc->prpl->chat_open( u->gc, u->handle ) )
                                 {
                                         irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick );
@@ -205 +205 @@
         
         if( u && c && ( u->gc == c->gc ) )
-                if( c->gc && c->gc->prpl && c->gc->prpl->chat_invite )
-                {
-                        c->gc->prpl->chat_invite( c->gc, c->id, "", u->handle );
+                if( c->gc && c->gc->acc->prpl->chat_invite )
+                {
+                        c->gc->acc->prpl->chat_invite( c->gc, c->id, "", u->handle );
                         irc_reply( irc, 341, "%s %s", nick, channel );
                         return;
@@ -230 +230 @@
                 {
                         unsigned int i;
-                        char *t = set_getstr( irc, "default_target" );
+                        char *t = set_getstr( &irc->set, "default_target" );
                         
                         if( g_strcasecmp( t, "last" ) == 0 && irc->last_target )
@@ -477 +477 @@
                 
                 if( u->gc )
-                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->user->username,
-                                   *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", u->gc->prpl->name );
+                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->acc->user,
+                                   u->gc->acc->server && *u->gc->acc->server ? u->gc->acc->server : "",
+                                   u->gc->acc->prpl->name );
                 else
                         irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );