From 57f0a5b232b7ca8476ddec4c79a2d024041db597 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 15 Nov 2005 19:24:46 +0000
Subject: [PATCH] gst/gstpad.c: GST_PAD_PAD_TEMPLATE(pad) gets the pad
 template, while
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Original commit message from CVS:
Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
* gst/gstpad.c: (gst_pad_get_property):
GST_PAD_PAD_TEMPLATE(pad) gets the pad template, while
GST_PAD_TEMPLATE(pad) does a cast. We want the former here.
(#321452)
---
 ChangeLog    | 9 +++++++++
 gst/gstpad.c | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 20e3f58..a9fb3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-15  Daniel Fischer  <dan at f3c dot com>
+
+	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstpad.c: (gst_pad_get_property):
+	  GST_PAD_PAD_TEMPLATE(pad) gets the pad template, while
+	  GST_PAD_TEMPLATE(pad) does a cast. We want the former here.
+	  (#321452)
+
 2005-11-15  Wim Taymans  <wim@fluendo.com>
 
 	* gst/gstevent.c:
diff --git a/gst/gstpad.c b/gst/gstpad.c
index af7c683..2a95305 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -440,7 +440,7 @@ gst_pad_get_property (GObject * object, guint prop_id,
       g_value_set_enum (value, GST_PAD_DIRECTION (object));
       break;
     case PAD_PROP_TEMPLATE:
-      g_value_set_object (value, GST_PAD_TEMPLATE (object));
+      g_value_set_object (value, GST_PAD_PAD_TEMPLATE (object));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-- 
2.7.4