Mercurial > pidgin.yaz
changeset 3279:86fdd015f40e
[gaim-migrate @ 3297]
Fewer compile warnings! Thanks, Ari Pollak (I even spelled your name correctly)
Also, I think one of these warnings may have fixed a sporadic Hotmail auth failure;
let me know if you still get those.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 29 May 2002 01:23:38 +0000 |
| parents | 30ca1b76ad0c |
| children | c98c1e0281ff |
| files | src/buddy.c src/gaim.h src/protocols/gg/iconv_string.c src/protocols/msn/msn.c src/protocols/oscar/oscar.c src/sound.c src/util.c |
| diffstat | 7 files changed, 20 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Wed May 29 00:24:41 2002 +0000 +++ b/src/buddy.c Wed May 29 01:23:38 2002 +0000 @@ -37,6 +37,7 @@ #include <math.h> #include <time.h> #include <unistd.h> +#include <ctype.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h>
--- a/src/gaim.h Wed May 29 00:24:41 2002 +0000 +++ b/src/gaim.h Wed May 29 01:23:38 2002 +0000 @@ -345,6 +345,8 @@ /* Functions in conversation.c */ extern void write_to_conv(struct conversation *, char *, int, char *, time_t, int); extern struct conversation *find_conversation(char *); +extern void set_anim(); +extern void set_blist_tab(); /* Functions in dialogs.c */ extern void g_show_info_text(struct gaim_connection *, char *, int, char *, ...);
--- a/src/protocols/gg/iconv_string.c Wed May 29 00:24:41 2002 +0000 +++ b/src/protocols/gg/iconv_string.c Wed May 29 01:23:38 2002 +0000 @@ -74,7 +74,7 @@ { size_t count = 0; char tmpbuf[tmpbufsize]; - const char* inptr = start; + char* inptr = (char *)start; size_t insize = end-start; while (insize > 0) { char* outptr = tmpbuf; @@ -126,7 +126,7 @@ iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */ /* Do the conversion for real. */ { - const char* inptr = start; + char* inptr = (char *)start; size_t insize = end-start; char* outptr = result; size_t outsize = length;
--- a/src/protocols/msn/msn.c Wed May 29 00:24:41 2002 +0000 +++ b/src/protocols/msn/msn.c Wed May 29 01:23:38 2002 +0000 @@ -1242,7 +1242,6 @@ char hippy[2048]; char *rru; char *passport; - char *filename; GET_NEXT(tmp); GET_NEXT(tmp); @@ -1250,7 +1249,7 @@ GET_NEXT(tmp); passport = tmp; - snprintf(hippy, sizeof(hippy), "%s%d%s", md->mspauth, time(NULL) - md->sl, gc->password); + snprintf(hippy, sizeof(hippy), "%s%lu%s", md->mspauth, time(NULL) - md->sl, gc->password); md5_init(&st); md5_append(&st, (const md5_byte_t *)hippy, strlen(hippy));
--- a/src/protocols/oscar/oscar.c Wed May 29 00:24:41 2002 +0000 +++ b/src/protocols/oscar/oscar.c Wed May 29 01:23:38 2002 +0000 @@ -2503,7 +2503,7 @@ * parse-icq-status-message function knows if it is putting it's message in * an info window because the name will _not_ be in od->evilhack. For getting * only the away message the contact's UIN is put in od->evilhack. */ - if (budlight = find_buddy(gc, who)) { + if ((budlight = find_buddy(gc, who))) { if ((budlight->uc >> 7) & (AIM_ICQ_STATE_AWAY || AIM_ICQ_STATE_DND || AIM_ICQ_STATE_OUT || AIM_ICQ_STATE_BUSY || AIM_ICQ_STATE_CHAT)) { if (budlight->caps & AIM_CAPS_ICQSERVERRELAY) g_show_info_text(gc, who, 0, buf, NULL);
--- a/src/sound.c Wed May 29 00:24:41 2002 +0000 +++ b/src/sound.c Wed May 29 01:23:38 2002 +0000 @@ -56,17 +56,17 @@ * per pounce. NULL option means it doesn't get displayed in the sound * * preferences box */ struct sound_struct sounds[NUM_SOUNDS] = { - N_("Buddy logs in"), OPT_SOUND_LOGIN, BuddyArrive, sizeof(BuddyArrive), - N_("Buddy logs out"), OPT_SOUND_LOGOUT, BuddyLeave, sizeof(BuddyLeave), - N_("Message received"), OPT_SOUND_RECV, Receive, sizeof(Receive), - N_("Message received begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive), - N_("Message sent"), OPT_SOUND_SEND, Send, sizeof(Send), - N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, BuddyArrive, sizeof(BuddyArrive), - N_("Person leaves chat"), OPT_SOUND_CHAT_PART, BuddyLeave, sizeof(BuddyLeave), - N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, Send, sizeof(Send), - N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, Receive, sizeof(Receive), - NULL, 0, RedAlert, sizeof(RedAlert), - N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive) + {N_("Buddy logs in"), OPT_SOUND_LOGIN, BuddyArrive, sizeof(BuddyArrive)}, + {N_("Buddy logs out"), OPT_SOUND_LOGOUT, BuddyLeave, sizeof(BuddyLeave)}, + {N_("Message received"), OPT_SOUND_RECV, Receive, sizeof(Receive)}, + {N_("Message received begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive)}, + {N_("Message sent"), OPT_SOUND_SEND, Send, sizeof(Send)}, + {N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, BuddyArrive, sizeof(BuddyArrive)}, + {N_("Person leaves chat"), OPT_SOUND_CHAT_PART, BuddyLeave, sizeof(BuddyLeave)}, + {N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, Send, sizeof(Send)}, + {N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, Receive, sizeof(Receive)}, + {NULL, 0, RedAlert, sizeof(RedAlert)}, + {N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive)} }; static int check_dev(char *dev)
--- a/src/util.c Wed May 29 00:24:41 2002 +0000 +++ b/src/util.c Wed May 29 01:23:38 2002 +0000 @@ -928,7 +928,7 @@ gchar *strdup_withhtml(const gchar *src) { - char *sp, *dest; + gchar *sp, *dest; gulong destsize; /* @@ -936,7 +936,7 @@ * additional length of "<BR>" over "\n"), account for the * terminator, malloc the space and call strncpy_withhtml. */ - for(destsize = 0, sp = src; (sp = strchr(sp, '\n')) != NULL; ++sp, ++destsize) + for(destsize = 0, sp = (gchar *)src; (sp = strchr(sp, '\n')) != NULL; ++sp, ++destsize) ; destsize *= 3; destsize += strlen(src) + 1;