Changeset 3864c08 for ipc.c

Timestamp:

2011-10-21T03:00:54Z (13 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:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -356 +356 @@
                         irc_switch_fd( irc, ipc_child_recv_fd );
                         irc_sync( irc );
-                        irc_usermsg( irc, "You've successfully taken over your old session" );
+                        irc_rootmsg( irc, "You've successfully taken over your old session" );
                         ipc_child_recv_fd = -1;
                         
@@ -374 +374 @@
         {
                 /* Master->New connection */
-                irc_usermsg( irc, "Could not take over old session" );
+                irc_rootmsg( irc, "Could not take over old session" );
         }
 }
@@ -412 +412 @@
         /* Drop credentials, we'll shut down soon and shouldn't overwrite
            any settings. */
-        irc_usermsg( irc, "Trying to take over existing session" );
+        irc_rootmsg( irc, "Trying to take over existing session" );
         
         irc_desync( irc );