From 18c6ade4d8112f2216b0ab9465a88eee71cc521f Mon Sep 17 00:00:00 2001 From: Erik Walthinsen Date: Mon, 25 Jun 2001 17:22:58 +0000 Subject: [PATCH] gobject2gtk.h: added g2g_object_get_type() prototype gst.c: fixed gst_add_paths_func() prototype gstelement.c: change... Original commit message from CVS: gobject2gtk.h: added g2g_object_get_type() prototype gst.c: fixed gst_add_paths_func() prototype gstelement.c: changed some prototypes, added a cast --- gst/gobject2gtk.h | 2 ++ gst/gst.c | 2 +- gst/gstelement.c | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gst/gobject2gtk.h b/gst/gobject2gtk.h index a6e5303da9..9a4ac4160e 100644 --- a/gst/gobject2gtk.h +++ b/gst/gobject2gtk.h @@ -86,6 +86,8 @@ G_STMT_START{ \ #define g_enum_register_static gtk_type_register_enum +GType g2g_object_get_type (void); + /********************************* * FIXME API NOT in glib2.0 ***********************************/ diff --git a/gst/gst.c b/gst/gst.c index affcf53935..d1f593757d 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -107,7 +107,7 @@ gst_init (int *argc, char **argv[]) } static void -gst_add_paths_func (gchar *pathlist) +gst_add_paths_func (const gchar *pathlist) { gchar **paths; gint j = 0; diff --git a/gst/gstelement.c b/gst/gstelement.c index 2b07591f9b..b84703e6da 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -51,8 +51,8 @@ static void gst_element_class_init (GstElementClass *klass); static void gst_element_init (GstElement *element); static void gst_element_base_class_init (GstElementClass *klass); -static void gst_element_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); -static void gst_element_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void gst_element_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); +static void gst_element_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void gst_element_shutdown (GObject *object); static void gst_element_real_destroy (GObject *object); @@ -191,7 +191,7 @@ gst_element_set_property (GObject *object, guint prop_id, const GValue *value, G static void -gst_element_get_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +gst_element_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { GstElementClass *oclass = (GstElementClass *)G_OBJECT_GET_CLASS(object); @@ -900,7 +900,7 @@ gst_element_shutdown (GObject *object) gst_bin_remove (GST_BIN (GST_OBJECT_PARENT (element)), element); if (G_OBJECT_CLASS (parent_class)->shutdown) - G_OBJECT_CLASS (parent_class)->shutdown (object); + G_OBJECT_CLASS (parent_class)->shutdown ((GObject *)object); } static void