changeset 1339:6b31e7948b05

[gaim-migrate @ 1349] Fixed a segfault with "Ignore conversations while away" committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Thu, 21 Dec 2000 01:07:18 +0000
parents 2e046be5e44a
children 1526caa87138
files ChangeLog src/server.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Dec 21 00:21:40 2000 +0000
+++ b/ChangeLog	Thu Dec 21 01:07:18 2000 +0000
@@ -7,6 +7,7 @@
 		Jabber (plugins/jabber) [currently requires libxode and
 					 libjabber, which aren't provided]
 		Napster (plugins/napster.c)
+	* Fixed a segfault with 'Ignore new conversations while away'
 
 version 0.11.0-pre3 (12/15/2000):
 	* Away messages arranged alphabetically (Thanks Justin)
--- a/src/server.c	Thu Dec 21 00:21:40 2000 +0000
+++ b/src/server.c	Thu Dec 21 01:07:18 2000 +0000
@@ -309,6 +309,7 @@
 	char *buffy = g_strdup(message);
 	char *angel = g_strdup(name);
 	int plugin_return = plugin_event(event_im_recv, gc, &angel, &buffy, 0);
+
 	if (!buffy || !angel || plugin_return) {
 		if (buffy)
 			g_free(buffy);
@@ -345,6 +346,9 @@
 				cnv = new_conversation(name);
 			}
 		}
+		else {
+			return;
+		}
 		if (cnv != NULL) {
 			play_sound(RECEIVE);
 			write_to_conv(cnv, message, away | WFLAG_RECV, NULL);