Mercurial > pidgin.yaz

changeset 22667:9fa57410e743

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '61d502ea8377846692aea9189056d7c134660277' and 'a6270c0093cc57b6059401e4023a0ae6e7d8627f'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 17 Apr 2008 17:01:03 +0000
parents 0723826f9229 (current diff) 6827600df4fc (diff)
children 72090ce17864 1d012e75153f
files
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c	Thu Apr 17 13:48:34 2008 +0000
+++ b/pidgin/gtkimhtml.c	Thu Apr 17 17:01:03 2008 +0000
@@ -2697,8 +2697,11 @@
 
 						if (sml)
 							font->sml = sml;
-						else if (oldfont && oldfont->sml)
-							font->sml = g_strdup(oldfont->sml);
+						else {
+							g_free(sml);
+							if (oldfont && oldfont->sml)
+								font->sml = g_strdup(oldfont->sml);
+						}
 
 						if (size && !(options & GTK_IMHTML_NO_SIZES) && (imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK))) {
 							if (*size == '+') {
@@ -2750,7 +2753,7 @@
 				case 46:	/* IMG (opt) */
 				case 59:	/* IMG */
 					{
-						const char *id;
+						char *id;
 
 						gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
 						ws[0] = '\0'; wpos = 0;
@@ -2762,6 +2765,7 @@
 						if (!id)
 							break;
 						gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter);
+						g_free(id);
 						break;
 					}
 				case 47:	/* P (opt) */