Merge upstream libcroco 0.6.3 changes

(bzr r12765)

1 files changed, 7 insertions, 7 deletions

diff --git a/src/libcroco/cr-doc-handler.h b/src/libcroco/cr-doc-handler.h
index 704f186f5..d12673f31 100644
--- a/src/libcroco/cr-doc-handler.h
+++ b/src/libcroco/cr-doc-handler.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; indent-tabs-mode: ni; c-basic-offset: 8 -*- */
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 
 /*
  * This file is part of The Croco Library
@@ -92,7 +92,7 @@ struct _CRDocHandler
 	 *destination media for style information.
 	 *@param a_uri the uri of the imported style sheet.
 	 *@param a_uri_default_ns the default namespace of URI
-	 *@param a_location the parsing location of the '@import' 
+	 *@param a_location the parsing location of the '\@import' 
 	 *keyword.
 	 *of the imported style sheet.
 	 */
@@ -175,7 +175,7 @@ struct _CRDocHandler
 	 *
 	 *@param a_this a pointer to the current instance of
 	 *#CRDocHandler.
-	 *@param a_location the parsing location of the "@font-face"
+	 *@param a_location the parsing location of the "\@font-face"
 	 *keyword.
 	 */
 	void (*start_font_face) (CRDocHandler *a_this,
@@ -227,7 +227,7 @@ struct _CRDocHandler
 	 *#CRDocHandler.
 	 *@param a_name the name of the page (if any, null otherwise).
 	 *@param a_pseudo_page the pseudo page (if any, null otherwise).
-	 *@param a_location the parsing location of the "@page" keyword.
+	 *@param a_location the parsing location of the "\@page" keyword.
 	 */
 	void (*start_page) (CRDocHandler *a_this,
 			    CRString *a_name, 
@@ -239,7 +239,7 @@ struct _CRDocHandler
 	 *@param a_this a pointer to the current instance of
 	 *#CRDocHandler.
 	 *@param a_name the name of the page (if any, null otherwise).
-	 *@parap a_pseudo_page the pseudo page (if any, null otherwise).
+	 *@param a_pseudo_page the pseudo page (if any, null otherwise).
 	 */
 	void (*end_page) (CRDocHandler *a_this,
 			  CRString *a_name,
@@ -276,11 +276,11 @@ CRDocHandler * cr_doc_handler_new (void) ;
 
 enum CRStatus cr_doc_handler_set_result (CRDocHandler *a_this, gpointer a_result) ;
 
-enum CRStatus cr_doc_handler_get_result (CRDocHandler *a_this, gpointer * a_result) ;
+enum CRStatus cr_doc_handler_get_result (CRDocHandler const *a_this, gpointer * a_result) ;
 
 enum CRStatus cr_doc_handler_set_ctxt (CRDocHandler *a_this, gpointer a_ctxt) ;
 
-enum CRStatus cr_doc_handler_get_ctxt (CRDocHandler *a_this, gpointer * a_ctxt) ;
+enum CRStatus cr_doc_handler_get_ctxt (CRDocHandler const *a_this, gpointer * a_ctxt) ;
 
 enum CRStatus cr_doc_handler_set_default_sac_handler (CRDocHandler *a_this) ;