Menu
▾
▴
[Gaim-commits] CVS: gaim/src/protocols/irc cmds.c,1.7,1.8 irc.c,1.188,1.189 msgs.c,1.11,1.12
|
From: Mark D. <the...@us...> - 2003-09-27 19:18:11
|
Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1:/tmp/cvs-serv1171/src/protocols/irc
Modified Files:
cmds.c irc.c msgs.c
Log Message:
This is Mr. Holland's Opus. And by Mr. Holland I mean Robot101. He
rewrote the coreish IM image support so that the binary data gets
ripped out in the prpl and put in an imgstore instead of just being
passed in the same huge as char string as the actual message. This
is good because it's prpl agnostic, or something. It also means
we don't have a silly length of "-1" with pretty much every send or
receive IM function.
It should be crash free, bug free, and memleak free, but additional
testing is always a good thing.
If you like good stuff then you'll love this patch. But don't take
my word for it--ba dun dunt!
Index: cmds.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/cmds.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- cmds.c 25 Aug 2003 02:49:41 -0000 1.7
+++ cmds.c 27 Sep 2003 19:17:19 -0000 1.8
@@ -40,7 +40,7 @@ int irc_cmd_default(struct irc_conn *irc
buf = g_strdup_printf(_("Unknown command: %s"), cmd);
if (gaim_conversation_get_type(convo) == GAIM_CONV_IM)
- gaim_im_write(GAIM_IM(convo), "", buf, -1, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
+ gaim_im_write(GAIM_IM(convo), "", buf, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
else
gaim_chat_write(GAIM_CHAT(convo), "", buf, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
g_free(buf);
@@ -145,7 +145,7 @@ int irc_cmd_help(struct irc_conn *irc, c
"AWAY JOIN ME MODE<BR>"
"MSG NICK OPERWALL PING<BR>"
"QUERY QUIT QUOTE UMODE<BR>"
- "WALLOPS WHOIS"), -1, GAIM_MESSAGE_NO_LOG, time(NULL));
+ "WALLOPS WHOIS"), GAIM_MESSAGE_NO_LOG, time(NULL));
}
return 0;
@@ -413,7 +413,7 @@ int irc_cmd_query(struct irc_conn *irc,
gc = gaim_account_get_connection(irc->account);
irc_cmd_privmsg(irc, cmd, target, args);
gaim_im_write(GAIM_IM(convo), gaim_connection_get_display_name(gc),
- args[1], -1, GAIM_MESSAGE_SEND, time(NULL));
+ args[1], GAIM_MESSAGE_SEND, time(NULL));
}
return 0;
Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -p -r1.188 -r1.189
--- irc.c 7 Sep 2003 23:46:59 -0000 1.188
+++ irc.c 27 Sep 2003 19:17:19 -0000 1.189
@@ -43,7 +43,7 @@ static GList *irc_away_states(GaimConnec
static void irc_login(GaimAccount *account);
static void irc_login_cb(gpointer data, gint source, GaimInputCondition cond);
static void irc_close(GaimConnection *gc);
-static int irc_im_send(GaimConnection *gc, const char *who, const char *what, int len, GaimImFlags flags);
+static int irc_im_send(GaimConnection *gc, const char *who, const char *what, GaimImFlags flags);
static int irc_chat_send(GaimConnection *gc, int id, const char *what);
static void irc_chat_join (GaimConnection *gc, GHashTable *data);
static void irc_input_cb(gpointer data, gint source, GaimInputCondition cond);
@@ -245,7 +245,7 @@ static void irc_close(GaimConnection *gc
g_free(irc);
}
-static int irc_im_send(GaimConnection *gc, const char *who, const char *what, int len, GaimImFlags flags)
+static int irc_im_send(GaimConnection *gc, const char *who, const char *what, GaimImFlags flags)
{
struct irc_conn *irc = gc->proto_data;
const char *args[2];
Index: msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -p -r1.11 -r1.12
--- msgs.c 5 Sep 2003 16:53:01 -0000 1.11
+++ msgs.c 27 Sep 2003 19:17:19 -0000 1.12
@@ -88,7 +88,7 @@ void irc_msg_away(struct irc_conn *irc,
gc = gaim_account_get_connection(irc->account);
if (gc)
- serv_got_im(gc, args[1], args[2], GAIM_IM_AUTO_RESP, time(NULL), -1);
+ serv_got_im(gc, args[1], args[2], GAIM_IM_AUTO_RESP, time(NULL));
}
void irc_msg_badmode(struct irc_conn *irc, const char *name, const char *from, char **args)
@@ -289,7 +289,7 @@ void irc_msg_names(struct irc_conn *irc,
if (gaim_conversation_get_type(convo) == GAIM_CONV_CHAT)
gaim_chat_write(GAIM_CHAT(convo), "", msg, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
else
- gaim_im_write(GAIM_IM(convo), "", msg, -1, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
+ gaim_im_write(GAIM_IM(convo), "", msg, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
g_free(msg);
g_free(irc->nameconv);
irc->nameconv = NULL;
@@ -369,7 +369,7 @@ void irc_msg_nonick(struct irc_conn *irc
gaim_chat_write(GAIM_CHAT(convo), args[1], _("no such channel"),
GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
else
- gaim_im_write(GAIM_IM(convo), args[1], _("User is not logged in"), -1,
+ gaim_im_write(GAIM_IM(convo), args[1], _("User is not logged in"),
GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
} else {
if ((gc = gaim_account_get_connection(irc->account)) == NULL)
@@ -726,7 +726,7 @@ void irc_msg_pong(struct irc_conn *irc,
if (gaim_conversation_get_type (convo) == GAIM_CONV_CHAT)
gaim_chat_write(GAIM_CHAT(convo), "PONG", msg, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
else
- gaim_im_write(GAIM_IM(convo), "PONG", msg, -1, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
+ gaim_im_write(GAIM_IM(convo), "PONG", msg, GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG, time(NULL));
} else {
gc = gaim_account_get_connection(irc->account);
if (!gc) {
@@ -765,9 +765,9 @@ void irc_msg_privmsg(struct irc_conn *ir
}
if (!gaim_utf8_strcasecmp(args[0], gaim_connection_get_display_name(gc))) {
- serv_got_im(gc, nick, msg, 0, time(NULL), -1);
+ serv_got_im(gc, nick, msg, 0, time(NULL));
} else if (notice) {
- serv_got_im(gc, nick, msg, 0, time(NULL), -1);
+ serv_got_im(gc, nick, msg, 0, time(NULL));
} else {
convo = gaim_find_conversation_with_account(args[0], irc->account);
if (convo)
|