callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix messed up refcounting. (#348090, Chris Wilson)

Browse Source 
2006-07-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_set_contexts): Fix
	messed up refcounting.  (#348090, Chris Wilson)
This commit is contained in:
Matthias Clasen 2006-07-20 18:42:17 +00:00 committed by Matthias Clasen
parent 7014a3b5bb
commit 4e7097ff08
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-07-20 Matthias Clasen <mclasen@redhat.com> 2006-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_set_contexts): Fix
messed up refcounting. (#348090, Chris Wilson)
* gtk/gtkicontheme.h: * gtk/gtkicontheme.h:
* gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache): * gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache):
Export this privately. Export this privately.

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-07-20 Matthias Clasen <mclasen@redhat.com> 2006-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextlayout.c (gtk_text_layout_set_contexts): Fix
messed up refcounting. (#348090, Chris Wilson)
* gtk/gtkicontheme.h: * gtk/gtkicontheme.h:
* gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache): * gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache):
Export this privately. Export this privately.

14
gtk/gtktextlayout.c
View File

@ -369,17 +369,23 @@ gtk_text_layout_set_contexts (GtkTextLayout *layout,
{ {
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout)); g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
if (layout->ltr_context != ltr_context)
{
if (layout->ltr_context) if (layout->ltr_context)
g_object_unref (ltr_context); g_object_unref (layout->ltr_context);
layout->ltr_context = ltr_context; layout->ltr_context = ltr_context;
g_object_ref (ltr_context); g_object_ref (layout->ltr_context);
}
if (layout->rtl_context != rtl_context)
{
if (layout->rtl_context) if (layout->rtl_context)
g_object_unref (rtl_context); g_object_unref (layout->rtl_context);
layout->rtl_context = rtl_context; layout->rtl_context = rtl_context;
g_object_ref (rtl_context); g_object_ref (layout->rtl_context);
}
DV (g_print ("invalidating all due to new pango contexts (%s)\n", G_STRLOC)); DV (g_print ("invalidating all due to new pango contexts (%s)\n", G_STRLOC));
gtk_text_layout_invalidate_all (layout); gtk_text_layout_invalidate_all (layout);