--- a/gst_plugins_base/gst-libs/gst/netbuffer/gstnetbuffer.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst-libs/gst/netbuffer/gstnetbuffer.h	Wed Sep 01 12:16:41 2010 +0100
@@ -50,16 +50,6 @@
 } GstNetType;
 
 /**
- * GST_NETADDRESS_MAX_LEN:
- *
- * The maximum length of a string representation of a GstNetAddress as produced
- * by gst_netaddress_to_string().
- *
- * Since: 0.10.24
- */
-#define GST_NETADDRESS_MAX_LEN	64
-
-/**
  * GstNetAddress:
  *
  * An opaque network address as used in #GstNetBuffer.
@@ -107,64 +97,48 @@
 IMPORT_C
 #endif
 
-GType           gst_netbuffer_get_type           (void);
+GType           gst_netbuffer_get_type          (void);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
 
-GstNetBuffer*   gst_netbuffer_new                (void);
+GstNetBuffer*   gst_netbuffer_new               (void);
 
 /* address operations */
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
-void            gst_netaddress_set_ip4_address   (GstNetAddress *naddr, guint32 address, guint16 port);
+void            gst_netaddress_set_ip4_address  (GstNetAddress *naddr, guint32 address, guint16 port);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
-void            gst_netaddress_set_ip6_address   (GstNetAddress *naddr, guint8 address[16], guint16 port);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-gint            gst_netaddress_set_address_bytes (GstNetAddress *naddr, GstNetType type,
-                                                  guint8 address[16], guint16 port);
+void            gst_netaddress_set_ip6_address  (GstNetAddress *naddr, guint8 address[16], guint16 port);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
 
-GstNetType      gst_netaddress_get_net_type      (const GstNetAddress *naddr);
+GstNetType      gst_netaddress_get_net_type     (GstNetAddress *naddr);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
-gboolean        gst_netaddress_get_ip4_address   (const GstNetAddress *naddr, guint32 *address, guint16 *port);
+gboolean        gst_netaddress_get_ip4_address  (GstNetAddress *naddr, guint32 *address, guint16 *port);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
-gboolean        gst_netaddress_get_ip6_address   (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-gint            gst_netaddress_get_address_bytes (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
+gboolean        gst_netaddress_get_ip6_address  (GstNetAddress *naddr, guint8 address[16], guint16 *port);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
 
-gboolean        gst_netaddress_equal             (const GstNetAddress *naddr1,
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-                                                  const GstNetAddress *naddr2);
-
-gint            gst_netaddress_to_string         (const GstNetAddress *naddr, gchar *dest, gulong len);
+gboolean        gst_netaddress_equal            (const GstNetAddress *naddr1,
+                                                 const GstNetAddress *naddr2);
 
 G_END_DECLS