Changeset fb00989


Ignore:
Timestamp:
2010-03-14T17:55:27Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ceebeb1
Parents:
8fb1263 (diff), c6ca3ee (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:

Adding a few consts and other misc fixes from bug #431. Doing this via a
merge because bzr can probably deal with the conflicts better than patch.

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • bitlbee.h

    r8fb1263 rfb00989  
    2727#define _BITLBEE_H
    2828
     29#ifndef _GNU_SOURCE
    2930#define _GNU_SOURCE /* Stupid GNU :-P */
     31#endif
    3032
    3133/* Depend on Windows 2000 for now since we need getaddrinfo() */
  • configure

    r8fb1263 rfb00989  
    156156
    157157echo CFLAGS=$CFLAGS >> Makefile.settings
    158 echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
     158echo CFLAGS+=-I`pwd` -iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings
    159159
    160160echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
  • lib/misc.c

    r8fb1263 rfb00989  
    3434#include "nogaim.h"
    3535#include "base64.h"
     36#include "md5.h"
    3637#include <stdio.h>
    3738#include <stdlib.h>
     
    523524
    524525/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
    525 char *word_wrap( char *msg, int line_len )
     526char *word_wrap( const char *msg, int line_len )
    526527{
    527528        GString *ret = g_string_sized_new( strlen( msg ) + 16 );
  • lib/misc.h

    r8fb1263 rfb00989  
    6262G_MODULE_EXPORT struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain );
    6363
    64 G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
     64G_MODULE_EXPORT char *word_wrap( const char *msg, int line_len );
    6565
    6666G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
  • protocols/msn/msn.c

    r8fb1263 rfb00989  
    2626#include "nogaim.h"
    2727#include "msn.h"
     28
     29int msn_chat_id;
     30GSList *msn_connections;
     31GSList *msn_switchboards;
    2832
    2933static char *msn_set_display_name( set_t *set, char *value );
  • protocols/msn/msn.h

    r8fb1263 rfb00989  
    135135#define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
    136136
    137 int msn_chat_id;
     137extern int msn_chat_id;
    138138extern const struct msn_away_state msn_away_state_list[];
    139139extern const struct msn_status_code msn_status_code_list[];
     
    144144   connection), the callback should check whether it's still listed here
    145145   before doing *anything* else. */
    146 GSList *msn_connections;
    147 GSList *msn_switchboards;
     146extern GSList *msn_connections;
     147extern GSList *msn_switchboards;
    148148
    149149/* ns.c */
  • protocols/nogaim.c

    r8fb1263 rfb00989  
    371371/* list.c */
    372372
    373 void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
     373void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
    374374{
    375375        user_t *u;
     
    445445}
    446446
    447 void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
     447void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
    448448{
    449449        user_t *u = user_findhandle( ic, handle );
     
    480480}
    481481
    482 void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
     482void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
    483483{
    484484        user_t *u;
     
    490490/* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
    491491   modules to suggest a nickname for a handle. */
    492 void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
     492void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
    493493{
    494494        user_t *u = user_findhandle( ic, handle );
     
    702702}
    703703
    704 void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at )
     704void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
    705705{
    706706        irc_t *irc = ic->irc;
     
    835835}
    836836
    837 void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
     837void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
    838838{
    839839        struct im_connection *ic = c->ic;
     
    907907/* buddy_chat.c */
    908908
    909 void imcb_chat_add_buddy( struct groupchat *b, char *handle )
     909void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
    910910{
    911911        user_t *u = user_findhandle( b->ic, handle );
     
    942942
    943943/* This function is one BIG hack... :-( EREWRITE */
    944 void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
     944void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
    945945{
    946946        user_t *u;
  • protocols/nogaim.h

    r8fb1263 rfb00989  
    275275 * user, usually after a login, or if the user added a buddy and the IM
    276276 * server confirms that the add was successful. Don't forget to do this! */
    277 G_MODULE_EXPORT void imcb_add_buddy( struct im_connection *ic, char *handle, char *group );
    278 G_MODULE_EXPORT void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group );
     277G_MODULE_EXPORT void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group );
     278G_MODULE_EXPORT void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group );
    279279G_MODULE_EXPORT struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle );
    280 G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname );
    281 G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick );
     280G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname );
     281G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick );
    282282
    283283/* Buddy activity */
     
    289289/* Not implemented yet! */ G_MODULE_EXPORT void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle );
    290290/* Call when a handle says something. 'flags' and 'sent_at may be just 0. */
    291 G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at );
     291G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at );
    292292G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags );
    293293G_MODULE_EXPORT void imcb_clean_handle( struct im_connection *ic, char *handle );
     
    302302 *   user, too. */
    303303G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
    304 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, char *handle );
     304G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, const char *handle );
    305305/* To remove a handle from a group chat. Reason can be NULL. */
    306 G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason );
     306G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason );
    307307/* To tell BitlBee 'who' said 'msg' in 'c'. 'flags' and 'sent_at' can be 0. */
    308 G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at );
     308G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at );
    309309/* System messages specific to a groupchat, so they can be displayed in the right context. */
    310310G_MODULE_EXPORT void imcb_chat_log( struct groupchat *c, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
Note: See TracChangeset for help on using the changeset viewer.