--- a/src/gtkconv.c Tue Mar 07 01:58:34 2006 +0000
+++ b/src/gtkconv.c Tue Mar 07 02:09:05 2006 +0000
@@ -3762,7 +3762,7 @@
static GtkWidget *
setup_chat_pane(GaimGtkConversation *gtkconv)
{
- GaimPluginProtocolInfo *prpl_info = NULL;
+ GaimPluginProtocolInfo *prpl_info;
GaimConversation *conv = gtkconv->active_conv;
GaimGtkChatPane *gtkchat;
GaimConnection *gc;
@@ -3783,6 +3783,9 @@
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();
@@ -3793,9 +3796,6 @@
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);
@@ -4607,8 +4607,10 @@
gaim_gtkconv_set_active_conversation(conv);
type = gaim_conversation_get_type(conv);
- gc = gaim_conversation_get_gc(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(