Changeset 08135df for irc.c


Ignore:
Timestamp:
2007-12-04T01:08:43Z (12 years ago)
Author:
ulim <a.sporto+bee@…>
Branches:
master
Children:
793cc25
Parents:
fa30fa5 (diff), aaf92a9 (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:

Merged in current devel

Wilmer van der Gaast 2007-12-02 Imported setuid() patch from Simo Leone <simo@archlinux...> with some

Wilmer van der Gaast 2007-12-02 Forgot to return something in jabber_chat_join_failed().
Wilmer van der Gaast 2007-12-02 Merging a change I should've pulled before committing three other changes.
Wilmer van der Gaast 2007-12-02 Added charset checks on incoming msgs (from the IRC side) to prevent possible
Wilmer van der Gaast 2007-12-02 Handling of presence-error packets (only useful for groupchats now), moved
Wilmer van der Gaast 2007-12-02 Defining DEBUG via CFLAGS so that it'll always be there, even when a file
Wilmer van der Gaast 2007-12-02 Removed retarded printf() (ARGH) and moved the event handling handling of
Wilmer van der Gaast 2007-11-29 printf() in daemons considered harmful.
Wilmer van der Gaast 2007-11-28 Fixed the epoll+ForkDaemon combination. The libevent event handling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    rfa30fa5 r08135df  
    324324                        }
    325325                       
    326                         if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
     326                        if( ( cs = set_getstr( &irc->set, "charset" ) ) )
    327327                        {
    328328                                conv[IRC_MAX_LINE] = 0;
    329                                 if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
    330                                         lines[i] = conv;
     329                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
     330                                {
     331                                        if( irc->status & USTATUS_LOGGED_IN )
     332                                                irc_usermsg( irc, "ERROR: Charset mismatch detected. The charset "
     333                                                                  "setting is currently set to %s, so please make "
     334                                                                  "sure your IRC client will send and accept text in "
     335                                                                  "that charset, or tell BitlBee which charset to "
     336                                                                  "expect by changing the charset setting. See "
     337                                                                  "`help set charset' for more information. Your "
     338                                                                  "message was ignored.", cs );
     339                                        *conv = 0;
     340                                }
     341                                lines[i] = conv;
    331342                        }
    332343                       
Note: See TracChangeset for help on using the changeset viewer.