diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-10-20 23:00:54 -0400 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-10-20 23:00:54 -0400 |
| commit | 3864c0814cc3e86a8035d27558f6d66af836a5a3 (patch) | |
| tree | 096e09b8961ef849f9a82b507012de94f99ea51d /protocols | |
| parent | 6a451817589df092ef5121bbe2c7156d2d01f669 (diff) | |
| parent | aea22cd1e0e955848c143a8fc36978391e9a4846 (diff) | |
Big merge from pesco, closing some OTR issues: #759, #824, #839, #830.
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/nogaim.c | 4 | ||||
| -rw-r--r-- | protocols/purple/purple.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 8fb85ea7..a44679ce 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -215,9 +215,9 @@ static void serv_got_crap( struct im_connection *ic, char *format, ... ) /* If we found one, include the screenname in the message. */ if( a ) /* FIXME(wilmer): ui_log callback or so */ - irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text ); + irc_rootmsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text ); else - irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text ); + irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text ); g_free( text ); } diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 55678f92..fe0fc35f 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -180,7 +180,7 @@ static void purple_init( account_t *acc ) default: /** No way to talk to the user right now, invent one when this becomes important. - irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n", + irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n", name, purple_account_option_get_type( o ) ); */ name = NULL; |