[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.99,1.100 im.c,1.44,1.45 oscar.c,1.409,1.410

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv25822/src/protocols/oscar

Modified Files:
	aim.h im.c oscar.c 
Log Message:
I made a lot of server.c functions use const chat * instead of const *

Made the alias entry have focus in the alias buddy dialog.

Fixed a typo thanks to J. Silvestri


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- aim.h	20 Jun 2003 04:16:22 -0000	1.99
+++ aim.h	8 Jul 2003 03:36:40 -0000	1.100
@@ -859,7 +859,7 @@
 /* 0x0006 */ faim_export int aim_im_sendch4(aim_session_t *sess, char *sn, fu16_t type, fu8_t *message);
 /* 0x0008 */ faim_export int aim_im_warn(aim_session_t *sess, aim_conn_t *conn, const char *destsn, fu32_t flags);
 /* 0x000b */ faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const char *cookie, fu16_t code);
-/* 0x0014 */ faim_export int aim_im_sendmtn(aim_session_t *sess, fu16_t type1, char *sn, fu16_t type2);
+/* 0x0014 */ faim_export int aim_im_sendmtn(aim_session_t *sess, fu16_t type1, const char *sn, fu16_t type2);
 
 
 

Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- im.c	29 Jun 2003 01:00:21 -0000	1.44
+++ im.c	8 Jul 2003 03:36:40 -0000	1.45
@@ -2186,7 +2186,7 @@
  * and Gaim 0.60 and newer.
  *
  */
-faim_export int aim_im_sendmtn(aim_session_t *sess, fu16_t type1, char *sn, fu16_t type2)
+faim_export int aim_im_sendmtn(aim_session_t *sess, fu16_t type1, const char *sn, fu16_t type2)
 {
 	aim_conn_t *conn;
 	aim_frame_t *fr;

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -d -r1.409 -r1.410
--- oscar.c	7 Jul 2003 14:49:55 -0000	1.409
+++ oscar.c	8 Jul 2003 03:36:40 -0000	1.410
@@ -2282,7 +2282,7 @@
 		serv_got_chat_invite(gc,
 				     name ? name : args->info.chat.roominfo.name,
 				     userinfo->sn,
-				     (char *)args->msg,
+				     args->msg,
 				     components);
 		if (name)
 			g_free(name);
@@ -4208,7 +4208,7 @@
 	aim_flap_nop(od->sess, od->conn);
 }
 
-static int oscar_send_typing(GaimConnection *gc, char *name, int typing) {
+static int oscar_send_typing(GaimConnection *gc, const char *name, int typing) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 	struct direct_im *dim = find_direct_im(od, name);
 	if (dim)
@@ -4572,7 +4572,7 @@
 	return;
 }
 
-static void oscar_set_away(GaimConnection *gc, char *state, char *message)
+static void oscar_set_away(GaimConnection *gc, const char *state, const char *message)
 {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 
@@ -4584,7 +4584,7 @@
 	return;
 }
 
-static void oscar_warn(GaimConnection *gc, char *name, int anon) {
+static void oscar_warn(GaimConnection *gc, const char *name, int anon) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 	aim_im_warn(od->sess, od->conn, name, anon ? AIM_WARN_ANON : 0);
 }
@@ -4645,7 +4645,7 @@
 #endif
 }
 
-static void oscar_remove_buddy(GaimConnection *gc, char *name, char *group) {
+static void oscar_remove_buddy(GaimConnection *gc, const char *name, const char *group) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 #ifdef NOSSI
 	aim_remove_buddy(od->sess, od->conn, name);
@@ -5252,7 +5252,7 @@
 	serv_got_chat_left(g, gaim_chat_get_id(GAIM_CHAT(b)));
 }
 
-static int oscar_chat_send(GaimConnection *g, int id, char *message) {
+static int oscar_chat_send(GaimConnection *g, int id, const char *message) {
 	struct oscar_data *od = (struct oscar_data *)g->proto_data;
 	GSList *bcs = g->buddy_chats;
 	GaimConversation *b = NULL;
@@ -6190,7 +6190,7 @@
 	}
 }
 
-static void oscar_convo_closed(GaimConnection *gc, char *who)
+static void oscar_convo_closed(GaimConnection *gc, const char *who)
 {
 	struct oscar_data *od = gc->proto_data;
 	struct direct_im *dim = find_direct_im(od, who);