comparison src/gtkconv.c @ 13419:3e9c865abd3f

[gaim-migrate @ 15794] Resolve CID 22: Event assign_zero: Variable "prpl_info" assigned value 0. 3764 GaimPluginProtocolInfo *prpl_info = NULL; 3795 if (gc != NULL) 3796 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); Event var_deref_op: Variable "prpl_info" tracked as NULL was dereferenced. 3798 if (prpl_info->options & OPT_PROTO_CHAT_TOPIC) Basically, if gc == NULL, then prpl_info == NULL, so this crashes. Let's be safe and use a g_return_if_fail(). I also added one to the write_conv stuff I changed in my last commit. We seem to do that in a lot of places, so I guess I'll p lay it safe. committer: Tailor Script <[e-mail]>

13418:ad33debf87b4

}

static GtkWidget *
setup_chat_pane(GaimGtkConversation *gtkconv)
{
	GaimPluginProtocolInfo *prpl_info = NULL;
	GaimConversation *conv = gtkconv->active_conv;
	GaimGtkChatPane *gtkchat;
	GaimConnection *gc;
	GtkWidget *vpaned, *hpaned;
	GtkWidget *vbox, *hbox, *frame;

	void *blist_handle = gaim_blist_get_handle();
	GList *focus_chain = NULL;

	gtkchat = gtkconv->u.chat;
	gc      = gaim_conversation_get_gc(conv);

	/* Setup the outer pane. */
	vpaned = gtk_vpaned_new();
	gtk_widget_show(vpaned);

	/* Setup the top part of the pane. */
	vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
	gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, TRUE);
	gtk_widget_show(vbox);

	if (gc != NULL)
		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);

	if (prpl_info->options & OPT_PROTO_CHAT_TOPIC)
	{
		hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);

	/* TODO: consider not doing this if the account is offline or something */
	if (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV))
		gaim_gtkconv_set_active_conversation(conv);
	type = gaim_conversation_get_type(conv);

	gc = gaim_conversation_get_gc(conv);
	account = gaim_conversation_get_account(conv);

	displaying = g_strdup(message);
	plugin_return = GPOINTER_TO_INT(gaim_signal_emit_return_1(
							gaim_gtk_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ?
							"displaying-im-msg" : "displaying-chat-msg"),

13419:3e9c865abd3f

}

static GtkWidget *
setup_chat_pane(GaimGtkConversation *gtkconv)
{
	GaimPluginProtocolInfo *prpl_info;
	GaimConversation *conv = gtkconv->active_conv;
	GaimGtkChatPane *gtkchat;
	GaimConnection *gc;
	GtkWidget *vpaned, *hpaned;
	GtkWidget *vbox, *hbox, *frame;

	void *blist_handle = gaim_blist_get_handle();
	GList *focus_chain = NULL;

	gtkchat = gtkconv->u.chat;
	gc      = gaim_conversation_get_gc(conv);
	g_return_if_fail(gc != NULL);
	g_return_if_fail(gc->prpl != NULL);
	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);

	/* Setup the outer pane. */
	vpaned = gtk_vpaned_new();
	gtk_widget_show(vpaned);

	/* Setup the top part of the pane. */
	vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
	gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, TRUE);
	gtk_widget_show(vbox);

	if (prpl_info->options & OPT_PROTO_CHAT_TOPIC)
	{
		hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);

	/* TODO: consider not doing this if the account is offline or something */
	if (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV))
		gaim_gtkconv_set_active_conversation(conv);
	type = gaim_conversation_get_type(conv);

	account = gaim_conversation_get_account(conv);
	g_return_if_fail(account != NULL);
	gc = gaim_account_get_connection(account);
	g_return_if_fail(gc != NULL);

	displaying = g_strdup(message);
	plugin_return = GPOINTER_TO_INT(gaim_signal_emit_return_1(
							gaim_gtk_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ?
							"displaying-im-msg" : "displaying-chat-msg"),