mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 04:47:28 -07:00
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
|
|
From: Owen W. Taylor <otaylor@fishsoup.net>
|
|
Date: Tue, 27 Sep 2011 04:17:52 +0000
|
|
Subject: Fix leaks of Pango objects
|
|
|
|
Gtk.PrintContext.create_pango_context()
|
|
Gtk.PrintContext.create_pango_layout()
|
|
pangocairo.CairoContext.create_layout()
|
|
|
|
were leaking the objects they returned.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=660216
|
|
---
|
|
diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs
|
|
index 69c7e0c..faa45e1 100644
|
|
--- a/gtk/gtk-2.10.defs
|
|
+++ b/gtk/gtk-2.10.defs
|
|
@@ -1388,12 +1388,14 @@
|
|
(define-method create_pango_context
|
|
(of-object "GtkPrintContext")
|
|
(c-name "gtk_print_context_create_pango_context")
|
|
+ (caller-owns-return #t)
|
|
(return-type "PangoContext*")
|
|
)
|
|
|
|
(define-method create_pango_layout
|
|
(of-object "GtkPrintContext")
|
|
(c-name "gtk_print_context_create_pango_layout")
|
|
+ (caller-owns-return #t)
|
|
(return-type "PangoLayout*")
|
|
)
|
|
|
|
diff --git a/pangocairo.override b/pangocairo.override
|
|
index bb923e6..5101107 100644
|
|
--- a/pangocairo.override
|
|
+++ b/pangocairo.override
|
|
@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObject *self, PyObject *args, PyObject *kwar
|
|
static PyObject *
|
|
_wrap_pango_cairo_create_layout(PyGObject *self)
|
|
{
|
|
- PangoLayout *ret;
|
|
+ PangoLayout *layout;
|
|
+ PyObject *ret;
|
|
|
|
- ret = pango_cairo_create_layout(PycairoContext_GET(self));
|
|
+ layout = pango_cairo_create_layout(PycairoContext_GET(self));
|
|
/* pygobject_new handles NULL checking */
|
|
- return pygobject_new((GObject *)ret);
|
|
+ ret = pygobject_new((GObject *)layout);
|
|
+ if (layout)
|
|
+ g_object_unref(layout);
|
|
+
|
|
+ return ret;
|
|
}
|
|
|
|
static PyObject *
|
|
--
|
|
cgit v0.9.2
|