diff src/conversation.c @ 5680:71cc0d5376c2

[gaim-migrate @ 6098] Fixed some warnings found by the new sanity checks. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 02 Jun 2003 22:30:25 +0000
parents 0adfd56b46b5
children 1d140b31d4b3
line wrap: on
line diff
--- a/src/conversation.c	Mon Jun 02 22:24:07 2003 +0000
+++ b/src/conversation.c	Mon Jun 02 22:30:25 2003 +0000
@@ -754,7 +754,8 @@
 	GaimWindowUiOps *ops;
 
 	g_return_if_fail(win != NULL);
-	g_return_if_fail(index >= 0 &&gaim_window_get_conversation_count(win));
+	g_return_if_fail(index >= 0 &&
+					 index < gaim_window_get_conversation_count(win));
 
 	ops = gaim_window_get_ui_ops(win);
 
@@ -772,6 +773,9 @@
 
 	g_return_val_if_fail(win != NULL, NULL);
 
+	if (gaim_window_get_conversation_count(win) == 0)
+		return NULL;
+
 	ops = gaim_window_get_ui_ops(win);
 
 	if (ops != NULL && ops->get_active_index != NULL)