[Gaim-commits] CVS: gaim/src/protocols/oscar im.c,1.21,1.22 oscar.c,1.132,1.133

[Sean E. <sea...@us...>]

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

Modified Files:
	im.c oscar.c 
Log Message:
new shortcuts:
Ctrl--  Decrease Font Size
Ctrl-=  Increase Font Size
Ctrl-0  Normal Font Size
Ctrl-F  Select Font
Ctrl-C  Text Color
Ctrl-W  Close IM/Chat Window (or Tab, if using tabbed conversations)
Ctrl-N  New IM/Chat Tab (if using tabbed conversations)
Ctrl-Z  Minimize (Iconify) IM/Chat Window
-As suggested by Shreedeep K Bhachech



Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- im.c	12 Apr 2002 02:43:50 -0000	1.21
+++ im.c	20 Apr 2002 08:10:13 -0000	1.22
@@ -1603,7 +1603,7 @@
 	aim_rxcallback_t userfunc;
 	aim_tlv_t *block;
 	struct aim_incomingim_ch4_args args;
-	int ret;
+	int ret = 0;
 
 	/*
 	 * Make a bstream for the meaty part.  Yum.  Meat.

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- oscar.c	15 Apr 2002 03:23:09 -0000	1.132
+++ oscar.c	20 Apr 2002 08:10:13 -0000	1.133
@@ -1444,7 +1444,7 @@
 static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
 	char *uin, message;
 	struct oscar_data *od = (struct oscar_data *)data->gc->proto_data;
-	uin = g_strdup_printf("%d", data->uin);
+	uin = g_strdup_printf("%lu", data->uin);
 	message = 0;
 	aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
 	show_got_added(data->gc, NULL, uin, NULL, NULL);
@@ -1456,7 +1456,7 @@
 	if (data->uin) {
 		char *uin, *message;
 		struct oscar_data *od = (struct oscar_data *)data->gc->proto_data;
-		uin = g_strdup_printf("%d", data->uin);
+		uin = g_strdup_printf("%lu", data->uin);
 		message = g_strdup_printf("No reason given.");
 		aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHDENIED, message);
 		g_free(uin);
@@ -1471,8 +1471,8 @@
 static void gaim_icq_authask(struct gaim_connection *gc, fu32_t uin, char *msg) {
 	struct icq_auth *data = g_new(struct icq_auth, 1);
 	/* The first 6 chars of the message are some type of alien gibberish, so skip them */
-	char *dialog_msg = g_strdup_printf("The user %d wants to add you to their buddy list for the following reason:\n\n%s", uin, (msg && strlen(msg)>6) ? msg+6 : "No reason given.");
-	debug_printf("Received an authorization request from UIN %ld\n", uin);
+	char *dialog_msg = g_strdup_printf("The user %lu wants to add you to their buddy list for the following reason:\n\n%s", uin, (msg && strlen(msg)>6) ? msg+6 : "No reason given.");
+	debug_printf("Received an authorization request from UIN %lu\n", uin);
 	data->gc = gc;
 	data->uin = uin;
 	do_ask_dialog(dialog_msg, data, gaim_icq_authgrant, gaim_icq_authdeny);
@@ -1489,14 +1489,14 @@
 
 		case 0x0007: { /* Someone has denied you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has denied your request to add them to your contact list for the following reason:\n\n"), args->uin, args->msg ? args->msg : _("No reason given."));
+			dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), args->uin, args->msg ? args->msg : _("No reason given."));
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Denied"));
 			g_free(dialog_msg);
 		} break;
 
 		case 0x0008: { /* Someone has granted you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has granted your request to add them to your contact list."), args->uin);
+			dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), args->uin);
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Granted"));
 			g_free(dialog_msg);
 		} break;
@@ -2364,14 +2364,14 @@
 
 		case 0x0007: { /* Someone has denied you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has denied your request to add them to your contact list for the following reason:\n\n"), msg->sender, msg->msg ? msg->msg : _("No reason given."));
+			dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), msg->sender, msg->msg ? msg->msg : _("No reason given."));
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Denied"));
 			g_free(dialog_msg);
 		} break;
 
 		case 0x0008: { /* Someone has granted you authorization */
 			char *dialog_msg;
-			dialog_msg = g_strdup_printf(_("The user %d has granted your request to add them to your contact list."), msg->sender);
+			dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), msg->sender);
 			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Granted"));
 			g_free(dialog_msg);
 		} break;