changeset 13494:2d1ccccde3d4

[gaim-migrate @ 15870] Resolves CID 92 Event var_compare_op: Added "gc" due to comparison "gc != 0" 1633 if (gc != NULL) 1634 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); Event var_deref_model: Variable "gc" tracked as NULL was passed to a function that dereferences it. [model] 1641 menu = create_chat_menu (conv, who, prpl_info, gc); committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Mon, 13 Mar 2006 17:58:43 +0000
parents e8b0a9376481
children 8f299b9cd184
files src/gtkconv.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Mon Mar 13 17:57:34 2006 +0000
+++ b/src/gtkconv.c	Mon Mar 13 17:58:43 2006 +0000
@@ -1628,10 +1628,11 @@
 	account = gaim_conversation_get_account(conv);
 	gc      = account->gc;
 
+	g_return_if_fail(gc != NULL);
+
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
 
-	if (gc != NULL)
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkchat->list));
 	if(!gtk_tree_selection_get_selected(sel, NULL, &iter))