# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1094611633 0
# Node ID 2c7c6bdb938b010aef1894c84b64769ee637ab47
# Parent  ab5db2c5da79ec1c77095722d9fad48180cc1825
[gaim-migrate @ 10883]
Some stuff

committer: Tailor Script <tailor@pidgin.im>

diff -r ab5db2c5da79 -r 2c7c6bdb938b src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Wed Sep 08 02:33:53 2004 +0000
+++ b/src/protocols/novell/novell.c	Wed Sep 08 02:47:13 2004 +0000
@@ -2741,7 +2741,7 @@
 }
 
 static void
-novell_list_emblems(GaimBuddy * buddy, char **se, char **sw, char **nw, char **ne)
+novell_list_emblems(GaimBuddy * buddy, const char **se, const char **sw, const char **nw, const char **ne)
 {
 	int status = buddy->uc >> 1;
 
diff -r ab5db2c5da79 -r 2c7c6bdb938b src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Wed Sep 08 02:33:53 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Sep 08 02:47:13 2004 +0000
@@ -3473,7 +3473,8 @@
 							  "the two computers and is necessary for IM "
 							  "Images.  Because your IP address will be "
 							  "revealed, this may be considered a privacy "
-							  "risk."), 0, d, 2,
+							  "risk."),
+							GAIM_DEFAULT_ACTION_NONE, d, 2,
 							_("Connect"), G_CALLBACK(accept_direct_im_request),
 							_("Cancel"), G_CALLBACK(destroy_direct_im_request));
 							/* FIXME: we should actually send a packet on cancel */
@@ -3788,7 +3789,7 @@
 					gaim_request_action(gc, NULL, message,
 										_("Do you want to add this buddy "
 										  "to your buddy list?"),
-										0, data, 2,
+										GAIM_DEFAULT_ACTION_NONE, data, 2,
 										_("Add"), G_CALLBACK(gaim_icq_buddyadd),
 										_("Decline"), G_CALLBACK(oscar_free_name_data));
 					g_free(message);
@@ -6272,7 +6273,7 @@
 	data->nick = NULL;
 
 	gaim_request_action(gc, NULL, _("Authorization Request"), dialog_msg,
-						0, data, 2,
+						GAIM_DEFAULT_ACTION_NONE, data, 2,
 						_("Authorize"), G_CALLBACK(gaim_auth_grant),
 						_("Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt));
 
@@ -6511,7 +6512,7 @@
 	return "aim";
 }
 
-static void oscar_list_emblems(GaimBuddy *b, char **se, char **sw, char **nw, char **ne)
+static void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne)
 {
 	GaimAccount *account = NULL;
 	GaimConnection *gc = NULL;
diff -r ab5db2c5da79 -r 2c7c6bdb938b src/protocols/toc/toc.c
--- a/src/protocols/toc/toc.c	Wed Sep 08 02:33:53 2004 +0000
+++ b/src/protocols/toc/toc.c	Wed Sep 08 02:47:13 2004 +0000
@@ -1390,7 +1390,7 @@
 	return "aim";
 }
 
-static void toc_list_emblems(GaimBuddy *b, char **se, char **sw, char **nw, char **ne)
+static void toc_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne)
 {
 	char *emblems[4] = {NULL,NULL,NULL,NULL};
 	int i = 0;
diff -r ab5db2c5da79 -r 2c7c6bdb938b src/protocols/trepia/trepia.c
--- a/src/protocols/trepia/trepia.c	Wed Sep 08 02:33:53 2004 +0000
+++ b/src/protocols/trepia/trepia.c	Wed Sep 08 02:47:13 2004 +0000
@@ -359,8 +359,8 @@
 }
 
 static void
-trepia_list_emblems(GaimBuddy *b, char **se, char **sw,
-				 char **nw, char **ne)
+trepia_list_emblems(GaimBuddy *b, const char **se, const char **sw,
+					const char **nw, const char **ne)
 {
 	TrepiaProfile *profile = (TrepiaProfile *)b->proto_data;
 
diff -r ab5db2c5da79 -r 2c7c6bdb938b src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Wed Sep 08 02:33:53 2004 +0000
+++ b/src/protocols/yahoo/yahoo.c	Wed Sep 08 02:47:13 2004 +0000
@@ -2507,7 +2507,7 @@
 	return "yahoo";
 }
 
-static void yahoo_list_emblems(GaimBuddy *b, char **se, char **sw, char **nw, char **ne)
+static void yahoo_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne)
 {
 	int i = 0;
 	char *emblems[4] = {NULL,NULL,NULL,NULL};