Changeset 3864c08 for irc.c

Timestamp:

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

• irc.c (modified) (4 diffs)

irc.c

@@ -363 +363 @@
                                         if( irc->status & USTATUS_LOGGED_IN )
                                         {
-                                                irc_usermsg( irc, "Error: Charset mismatch detected. The charset "
+                                                irc_rootmsg( irc, "Error: Charset mismatch detected. The charset "
                                                                   "setting is currently set to %s, so please make "
                                                                   "sure your IRC client will send and accept text in "
@@ -767 +767 @@
                         irc->root->last_channel = irc->default_channel;
                         
-                        irc_usermsg( irc,
+                        irc_rootmsg( irc,
                                      "Welcome to the BitlBee gateway!\n\n"
                                      "If you've never used BitlBee before, please do read the help "
@@ -910 +910 @@
                 g_free( test );
                 g_iconv_close( oc );
-                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
+                irc_rootmsg( irc, "Unsupported character set: The IRC protocol "
                                   "only supports 8-bit character sets." );
                 return NULL;
@@ -941 +941 @@
         GSList *l;
         
-        irc_usermsg( irc, "Setting `%s' is obsolete, use the `show_users' "
+        irc_rootmsg( irc, "Setting `%s' is obsolete, use the `show_users' "
                      "channel setting instead.", set->key );