Menu
▾
▴
[Gaim-commits] CVS: gaim/src/protocols/msn ft.c,1.5,1.6 msg.c,1.1,1.2 msn.c,1.162,1.163 switchboard.c,1.5,1.6
|
From: Christian H. <ch...@us...> - 2003-04-26 08:56:29
|
Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv19935
Modified Files:
ft.c msg.c msn.c switchboard.c
Log Message:
debug_printf -> gaim_debug
Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/ft.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ft.c 16 Mar 2003 00:01:43 -0000 1.5
+++ ft.c 26 Apr 2003 08:56:26 -0000 1.6
@@ -198,8 +198,9 @@
}
if (header[0] != 0) {
- debug_printf("MSNFTP: Invalid header[0]: %d. Aborting.\n",
- header[0]);
+ gaim_debug(GAIM_DEBUG_ERROR, "msn",
+ "MSNFTP: Invalid header[0]: %d. Aborting.\n",
+ header[0]);
return 0;
}
@@ -376,7 +377,8 @@
xfer_data = (struct msn_xfer_data *)xfer->data;
if (source == -1 || !g_slist_find(connections, account->gc)) {
- debug_printf("MSNFTP: Error establishing connection\n");
+ gaim_debug(GAIM_DEBUG_ERROR, "msn",
+ "MSNFTP: Error establishing connection\n");
close(source);
gaim_xfer_cancel_remote(xfer);
@@ -493,8 +495,9 @@
if (xfer == NULL)
{
- debug_printf("MSNFTP : Cookie not found. "
- "File transfer aborted.\n");
+ gaim_debug(GAIM_DEBUG_ERROR, "msn",
+ "MSNFTP : Cookie not found. "
+ "File transfer aborted.\n");
return;
}
Index: msg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- msg.c 6 Feb 2003 10:13:18 -0000 1.1
+++ msg.c 26 Apr 2003 08:56:26 -0000 1.2
@@ -25,7 +25,7 @@
int
msn_write(int fd, void *data, int len)
{
- debug_printf("MSN C: %s", (char *)data);
+ gaim_debug(GAIM_DEBUG_MISC, "msn", "C: %s", (char *)data);
return write(fd, data, len);
}
Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- msn.c 25 Apr 2003 06:47:31 -0000 1.162
+++ msn.c 26 Apr 2003 08:56:26 -0000 1.163
@@ -412,7 +412,6 @@
signoff(gc);
}
- debug_printf("\n");
} else if (!g_ascii_strncasecmp(buf, "FLN", 3)) {
char *usr = buf;
@@ -484,7 +483,8 @@
} else if (!g_ascii_strcasecmp(which, "AL") && pos) {
if (g_slist_find_custom(gc->account->deny, who,
(GCompareFunc)strcmp)) {
- debug_printf("moving from deny to permit: %s", who);
+ gaim_debug(GAIM_DEBUG_INFO, "msn",
+ "moving from deny to permit: %s", who);
gaim_privacy_deny_remove(gc->account, who);
}
gaim_privacy_permit_add(gc->account, who);
@@ -503,7 +503,8 @@
denyl = denyl->next;
}
if(new) {
- debug_printf("Unresolved MSN RL entry\n");
+ gaim_debug(GAIM_DEBUG_INFO, "msn",
+ "Unresolved MSN RL entry\n");
ap = g_new0(struct msn_add_permit, 1);
ap->user = g_strdup(who);
ap->friend = g_strdup(friend);
@@ -695,7 +696,8 @@
}
if( (fd = gaim_mkstemp(&(md->passport))) == NULL ) {
- debug_printf("Error opening temp file: %s\n", strerror(errno));
+ gaim_debug(GAIM_DEBUG_ERROR, "msn",
+ "Error opening temp file: %s\n", strerror(errno));
}
else {
fputs("<html>\n"
@@ -722,7 +724,8 @@
fprintf(fd, "</form></body>\n");
fprintf(fd, "</html>\n");
if (fclose(fd)) {
- debug_printf("Error closing temp file: %s\n", strerror(errno));
+ gaim_debug(GAIM_DEBUG_ERROR, "msn",
+ "Error closing temp file: %s\n", strerror(errno));
unlink(md->passport);
g_free(md->passport);
}
@@ -798,7 +801,7 @@
} else if (isdigit(*buf)) {
handle_errcode(buf, TRUE);
} else {
- debug_printf("Unhandled message!\n");
+ gaim_debug(GAIM_DEBUG_WARNING, "msn", "Unhandled message!\n");
}
return 1;
@@ -932,7 +935,7 @@
}
cmd[cmdlen] = 0;
- debug_printf("MSN S: %s", cmd);
+ gaim_debug(GAIM_DEBUG_MISC, "msn", "S: %s", cmd);
g_strchomp(cmd);
cont = msn_process_main(gc, cmd);
@@ -1149,7 +1152,7 @@
}
cmd[cmdlen] = 0;
- debug_printf("MSN S: %s", cmd);
+ gaim_debug(GAIM_DEBUG_MISC, "msn", "S: %s", cmd);
g_strchomp(cmd);
cont = msn_process_login(gc, cmd);
@@ -1263,7 +1266,7 @@
char *send;
if (ms->txqueue) {
- debug_printf("appending to queue\n");
+ gaim_debug(GAIM_DEBUG_INFO, "msn", "appending to queue\n");
ms->txqueue = g_slist_append(ms->txqueue, g_strdup(message));
return 1;
}
@@ -1275,7 +1278,6 @@
g_free(send);
if (msn_write(ms->fd, buf, strlen(buf)) < 0)
msn_kill_switch(ms);
- debug_printf("\n");
} else if (strcmp(who, gc->username)) {
g_snprintf(buf, MSN_BUF_LEN, "XFR %u SB\r\n", ++md->trId);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
@@ -1314,7 +1316,6 @@
msn_kill_switch(ms);
return 0;
}
- debug_printf("\n");
serv_got_chat_in(gc, id, gc->username, 0, message, time(NULL));
return 0;
}
@@ -1705,7 +1706,7 @@
}
if (g_slist_find_custom(gc->account->deny, who, (GCompareFunc)strcmp)) {
- debug_printf("MSN: Moving %s from BL to AL\n", who);
+ gaim_debug(GAIM_DEBUG_INFO, "msn", "Moving %s from BL to AL\n", who);
gaim_privacy_deny_remove(gc->account, who);
g_snprintf(buf, sizeof(buf), "REM %u BL %s\r\n", ++md->trId, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
@@ -1759,7 +1760,7 @@
}
if (g_slist_find_custom(gc->account->permit, who, (GCompareFunc)strcmp)) {
- debug_printf("MSN: Moving %s from AL to BL\n", who);
+ gaim_debug(GAIM_DEBUG_INFO, "msn", "Moving %s from AL to BL\n", who);
gaim_privacy_permit_remove(gc->account, who);
g_snprintf(buf, sizeof(buf), "REM %u AL %s\r\n", ++md->trId, who);
if (msn_write(md->fd, buf, strlen(buf)) < 0) {
Index: switchboard.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/switchboard.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- switchboard.c 16 Mar 2003 00:01:43 -0000 1.5
+++ switchboard.c 26 Apr 2003 08:56:26 -0000 1.6
@@ -159,8 +159,6 @@
msn_kill_switch(ms);
return 0;
}
-
- debug_printf("\n");
}
} else if (!g_ascii_strncasecmp(buf, "MSG", 3)) {
char *user, *tmp = buf;
@@ -206,7 +204,7 @@
msn_kill_switch(ms);
} else {
- debug_printf("Unhandled message!\n");
+ gaim_debug(GAIM_DEBUG_WARNING, "msn", "Unhandled message!\n");
}
return 1;
@@ -353,7 +351,7 @@
}
cmd[cmdlen] = 0;
- debug_printf("MSN S: %s", cmd);
+ gaim_debug(GAIM_DEBUG_MISC, "msn", "S: %s", cmd);
g_strchomp(cmd);
cont = msn_process_switch(ms, cmd);
|