# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1049128447 0
# Node ID d5c136474f2625a82655a21e845703bbae39ec0f
# Parent  a7f77d07783b7b776adf7c39daab728c12e77a8f
[gaim-migrate @ 5255]
some compile cleanups

committer: Tailor Script <tailor@pidgin.im>

diff -r a7f77d07783b -r d5c136474f26 src/buddy.c
--- a/src/buddy.c	Mon Mar 31 16:06:26 2003 +0000
+++ b/src/buddy.c	Mon Mar 31 16:34:07 2003 +0000
@@ -256,7 +256,7 @@
 		show_add_buddy(NULL, NULL, NULL, NULL);
 	}
 }
-
+static void
 gaim_gtk_blist_remove_cb (GtkWidget *w, GaimBlistNode *node) 
 {
 	if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
diff -r a7f77d07783b -r d5c136474f26 src/gaim.h
--- a/src/gaim.h	Mon Mar 31 16:06:26 2003 +0000
+++ b/src/gaim.h	Mon Mar 31 16:34:07 2003 +0000
@@ -363,6 +363,7 @@
 extern void show_find_info(struct gaim_connection *);
 extern void show_set_info(struct gaim_connection *);
 extern void show_confirm_del(struct gaim_connection *, gchar *);
+extern void show_confirm_del_group(struct group *);
 
 /* Functions in gaimrc.c */
 extern gint sort_awaymsg_list(gconstpointer, gconstpointer);
diff -r a7f77d07783b -r d5c136474f26 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Mon Mar 31 16:06:26 2003 +0000
+++ b/src/protocols/jabber/jabber.c	Mon Mar 31 16:34:07 2003 +0000
@@ -4223,7 +4223,7 @@
 
 	puo = g_new0(struct proto_user_opt, 1);
 	puo->label = g_strdup(_("Port:"));
-	puo->def = g_strdup_printf("%d", "5222");
+	puo->def = g_strdup_printf("%d", 5222);
 	puo->pos = USEROPT_PORT;
 	ret->user_opts = g_list_append(ret->user_opts, puo);
 
diff -r a7f77d07783b -r d5c136474f26 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Mon Mar 31 16:06:26 2003 +0000
+++ b/src/protocols/msn/msn.c	Mon Mar 31 16:34:07 2003 +0000
@@ -1643,6 +1643,8 @@
 static char *msn_tooltip_text(struct buddy *b) {
 	if (b->present)
 		return g_strdup_printf(_("<b>Status:</b> %s"), msn_get_away_text(b->uc >> 1));
+
+	return NULL;
 }
 
 static GList *msn_buddy_menu(struct gaim_connection *gc, char *who)
diff -r a7f77d07783b -r d5c136474f26 src/protocols/toc/toc.c
--- a/src/protocols/toc/toc.c	Mon Mar 31 16:06:26 2003 +0000
+++ b/src/protocols/toc/toc.c	Mon Mar 31 16:34:07 2003 +0000
@@ -1283,7 +1283,7 @@
 	return "aim";
 }
 
-static void oscar_list_emblems(struct buddy *b, char **se, char **sw, char **nw, char **ne)
+static void toc_list_emblems(struct buddy *b, char **se, char **sw, char **nw, char **ne)
 {
 	char *emblems[4] = {NULL,NULL,NULL,NULL};
 	int i = 0;
@@ -1452,12 +1452,13 @@
 }
 
 G_MODULE_EXPORT void toc_init(struct prpl *ret)
-{	
+{
 	struct proto_user_opt *puo;
 	ret->protocol = PROTO_TOC;
 	ret->options = OPT_PROTO_CORRECT_TIME;
 	ret->name = g_strdup("TOC");
 	ret->list_icon = toc_list_icon;
+	ret->list_emblems = toc_list_emblems;
 	ret->away_states = toc_away_states;
 	ret->actions = toc_actions;
 	ret->buddy_menu = toc_buddy_menu;
diff -r a7f77d07783b -r d5c136474f26 src/util.c
--- a/src/util.c	Mon Mar 31 16:06:26 2003 +0000
+++ b/src/util.c	Mon Mar 31 16:34:07 2003 +0000
@@ -610,7 +610,7 @@
 	char tmp[20];
 
 	cpy[0] = '\0';
-	c = msg;
+	c = (char *)msg;
 	while (*c) {
 		switch (*c) {
 		case '%':