Changeset fb62f81f

Timestamp:

2006-06-03T19:51:16Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5a5c926, 9779c18

Parents:

c38e965

Message:

Implemented netsplits for "account off".

Files:

• irc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)

irc.c

@@ -899 +899 @@
 void irc_kill( irc_t *irc, user_t *u )
 {
-        char *nick;
-        
-        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, "Leaving..." );
+        char *nick, *s;
+        char reason[64];
+        
+        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
+        {
+                if( u->gc->user->proto_opt[0][0] )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    u->gc->user->proto_opt[0] );
+                else if( ( s = strchr( u->gc->username, '@' ) ) )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    s + 1 );
+                else
+                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
+                                    u->gc->prpl->name, irc->myhost );
+                
+                /* proto_opt might contain garbage after the : */
+                if( ( s = strchr( reason, ':' ) ) )
+                        *s = 0;
+        }
+        else
+        {
+                strcpy( reason, "Leaving..." );
+        }
+        
+        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
         
         nick = g_strdup( u->nick );

protocols/nogaim.c

@@ -295 +295 @@
         
         serv_got_crap( gc, "Signing off.." );
-
+        gc->flags |= OPT_LOGGING_OUT;
+        
         gaim_input_remove( gc->keepalive );
         gc->keepalive = 0;

protocols/nogaim.h

@@ -54 +54 @@
 #define WEBSITE "http://www.bitlbee.org/"
 #define IM_FLAG_AWAY 0x0020
-#define OPT_CONN_HTML 0x00000001
-#define OPT_LOGGED_IN 0x00010000
 #define GAIM_AWAY_CUSTOM "Custom"
+
+#define OPT_CONN_HTML   0x00000001
+#define OPT_LOGGED_IN   0x00010000
+#define OPT_LOGGING_OUT 0x00020000
 
 /* ok. now the fun begins. first we create a connection structure */