From e67e513a16f3e545fd71eb176aac83d41a1dc271 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Oct 2011 16:56:58 +0200 Subject: rename irc_usermsg to irc_rootmsg. add new irc_usermsg, irc_usernotice. deliver user-specific messages from libotr as notices to that user. --- ipc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipc.c') diff --git a/ipc.c b/ipc.c index 884039d2..8fe5a987 100644 --- a/ipc.c +++ b/ipc.c @@ -355,7 +355,7 @@ static void ipc_child_cmd_takeover( irc_t *irc, char **cmd ) { 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; ipc_to_master_str( "TAKEOVER DONE\r\n" ); @@ -373,7 +373,7 @@ static void ipc_child_cmd_takeover( irc_t *irc, char **cmd ) else if( strcmp( cmd[1], "FAIL" ) == 0 ) { /* Master->New connection */ - irc_usermsg( irc, "Could not take over old session" ); + irc_rootmsg( irc, "Could not take over old session" ); } } @@ -411,7 +411,7 @@ static void ipc_child_cmd_takeover_yes( void *data ) /* 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 ); -- cgit v1.2.3 From 4c225f062d3f7c9474890692caffb34768fb7b15 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 19 Oct 2011 23:18:23 -0400 Subject: Drop the on-disk IPC socket by default. Nothing uses it. If one really wants it, it can be restored using the --ipcsocket= configure option. --- ipc.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ipc.c') diff --git a/ipc.c b/ipc.c index 884039d2..5da9d8e4 100644 --- a/ipc.c +++ b/ipc.c @@ -908,6 +908,9 @@ int ipc_master_listen_socket() struct sockaddr_un un_addr; int serversock; + if (!IPCSOCKET || !*IPCSOCKET) + return 1; + /* Clean up old socket files that were hanging around.. */ if (unlink(IPCSOCKET) == -1 && errno != ENOENT) { log_message( LOGLVL_ERROR, "Could not remove old IPC socket at %s: %s", IPCSOCKET, strerror(errno) ); -- cgit v1.2.3