[Gaim-commits] SF.net SVN: gaim: [17171] trunk/gtk/gtkimhtml.c

[<rl...@us...>]

Revision: 17171
          http://svn.sourceforge.net/gaim/?rev=17171&view=rev
Author:   rlaager
Date:     2006-09-05 17:36:04 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
SF Patch #1551607 from Alex Badea:

"I'm not entirely sure what causes it in general, but on
 my system it's triggered (only sometimes) by the
 History plugin on a Yahoo account."

The almost identical SF Patch #1549604 from Valdis Kletnieks says:

"Unchecked dereference of 'oldfont' in gtkimhtml.c
 causes a crash when starting up, as 'oldfont' isn't
 set."

Modified Paths:
--------------
    trunk/gtk/gtkimhtml.c

Modified: trunk/gtk/gtkimhtml.c
===================================================================
--- trunk/gtk/gtkimhtml.c	2006-09-06 00:04:45 UTC (rev 17170)
+++ trunk/gtk/gtkimhtml.c	2006-09-06 00:36:04 UTC (rev 17171)
@@ -2902,7 +2902,7 @@
 								else
 									font->bold = 0;
 							}
-							if((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold))
+							if ((font->bold && oldfont && !oldfont->bold) || (oldfont && oldfont->bold && !font->bold) || (font->bold && !oldfont))
 							{
 								gtk_imhtml_toggle_bold(imhtml);
 							}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.