Changeset 3864c08 for ipc.c


Ignore:
Timestamp:
2011-10-21T03:00:54Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
e6b41b1
Parents:
6a45181 (diff), aea22cd (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:

Big merge from pesco, closing some OTR issues: #759, #824, #839, #830.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ipc.c

    r6a45181 r3864c08  
    356356                        irc_switch_fd( irc, ipc_child_recv_fd );
    357357                        irc_sync( irc );
    358                         irc_usermsg( irc, "You've successfully taken over your old session" );
     358                        irc_rootmsg( irc, "You've successfully taken over your old session" );
    359359                        ipc_child_recv_fd = -1;
    360360                       
     
    374374        {
    375375                /* Master->New connection */
    376                 irc_usermsg( irc, "Could not take over old session" );
     376                irc_rootmsg( irc, "Could not take over old session" );
    377377        }
    378378}
     
    412412        /* Drop credentials, we'll shut down soon and shouldn't overwrite
    413413           any settings. */
    414         irc_usermsg( irc, "Trying to take over existing session" );
     414        irc_rootmsg( irc, "Trying to take over existing session" );
    415415       
    416416        irc_desync( irc );
Note: See TracChangeset for help on using the changeset viewer.