Changes in protocols/nogaim.c [66f783f:2087159]

File:

• protocols/nogaim.c (modified) (5 diffs)

protocols/nogaim.c

@@ -280 +280 @@
         account_t *a;
         
-        /* Nested calls might happen sometimes, this is probably the best
-           place to catch them. */
-        if( gc->flags & OPT_LOGGING_OUT )
-                return;
-        else
-                gc->flags |= OPT_LOGGING_OUT;
-        
         serv_got_crap( gc, "Signing off.." );
         
         b_event_remove( gc->keepalive );
+        gc->flags |= OPT_LOGGING_OUT;
+        
         gc->keepalive = 0;
         gc->acc->prpl->close( gc );
@@ -578 +573 @@
               ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
         {
-                irc_write( gc->irc, ":%s!%s@%s MODE %s %cv %s", gc->irc->mynick, gc->irc->mynick, gc->irc->myhost,
+                irc_write( gc->irc, ":%s MODE %s %cv %s", gc->irc->myhost,
                                                                 gc->irc->channel, u->away?'-':'+', u->nick );
         }
@@ -912 +907 @@
                                 {
                                         for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
-                                        irc_write( irc, ":%s!%s@%s MODE %s %c%s%s",
-                                                   irc->mynick, irc->mynick, irc->myhost,
+                                        irc_write( irc, ":%s MODE %s %c%s%s",
+                                                   irc->myhost,
                                                    irc->channel, pm, v, list );
                                         
@@ -928 +923 @@
                 /* $v = 'v' x $i */
                 for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
-                irc_write( irc, ":%s!%s@%s MODE %s %c%s%s", irc->mynick, irc->mynick, irc->myhost,
+                irc_write( irc, ":%s MODE %s %c%s%s", irc->myhost,
                                                             irc->channel, pm, v, list );
         }
@@ -1018 +1013 @@
                         gc->acc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
         }
+        
+        g_list_free( ms );
         
         return( 1 );