From: Richard L. <rl...@us...> - 2006-03-01 02:10:49
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31593/src Modified Files: gtkconv.c Log Message: (19:22:30) slowhog_work: got a small patch to fix the segfault caused by a protocol doesn't not support chat topic Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.743 retrieving revision 1.744 diff -u -d -p -r1.743 -r1.744 --- gtkconv.c 25 Feb 2006 21:17:58 -0000 1.743 +++ gtkconv.c 1 Mar 2006 02:10:41 -0000 1.744 @@ -5576,11 +5576,14 @@ gaim_gtkconv_update_fields(GaimConversat GaimConvChat *chat = GAIM_CONV_CHAT(conv); GaimGtkChatPane *gtkchat = gtkconv->u.chat; - topic = gaim_conv_chat_get_topic(chat); + if (gtkchat->topic_text != NULL) + { + topic = gaim_conv_chat_get_topic(chat); - gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), topic ? topic : ""); - gtk_tooltips_set_tip(gtkconv->tooltips, gtkchat->topic_text, - topic ? topic : "", NULL); + gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), topic ? topic : ""); + gtk_tooltips_set_tip(gtkconv->tooltips, gtkchat->topic_text, + topic ? topic : "", NULL); + } } if (fields & GAIM_GTKCONV_SMILEY_THEME) |