Menu
▾
▴
[Gaim-commits] CVS: gaim/plugins filectl.c,1.24,1.25 gaiminc.c,1.13,1.14 history.c,1.20,1.21 notify.c,1.45,1.46 statenotify.c,1.15,1.16 timestamp.c,1.24,1.25
|
From: Mark D. <the...@us...> - 2003-09-27 19:17:58
|
Update of /cvsroot/gaim/gaim/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv1171/plugins
Modified Files:
filectl.c gaiminc.c history.c notify.c statenotify.c
timestamp.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: filectl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- filectl.c 5 Aug 2003 10:55:00 -0000 1.24
+++ filectl.c 27 Sep 2003 19:17:12 -0000 1.25
@@ -76,7 +76,7 @@ void run_commands() {
c = find_conversation(arg1);
if (!c) c = gaim_conversation_new(GAIM_CONV_IM, arg1);
write_to_conv(c, arg2, WFLAG_SEND, NULL, time(NULL), -1);
- serv_send_im(c->gc, arg1, arg2, -1, 0);
+ serv_send_im(c->gc, arg1, arg2, 0);
free(arg1);
free(arg2);
} else if (!strncasecmp(command, "away", 4)) {
Index: gaiminc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/gaiminc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- gaiminc.c 18 Aug 2003 01:03:42 -0000 1.13
+++ gaiminc.c 27 Sep 2003 19:17:12 -0000 1.14
@@ -43,7 +43,7 @@ bud(struct gaim_connection *gc, char *wh
{
/* whenever someone comes online, it sends them a message. if i
* cared more, i'd make it so it popped up on your screen too */
- serv_send_im(gc, who, "Hello!", -1, 0);
+ serv_send_im(gc, who, "Hello!", 0);
}
/*
Index: history.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/history.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -p -r1.20 -r1.21
--- history.c 13 Sep 2003 21:01:05 -0000 1.20
+++ history.c 27 Sep 2003 19:17:12 -0000 1.21
@@ -61,8 +61,8 @@ static void historize(GaimConversation *
gtkconv = GAIM_GTK_CONVERSATION(c);
- gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), tmp2, strlen(tmp2), options);
- gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<br>", -1, options);
+ gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), tmp2, options);
+ gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<br>", options);
gtk_text_buffer_get_end_iter(GTK_IMHTML(gtkconv->imhtml)->text_buffer, &
end);
gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(gtkconv->imhtml), &end, 0, 0,
Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -p -r1.45 -r1.46
--- notify.c 25 Sep 2003 23:23:16 -0000 1.45
+++ notify.c 27 Sep 2003 19:17:12 -0000 1.46
@@ -514,7 +514,7 @@ static gboolean
options_entry_cb(GtkWidget *widget, GdkEventFocus *evt, gpointer data)
{
if (data == NULL)
- return;
+ return FALSE;
if (!strcmp(data, "method_string")) {
gaim_prefs_set_string("/plugins/gtk/X11/notify/title_string", gtk_entry_get_text(GTK_ENTRY(widget)));
Index: statenotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/statenotify.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- statenotify.c 2 Sep 2003 03:41:08 -0000 1.15
+++ statenotify.c 27 Sep 2003 19:17:12 -0000 1.16
@@ -21,7 +21,7 @@ write_status(GaimBuddy *buddy, const cha
g_snprintf(buf, sizeof(buf), message, who);
- gaim_conversation_write(conv, NULL, buf, -1, GAIM_MESSAGE_SYSTEM, time(NULL));
+ gaim_conversation_write(conv, NULL, buf, GAIM_MESSAGE_SYSTEM, time(NULL));
}
static void
Index: timestamp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/timestamp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- timestamp.c 25 Aug 2003 02:49:40 -0000 1.24
+++ timestamp.c 27 Sep 2003 19:17:12 -0000 1.25
@@ -32,7 +32,7 @@ static gboolean do_timestamp (gpointer d
strftime(mdate, sizeof(mdate), "%H:%M", localtime(&tim));
buf = g_strdup_printf(" %s", mdate);
- gaim_conversation_write(c, NULL, buf, -1, GAIM_MESSAGE_NO_LOG, tim);
+ gaim_conversation_write(c, NULL, buf, GAIM_MESSAGE_NO_LOG, tim);
g_free(buf);
return TRUE;
}
|