Menu
▾
▴
[Gaim-commits] CVS: gaim/src away.c,1.67,1.68 buddy.c,1.279,1.280 buddy_chat.c,1.136,1.137 conversation.c,1.313,1.314 convo.h,1.13,1.14 core.h,1.13,1.14 dialogs.c,1.295,1.296 gaim.h,1.302,1.303 gtkimhtml.c,1.85,1.86 gtkimhtml.h,1.9,1.10 perl.c,1.67,1.68 prefs.c,1.210,1.211 server.c,1.213,1.214 ui.h,1.24,1.25
|
From: Eric W. <war...@us...> - 2001-12-08 09:48:55
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv19507/src
Modified Files:
away.c buddy.c buddy_chat.c conversation.c convo.h core.h
dialogs.c gaim.h gtkimhtml.c gtkimhtml.h perl.c prefs.c
server.c ui.h
Log Message:
rewrote the html parser in gtkimhtml. yes, that's really all i did. the reason for the massive change is because i added a length argument, which then needed to be propogated down to everything that would ever receive anything that would get drawn to the window.
the new parser isn't any faster. that wasn't my goal. it's much more understandable now (hopefully, anyway).
Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- away.c 2001/11/15 22:47:03 1.67
+++ away.c 2001/12/08 09:48:51 1.68
@@ -74,7 +74,7 @@
if (g_slist_index(connections, qm->gc) >= 0)
set_convo_gc(cnv, qm->gc);
- write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm);
+ write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm, qm->len);
message_queue = g_slist_remove(message_queue, qm);
@@ -111,7 +111,7 @@
if (g_slist_index(connections, qm->gc) >= 0)
set_convo_gc(cnv, qm->gc);
- write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm);
+ write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm, qm->len);
g_free(qm->message);
g_free(qm);
templist = message_queue = g_slist_remove(message_queue, qm);
@@ -222,10 +222,10 @@
gaim_setup_imhtml(awaytext);
gtk_widget_show(awaytext);
buf = stylize(a->message, BUF_LONG);
- gtk_imhtml_append_text(GTK_IMHTML(awaytext), buf, GTK_IMHTML_NO_TITLE |
+ gtk_imhtml_append_text(GTK_IMHTML(awaytext), buf, -1, GTK_IMHTML_NO_TITLE |
GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
g_free(buf);
- gtk_imhtml_append_text(GTK_IMHTML(awaytext), "<BR>", GTK_IMHTML_NO_TITLE |
+ gtk_imhtml_append_text(GTK_IMHTML(awaytext), "<BR>", -1, GTK_IMHTML_NO_TITLE |
GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
clistqueuesw = gtk_scrolled_window_new(NULL, NULL);
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- buddy.c 2001/12/01 02:14:47 1.279
+++ buddy.c 2001/12/08 09:48:51 1.280
@@ -1499,7 +1499,7 @@
set_convo_gc(c, u->gc);
- write_to_conv(c, b->message, WFLAG_SEND, NULL, time((time_t) NULL));
+ write_to_conv(c, b->message, WFLAG_SEND, NULL, time(NULL), -1);
serv_send_im(u->gc, name, b->message, 0);
}
}
@@ -2110,7 +2110,7 @@
if (c) {
char tmp[1024];
g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->name);
- write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t) NULL));
+ write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
}
}
bs->sound = 2;
@@ -2165,7 +2165,7 @@
if (c) {
char tmp[1024];
g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->name);
- write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t) NULL));
+ write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
}
}
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- buddy_chat.c 2001/12/07 00:19:06 1.136
+++ buddy_chat.c 2001/12/08 09:48:51 1.137
@@ -605,7 +605,7 @@
g_free(tmp);
matches = g_list_remove(matches, matches->data);
}
- write_to_conv(c, addthis, WFLAG_NOLOG, NULL, time(NULL));
+ write_to_conv(c, addthis, WFLAG_NOLOG, NULL, time(NULL), -1);
gtk_editable_insert_text(GTK_EDITABLE(c->entry), partial, strlen(partial), &start);
if (t == start) {
t = start + strlen(partial);
@@ -618,7 +618,7 @@
g_free(partial);
}
-gboolean meify(char *message)
+gboolean meify(char *message, int len)
{
/* read /me-ify : if the message (post-HTML) starts with /me, remove
* the "/me " part of it (including that space) and return TRUE */
@@ -626,6 +626,8 @@
int inside_HTML = 0; /* i really don't like descriptive names */
if (!c)
return FALSE; /* um... this would be very bad if this happens */
+ if (len == -1)
+ len = strlen(message);
while (*c) {
if (inside_HTML) {
if (*c == '>')
@@ -637,12 +639,13 @@
break;
}
c++; /* i really don't like c++ either */
+ len--;
}
/* k, so now we've gotten past all the HTML crap. */
if (!*c)
return FALSE;
if (!g_strncasecmp(c, "/me ", 4)) {
- sprintf(c, "%s", c + 4);
+ memmove(c, c + 4, len - 4);
return TRUE;
} else
return FALSE;
@@ -721,7 +724,7 @@
if ((flag & WFLAG_RECV) && find_nick(b->gc, message))
flag |= WFLAG_NICK;
- write_to_conv(b, message, flag, who, mtime);
+ write_to_conv(b, message, flag, who, mtime, -1);
}
@@ -884,7 +887,7 @@
if (chat_options & OPT_CHAT_LOGON) {
g_snprintf(tmp, sizeof(tmp), _("%s entered the room."), name);
- write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL));
+ write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
}
}
@@ -958,7 +961,7 @@
if (chat_options & OPT_CHAT_LOGON) {
g_snprintf(tmp, sizeof(tmp), _("%s is now known as %s"), old, new);
- write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL));
+ write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
}
}
@@ -1007,7 +1010,7 @@
g_snprintf(tmp, sizeof(tmp), _("%s left the room (%s)."), buddy, reason);
else
g_snprintf(tmp, sizeof(tmp), _("%s left the room."), buddy);
- write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL));
+ write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
}
}
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- conversation.c 2001/12/08 08:46:00 1.313
+++ conversation.c 2001/12/08 09:48:51 1.314
@@ -451,14 +451,12 @@
}
} else {
if (chat_options & OPT_CHAT_ONE_WINDOW) {
- if ((convo_options & OPT_CONVO_COMBINE) &&
- (im_options & OPT_IM_ONE_WINDOW) && conversations) {
+ if ((g_list_length(chats) > 1) ||
+ ((convo_options & OPT_CONVO_COMBINE) &&
+ (im_options & OPT_IM_ONE_WINDOW) && conversations)) {
gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
g_list_index(chats, c) +
g_list_length(conversations));
- } else if (g_list_length(chats) > 1) {
- gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
- g_list_index(chats, c));
} else {
if (c->window)
gtk_widget_destroy(c->window);
@@ -1005,7 +1003,7 @@
if (err > 0) {
- write_to_conv(c, buf, WFLAG_SEND, NULL, time(NULL));
+ write_to_conv(c, buf, WFLAG_SEND, NULL, time(NULL), -1);
if (c->makesound && (sound_options & OPT_SOUND_SEND))
play_sound(SEND);
@@ -1443,7 +1441,7 @@
/* this is going to be interesting since the conversation could either be a
* normal IM conversation or a chat window. but hopefully it won't matter */
-void write_to_conv(struct conversation *c, char *what, int flags, char *who, time_t mtime)
+void write_to_conv(struct conversation *c, char *what, int flags, char *who, time_t mtime, gint length)
{
char buf[BUF_LONG];
char *str;
@@ -1455,7 +1453,7 @@
char buf2[BUF_LONG];
char mdate[64];
- if (c->is_chat && !g_list_find(chats, c))
+ if (c->is_chat && (!c->gc || !g_slist_find(c->gc->buddy_chats, c)))
return;
if (!c->is_chat && !g_list_find(conversations, c))
@@ -1492,7 +1490,7 @@
int index = g_slist_index(connections, c->gc);
int sconv = strlen(c->name);
int sname = strlen(who);
- int swhat = strlen(what);
+ int swhat = length == -1 ? strlen(what) : length;
UI_build_broadcast(CUI_TYPE_MESSAGE, CUI_MESSAGE_RECV,
sizeof(index), &index,
sizeof(sconv), &sconv,
@@ -1529,7 +1527,7 @@
g_snprintf(buf2, sizeof(buf2), "<FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B><BR>",
mdate, what);
- gtk_imhtml_append_text(GTK_IMHTML(c->text), buf2, 0);
+ gtk_imhtml_append_text(GTK_IMHTML(c->text), buf2, -1, 0);
if (logging_options & OPT_LOG_STRIP_HTML) {
char *t1 = strip_html(buf);
@@ -1569,11 +1567,11 @@
}
} else if (flags & WFLAG_NOLOG) {
g_snprintf(buf, BUF_LONG, "<B><FONT COLOR=\"#777777\">%s</FONT></B><BR>", what);
- gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, 0);
+ gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
} else {
if (flags & WFLAG_WHISPER) {
/* if we're whispering, it's not an autoresponse */
- if (meify(what)) {
+ if (meify(what, length)) {
str = g_malloc(1024);
g_snprintf(str, 1024, "***%s", who);
strcpy(colour, "#6C2585");
@@ -1583,7 +1581,7 @@
strcpy(colour, "#00ff00");
}
} else {
- if (meify(what)) {
+ if (meify(what, length)) {
str = g_malloc(1024);
if (flags & WFLAG_AUTO)
g_snprintf(str, 1024, "%s ***%s", AUTO_RESPONSE, who);
@@ -1618,11 +1616,11 @@
g_free(str);
- gtk_imhtml_append_text(GTK_IMHTML(c->text), buf2, 0);
+ gtk_imhtml_append_text(GTK_IMHTML(c->text), buf2, -1, 0);
- logstr = gtk_imhtml_append_text(GTK_IMHTML(c->text), what, gtk_font_options);
+ logstr = gtk_imhtml_append_text(GTK_IMHTML(c->text), what, length, gtk_font_options);
- gtk_imhtml_append_text(GTK_IMHTML(c->text), "<BR>", 0);
+ gtk_imhtml_append_text(GTK_IMHTML(c->text), "<BR>", -1, 0);
if (logging_options & OPT_LOG_STRIP_HTML) {
char *t1, *t2;
Index: convo.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/convo.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- convo.h 2001/12/04 07:53:55 1.13
+++ convo.h 2001/12/08 09:48:51 1.14
@@ -78,6 +78,6 @@
extern void send_callback(GtkWidget *, struct conversation *);
extern int close_callback(GtkWidget *, struct conversation *);
-extern gboolean meify(char *);
+extern gboolean meify(char *, int);
#endif /* _CONVO_H_ */
Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- core.h 2001/11/19 04:09:58 1.13
+++ core.h 2001/12/08 09:48:51 1.14
@@ -191,7 +191,7 @@
/* Functions in server.c */
extern void serv_got_update(struct gaim_connection *, char *, int, int, time_t, time_t, int, gushort);
-extern void serv_got_im(struct gaim_connection *, char *, char *, guint32, time_t);
+extern void serv_got_im(struct gaim_connection *, char *, char *, guint32, time_t, gint);
extern void serv_got_eviled(struct gaim_connection *, char *, int);
extern void serv_got_chat_invite(struct gaim_connection *, char *, char *, char *, GList *);
extern struct conversation *serv_got_joined_chat(struct gaim_connection *, int, char *);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- dialogs.c 2001/12/05 19:40:06 1.295
+++ dialogs.c 2001/12/08 09:48:51 1.296
@@ -1846,14 +1846,14 @@
options ^= GTK_IMHTML_NO_NEWLINE;
options ^= GTK_IMHTML_NO_SCROLL;
- gtk_imhtml_append_text(GTK_IMHTML(b->text), info, options);
+ gtk_imhtml_append_text(GTK_IMHTML(b->text), info, -1, options);
va_start(ap, info);
while ((more_info = va_arg(ap, char *)) != NULL)
- gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, options);
+ gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, -1, options);
va_end(ap);
- gtk_imhtml_append_text(GTK_IMHTML(b->text), "<BR>", 0);
+ gtk_imhtml_append_text(GTK_IMHTML(b->text), "<BR>", -1, 0);
if (away)
info_dlgs = g_slist_remove(info_dlgs, b);
@@ -3584,7 +3584,7 @@
g_string_append(string, buf);
if (i == 30) {
- gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, view->options);
+ gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, -1, view->options);
g_string_free(string, TRUE);
string = g_string_new("");
/* you can't have these anymore. if someone clicks on another item while one is
@@ -3596,8 +3596,8 @@
}
}
- gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, view->options);
- gtk_imhtml_append_text(GTK_IMHTML(view->layout), "<BR>", view->options);
+ gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, -1, view->options);
+ gtk_imhtml_append_text(GTK_IMHTML(view->layout), "<BR>", -1, view->options);
gtk_widget_set_sensitive(view->bbox, TRUE);
gtk_signal_disconnect(GTK_OBJECT(view->window), block);
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- gaim.h 2001/12/04 07:53:55 1.302
+++ gaim.h 2001/12/08 09:48:51 1.303
@@ -331,7 +331,7 @@
extern void remove_chat_buddy(struct conversation *, char *, char *);
/* Functions in conversation.c */
-extern void write_to_conv(struct conversation *, char *, int, char *, time_t);
+extern void write_to_conv(struct conversation *, char *, int, char *, time_t, int);
extern struct conversation *find_conversation(char *);
/* Functions in dialogs.c */
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- gtkimhtml.c 2001/12/01 22:53:51 1.85
+++ gtkimhtml.c 2001/12/08 09:48:51 1.86
@@ -36,10 +36,10 @@
#endif
#if GTK_CHECK_VERSION(1,3,0)
-#define GTK_IMHTML_GET_STYLE_FONT(style) gtk_style_get_font (style)
+# define GTK_IMHTML_GET_STYLE_FONT(style) gtk_style_get_font (style)
#else
-#define GTK_IMHTML_GET_STYLE_FONT(style) (style)->font
-#define GTK_CLASS_TYPE(class) (class)->type
+# define GTK_IMHTML_GET_STYLE_FONT(style) (style)->font
+# define GTK_CLASS_TYPE(class) (class)->type
#endif
[...1461 lines suppressed...]
imhtml->x = 0;
imhtml->y = TOP_BORDER;
imhtml->xsize = 0;
@@ -3616,11 +3300,12 @@
layout->vadjustment->upper = imhtml->y;
gtk_adjustment_set_value (layout->vadjustment, 0);
- gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
- gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
-
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (imhtml)))
+ if (GTK_WIDGET_REALIZED (GTK_WIDGET (imhtml))) {
+ gdk_window_set_cursor (GTK_LAYOUT (imhtml)->bin_window, imhtml->arrow_cursor);
gdk_window_clear (GTK_LAYOUT (imhtml)->bin_window);
+ gtk_signal_emit_by_name (GTK_OBJECT (layout->hadjustment), "changed");
+ gtk_signal_emit_by_name (GTK_OBJECT (layout->vadjustment), "changed");
+ }
}
void
Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtkimhtml.h 2001/11/15 23:43:44 1.9
+++ gtkimhtml.h 2001/12/08 09:48:51 1.10
@@ -53,7 +53,7 @@
GdkCursor *arrow_cursor;
GList *bits;
- GList *urls;
+ GList *click;
struct _GtkIMHtmlBit *tip_bit;
GtkWidget *tip_window;
guint tip_timer;
@@ -127,6 +127,7 @@
GString* gtk_imhtml_append_text (GtkIMHtml *imhtml,
const gchar *text,
+ gint len,
GtkIMHtmlOptions options);
void gtk_imhtml_clear (GtkIMHtml *imhtml);
Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- perl.c 2001/11/13 06:36:27 1.67
+++ perl.c 2001/12/08 09:48:51 1.68
@@ -564,7 +564,7 @@
if (!c)
c = new_conversation(nick);
- write_to_conv(c, what, wflags, who, time((time_t)NULL));
+ write_to_conv(c, what, wflags, who, time(NULL), -1);
XSRETURN(0);
}
@@ -612,7 +612,7 @@
if (!c)
c = new_conversation(nick);
set_convo_gc(c, gc);
- write_to_conv(c, what, WFLAG_SEND | (isauto ? WFLAG_AUTO : 0), NULL, time((time_t)NULL));
+ write_to_conv(c, what, WFLAG_SEND | (isauto ? WFLAG_AUTO : 0), NULL, time(NULL), -1);
serv_send_im(c->gc, nick, what, isauto ? IM_FLAG_AWAY : 0);
XSRETURN(0);
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- prefs.c 2001/12/04 07:53:55 1.210
+++ prefs.c 2001/12/08 09:48:52 1.211
@@ -1738,9 +1738,9 @@
/* Fill the text box with new message */
strcpy(buffer, a->message);
tmp = stylize(buffer, BUF_LONG);
- gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, GTK_IMHTML_NO_TITLE |
+ gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, -1, GTK_IMHTML_NO_TITLE |
GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
- gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", GTK_IMHTML_NO_TITLE |
+ gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", -1, GTK_IMHTML_NO_TITLE |
GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
g_free(tmp);
}
@@ -1988,9 +1988,9 @@
a = (struct away_message *)awy->data;
g_snprintf(buffer, sizeof(buffer), "%s", a->message);
tmp = stylize(buffer, BUF_LONG);
- gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, GTK_IMHTML_NO_TITLE |
+ gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, -1, GTK_IMHTML_NO_TITLE |
GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
- gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", GTK_IMHTML_NO_TITLE |
+ gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", -1, GTK_IMHTML_NO_TITLE |
GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
g_free(tmp);
}
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- server.c 2001/12/02 00:35:34 1.213
+++ server.c 2001/12/08 09:48:52 1.214
@@ -427,7 +427,7 @@
}
/* woo. i'm actually going to comment this function. isn't that fun. make sure to follow along, kids */
-void serv_got_im(struct gaim_connection *gc, char *name, char *message, guint32 flags, time_t mtime)
+void serv_got_im(struct gaim_connection *gc, char *name, char *message, guint32 flags, time_t mtime, gint len)
{
char *buffy;
char *angel;
@@ -457,26 +457,32 @@
/* plugin stuff. we pass a char ** but we don't want to pass what's been given us
* by the prpls. so we create temp holders and pass those instead. it's basically
- * just to avoid segfaults. */
- buffy = g_malloc(MAX(strlen(message) + 1, BUF_LONG));
- strcpy(buffy, message);
- angel = g_strdup(name);
- plugin_return = plugin_event(event_im_recv, gc, &angel, &buffy, (void *)flags);
+ * just to avoid segfaults. of course, if the data is binary, plugins don't see it.
+ * bitch all you want; i really don't want you to be dealing with it. */
+ if (len < 0) {
+ buffy = g_malloc(MAX(strlen(message) + 1, BUF_LONG));
+ strcpy(buffy, message);
+ angel = g_strdup(name);
+ plugin_return = plugin_event(event_im_recv, gc, &angel, &buffy, (void *)flags);
- if (!buffy || !angel || plugin_return) {
- if (buffy)
- g_free(buffy);
- if (angel)
- g_free(angel);
- return;
+ if (!buffy || !angel || plugin_return) {
+ if (buffy)
+ g_free(buffy);
+ if (angel)
+ g_free(angel);
+ return;
+ }
+ name = angel;
+ message = buffy;
+ } else {
+ name = g_strdup(name);
+ message = g_memdup(message, len);
}
- name = angel;
- message = buffy;
/* TiK, using TOC, sends an automated message in order to get your away message. Now,
* this is one of the biggest hacks I think I've seen. But, in order to be nice to
* TiK, we're going to give users the option to ignore it. */
- if ((away_options & OPT_AWAY_TIK_HACK) && gc->away && strlen(gc->away) &&
+ if ((away_options & OPT_AWAY_TIK_HACK) && gc->away && strlen(gc->away) && (len < 0) &&
!strcmp(message, ">>>Automated Message: Getting Away Message<<<")) {
char *tmpmsg = stylize(awaymessage->message, MSG_LEN);
serv_send_im(gc, name, tmpmsg, IM_FLAG_AWAY);
@@ -488,7 +494,7 @@
/* if you can't figure this out, stop reading right now.
* "we're not worthy! we're not worthy!" */
- if (convo_options & OPT_CONVO_SEND_LINKS)
+ if ((len < 0) && (convo_options & OPT_CONVO_SEND_LINKS))
linkify_text(message);
/* um. when we call write_to_conv with the message we received, it's nice to pass whether
@@ -523,10 +529,11 @@
qm = g_new0(struct queued_message, 1);
g_snprintf(qm->name, sizeof(qm->name), "%s", name);
- qm->message = g_strdup(message);
+ qm->message = g_memdup(message, len == -1 ? strlen(message) + 1 : len);
qm->gc = gc;
qm->tm = mtime;
qm->flags = WFLAG_RECV | away;
+ qm->len = len;
message_queue = g_slist_append(message_queue, qm);
#ifdef USE_APPLET
@@ -572,7 +579,7 @@
else if (cnv->makesound && (sound_options & OPT_SOUND_RECV))
play_sound(RECEIVE);
- write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime);
+ write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);
}
/* regardless of whether we queue it or not, we should send an auto-response. That is,
@@ -616,7 +623,7 @@
message_queue = g_slist_append(message_queue, qm);
} else if (cnv != NULL)
write_to_conv(cnv, away_subs(tmpmsg, alias), WFLAG_SEND | WFLAG_AUTO, NULL,
- mtime);
+ mtime, len);
g_free(tmpmsg);
} else {
/* we're not away. this is easy. if the convo window doesn't exist, create and update
@@ -631,7 +638,7 @@
else if (cnv->makesound && (sound_options & OPT_SOUND_RECV))
play_sound(RECEIVE);
- write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime);
+ write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime, len);
}
plugin_event(event_im_displayed_rcvd, gc, name, message, (void *)flags);
@@ -986,5 +993,5 @@
gtk_widget_show_all(window);
- gtk_imhtml_append_text(GTK_IMHTML(text), msg, GTK_IMHTML_NO_NEWLINE);
+ gtk_imhtml_append_text(GTK_IMHTML(text), msg, -1, GTK_IMHTML_NO_NEWLINE);
}
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ui.h 2001/12/04 07:53:55 1.24
+++ ui.h 2001/12/08 09:48:52 1.25
@@ -202,6 +202,7 @@
time_t tm;
struct gaim_connection *gc;
int flags;
+ int len;
};
struct mod_user {
|
