--- gpl/axl/src/axl_stream.h	2011/06/08 07:09:12	1.1.1.1
+++ gpl/axl/src/axl_stream.h	2012/02/17 12:50:03	1.1.1.2
@@ -57,7 +57,6 @@ axlStream * axl_stream_new             (const char  * 
 int         axl_stream_inspect         (axlStream * stream, const char * chunk, int inspected_size);
 
 int         axl_stream_inspect_code    (axlStream * stream, char value, int index_desp);
-
 int         axl_stream_peek            (axlStream * stream, const char * chunk, int inspected_size);
 
 int         axl_stream_inspect_several (axlStream * stream, int chunk_num, ...);
@@ -207,6 +206,10 @@ void        axl_stream_clean_split     (char ** split)
 
 char      * axl_stream_join            (char ** strings, const char * separator);
 
+int         axl_stream_replace         (char ** source, int source_len, 
+					const char * string, int string_len, 
+					const char * replacement, int replacement_len);
+
 char      * axl_stream_concat          (const char * chunk1, const char * chunk2);
 
 int         axl_stream_strv_num        (char ** chunks);
@@ -284,6 +287,17 @@ axl_bool    axl_stream_content_check       (axlStream 
  * @brief Alias definition for the \ref axl_stream_split.
  */
 #define     axl_split  axl_stream_split
+
+/** 
+ * @brief Simple macro that implements a non-binary string replace. To
+ * use it:
+ * \code
+ * axl_replace (source, string, replacement);
+ * axl_replace (source, "test", "..test..");
+ * \endcode
+ * See \ref axl_stream_replace for more info.
+ */
+#define axl_replace(source,string,replacement) axl_stream_replace(&source,-1,string,-1,replacement,-1)
 
 /**
  * @brief Alias definition for the \ref axl_stream_freev.