summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2011-09-27 00:17:52 -0400
committerFederico Mena Quintero <federico@gnome.org>2013-04-05 12:08:28 -0600
commiteca72baa5616fbe4dbebea43c7e5940847dc5ab8 (patch)
tree20a3ccc42ea0c42f9c26f87ed98ec994c7e03762
parenteaf1c1b881d2d20d202cf475b5ffed2206b110df (diff)
downloadpygtk-eca72baa5616fbe4dbebea43c7e5940847dc5ab8.tar.gz
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
-rw-r--r--gtk/gtk-2.10.defs2
-rw-r--r--pangocairo.override11
2 files changed, 10 insertions, 3 deletions
diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs
index 69c7e0c0..faa45e12 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 bb923e63..5101107c 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 *