Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22007/src
Modified Files:
buddy.c gaim.h sound.c util.c
Log Message:
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.
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- buddy.c 29 May 2002 00:24:41 -0000 1.315
+++ buddy.c 29 May 2002 01:23:37 -0000 1.316
@@ -37,6 +37,7 @@
#include <math.h>
#include <time.h>
#include <unistd.h>
+#include <ctype.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- gaim.h 7 May 2002 23:12:14 -0000 1.324
+++ gaim.h 29 May 2002 01:23:38 -0000 1.325
@@ -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 *, ...);
Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sound.c 6 May 2002 17:21:18 -0000 1.57
+++ sound.c 29 May 2002 01:23:38 -0000 1.58
@@ -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)
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- util.c 8 May 2002 00:21:26 -0000 1.120
+++ util.c 29 May 2002 01:23:38 -0000 1.121
@@ -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;
|
