# HG changeset patch # User Richard Laager # Date 1142272723 0 # Node ID 6f0da8ad9bccf0bf8156632434f7124351948a89 # Parent 413c793bd39f094c439f6d0d8a1168050f9ac96d [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); diff -r 413c793bd39f -r 6f0da8ad9bcc src/gtkconv.c --- 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))