# HG changeset patch # User Mark Doliner # Date 1054444723 0 # Node ID 4e2ffa3d9094d03263b7becf24cfd9d316b30a77 # Parent e2ff6f1569175de24fe3b0494c36adf568acd6c4 [gaim-migrate @ 6037] Constification. Also, what was I going--oh yeah, fixes a compile warning in oscar.c Maybe I should be casting all of the 0.5s to ints? Eh. committer: Tailor Script diff -r e2ff6f156917 -r 4e2ffa3d9094 src/core.h --- a/src/core.h Sun Jun 01 04:25:17 2003 +0000 +++ b/src/core.h Sun Jun 01 05:18:43 2003 +0000 @@ -122,16 +122,16 @@ extern void save_prefs(); /* Functions in server.c */ -extern void serv_got_update(GaimConnection *, char *, int, int, time_t, time_t, int); +extern void serv_got_update(GaimConnection *, const char *, int, int, time_t, time_t, int); extern void serv_got_im(GaimConnection *, const char *, const char *, guint32, time_t, gint); -extern void serv_got_typing(GaimConnection *, char *, int, int); -extern void serv_got_typing_stopped(GaimConnection *, char *); -extern void serv_got_eviled(GaimConnection *, char *, int); -extern void serv_got_chat_invite(GaimConnection *, char *, char *, char *, GHashTable *); -extern struct gaim_conversation *serv_got_joined_chat(GaimConnection *, int, char *); +extern void serv_got_typing(GaimConnection *, const char *, int, int); +extern void serv_got_typing_stopped(GaimConnection *, const char *); +extern void serv_got_eviled(GaimConnection *, const char *, int); +extern void serv_got_chat_invite(GaimConnection *, const char *, const char *, const char *, GHashTable *); +extern struct gaim_conversation *serv_got_joined_chat(GaimConnection *, int, const char *); extern void serv_got_chat_left(GaimConnection *, int); extern void serv_got_chat_in(GaimConnection *, int, char *, int, char *, time_t); -extern void serv_got_alias(GaimConnection *, char *, char *); +extern void serv_got_alias(GaimConnection *, const char *, const char *); extern void serv_finish_login(); #endif /* _CORE_H_ */ diff -r e2ff6f156917 -r 4e2ffa3d9094 src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Sun Jun 01 04:25:17 2003 +0000 +++ b/src/protocols/oscar/oscar.c Sun Jun 01 05:18:43 2003 +0000 @@ -3176,7 +3176,7 @@ "%s\n" "
\n"), info->sn, images(info->flags), - (info->warnlevel/10.0) + 0.5, + (int)((info->warnlevel/10.0) + 0.5), onlinesince ? onlinesince : "", membersince ? membersince : "", idle ? idle : ""); diff -r e2ff6f156917 -r 4e2ffa3d9094 src/server.c --- a/src/server.c Sun Jun 01 04:25:17 2003 +0000 +++ b/src/server.c Sun Jun 01 05:18:43 2003 +0000 @@ -461,7 +461,7 @@ } } -void serv_got_alias(GaimConnection *gc, char *who, char *alias) { +void serv_got_alias(GaimConnection *gc, const char *who, const char *alias) { struct buddy *b = gaim_find_buddy(gc->account, who); if(!b) return; @@ -1023,7 +1023,7 @@ -void serv_got_update(GaimConnection *gc, char *name, int loggedin, +void serv_got_update(GaimConnection *gc, const char *name, int loggedin, int evil, time_t signon, time_t idle, int type) { GaimAccount *account; @@ -1147,7 +1147,7 @@ } -void serv_got_eviled(GaimConnection *gc, char *name, int lev) +void serv_got_eviled(GaimConnection *gc, const char *name, int lev) { char buf2[1024]; @@ -1169,7 +1169,7 @@ gaim_notify_info(NULL, NULL, buf2, NULL); } -void serv_got_typing(GaimConnection *gc, char *name, int timeout, +void serv_got_typing(GaimConnection *gc, const char *name, int timeout, int state) { struct buddy *b; @@ -1196,7 +1196,7 @@ gaim_im_start_typing_timeout(im, timeout); } -void serv_got_typing_stopped(GaimConnection *gc, char *name) { +void serv_got_typing_stopped(GaimConnection *gc, const char *name) { struct gaim_conversation *c = gaim_find_conversation(name); struct gaim_im *im; @@ -1241,8 +1241,8 @@ -void serv_got_chat_invite(GaimConnection *gc, char *name, - char *who, char *message, GHashTable *data) +void serv_got_chat_invite(GaimConnection *gc, const char *name, + const char *who, const char *message, GHashTable *data) { GaimAccount *account; char buf2[BUF_LONG]; @@ -1271,7 +1271,7 @@ } struct gaim_conversation *serv_got_joined_chat(GaimConnection *gc, - int id, char *name) + int id, const char *name) { struct gaim_conversation *b; struct gaim_chat *chat;