gtksourceviewmm r63 - in trunk: . gtksourceview/src

[murrayc svn gnome org]

Author: murrayc
Date: Wed Feb  6 01:29:38 2008
New Revision: 63
URL: http://svn.gnome.org/viewvc/gtksourceviewmm?rev=63&view=rev

Log:
2008-02-06  Murray Cumming  <murrayc murrayc com>

* gtksourceview/src/gtksourceview_docs.xml: Removed an odd character that 
was causing a warning.

* gtksourceview/src/gtksourceview_methods.defs: Regenerated with 
h2defs.py
* gtksourceview/src/sourcebuffer.ccg:
* gtksourceview/src/sourcebuffer.hg: Renamed the mark methods to match 
the latest API in gtksourceview.

I notice that there are some gmmproc warnings during the build too.

Modified:
   trunk/ChangeLog
   trunk/gtksourceview/src/gtksourceview_docs.xml
   trunk/gtksourceview/src/gtksourceview_methods.defs
   trunk/gtksourceview/src/sourcebuffer.ccg
   trunk/gtksourceview/src/sourcebuffer.hg

Modified: trunk/gtksourceview/src/gtksourceview_docs.xml
==============================================================================
--- trunk/gtksourceview/src/gtksourceview_docs.xml	(original)
+++ trunk/gtksourceview/src/gtksourceview_docs.xml	Wed Feb  6 01:29:38 2008
@@ -364,7 +364,7 @@
 </parameter_description>
 </parameter>
 </parameters>
-<return> %TRUE is merge was sucessful, %FALSE otherwise.²
+<return> %TRUE is merge was sucessful, %FALSE otherwise.
 </return>
 </function>
 

Modified: trunk/gtksourceview/src/gtksourceview_methods.defs
==============================================================================
--- trunk/gtksourceview/src/gtksourceview_methods.defs	(original)
+++ trunk/gtksourceview/src/gtksourceview_methods.defs	Wed Feb  6 01:29:38 2008
@@ -7,6 +7,20 @@
   (gtype-id "GTK_TYPE_SOURCE_BUFFER")
 )
 
+(define-object SourceEngine
+  (in-module "Gtk")
+  (parent "GObject")
+  (c-name "GtkSourceEngine")
+  (gtype-id "GTK_TYPE_SOURCE_ENGINE")
+)
+
+(define-object SourceContextEngine
+  (in-module "Gtk")
+  (parent "GtkSourceEngine")
+  (c-name "GtkSourceContextEngine")
+  (gtype-id "GTK_TYPE_SOURCE_CONTEXT_ENGINE")
+)
+
 (define-object SourceLanguage
   (in-module "Gtk")
   (parent "GObject")
@@ -28,6 +42,13 @@
   (gtype-id "GTK_TYPE_SOURCE_MARK")
 )
 
+(define-object SourcePrintCompositor
+  (in-module "Gtk")
+  (parent "GObject")
+  (c-name "GtkSourcePrintCompositor")
+  (gtype-id "GTK_TYPE_SOURCE_PRINT_COMPOSITOR")
+)
+
 (define-object SourceStyleScheme
   (in-module "Gtk")
   (parent "GObject")
@@ -42,6 +63,13 @@
   (gtype-id "GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER")
 )
 
+(define-object SourceUndoManager
+  (in-module "Gtk")
+  (parent "GObject")
+  (c-name "GtkSourceUndoManager")
+  (gtype-id "GTK_TYPE_SOURCE_UNDO_MANAGER")
+)
+
 (define-object SourceView
   (in-module "Gtk")
   (parent "GtkTextView")
@@ -51,6 +79,31 @@
 
 ;; Enumerations and flags ...
 
+(define-flags SourceContextFlags
+  (in-module "Gtk")
+  (c-name "GtkSourceContextFlags")
+  (gtype-id "GTK_TYPE_SOURCE_CONTEXT_FLAGS")
+  (values
+    '("extend-parent" "GTK_SOURCE_CONTEXT_EXTEND_PARENT")
+    '("end-parent" "GTK_SOURCE_CONTEXT_END_PARENT")
+    '("end-at-line-end" "GTK_SOURCE_CONTEXT_END_AT_LINE_END")
+    '("first-line-only" "GTK_SOURCE_CONTEXT_FIRST_LINE_ONLY")
+    '("once-only" "GTK_SOURCE_CONTEXT_ONCE_ONLY")
+    '("style-inside" "GTK_SOURCE_CONTEXT_STYLE_INSIDE")
+  )
+)
+
+(define-flags SourceContextRefOptions
+  (in-module "Gtk")
+  (c-name "GtkSourceContextRefOptions")
+  (gtype-id "GTK_TYPE_SOURCE_CONTEXT_REF_OPTIONS")
+  (values
+    '("ignore-style" "GTK_SOURCE_CONTEXT_IGNORE_STYLE")
+    '("override-style" "GTK_SOURCE_CONTEXT_OVERRIDE_STYLE")
+    '("ref-original" "GTK_SOURCE_CONTEXT_REF_ORIGINAL")
+  )
+)
+
 (define-flags SourceSearchFlags
   (in-module "Gtk")
   (c-name "GtkSourceSearchFlags")
@@ -220,9 +273,9 @@
   (return-type "none")
 )
 
-(define-method create_mark
+(define-method create_source_mark
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_create_mark")
+  (c-name "gtk_source_buffer_create_source_mark")
   (return-type "GtkSourceMark*")
   (parameters
     '("const-gchar*" "name")
@@ -231,9 +284,9 @@
   )
 )
 
-(define-method forward_iter_to_mark
+(define-method forward_iter_to_source_mark
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_forward_iter_to_mark")
+  (c-name "gtk_source_buffer_forward_iter_to_source_mark")
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
@@ -241,9 +294,9 @@
   )
 )
 
-(define-method backward_iter_to_mark
+(define-method backward_iter_to_source_mark
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_backward_iter_to_mark")
+  (c-name "gtk_source_buffer_backward_iter_to_source_mark")
   (return-type "gboolean")
   (parameters
     '("GtkTextIter*" "iter")
@@ -251,9 +304,9 @@
   )
 )
 
-(define-method get_marks_at_iter
+(define-method get_source_marks_at_iter
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_marks_at_iter")
+  (c-name "gtk_source_buffer_get_source_marks_at_iter")
   (return-type "GSList*")
   (parameters
     '("GtkTextIter*" "iter")
@@ -261,9 +314,9 @@
   )
 )
 
-(define-method get_marks_at_line
+(define-method get_source_marks_at_line
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_marks_at_line")
+  (c-name "gtk_source_buffer_get_source_marks_at_line")
   (return-type "GSList*")
   (parameters
     '("gint" "line")
@@ -271,9 +324,9 @@
   )
 )
 
-(define-method remove_marks
+(define-method remove_source_marks
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_remove_marks")
+  (c-name "gtk_source_buffer_remove_source_marks")
   (return-type "none")
   (parameters
     '("GtkTextIter*" "start")
@@ -284,6 +337,14 @@
 
 
 
+;; From gtksourcecontextengine.h
+
+
+
+;; From gtksourceengine.h
+
+
+
 ;; From gtksourceiter.h
 
 (define-function gtk_source_iter_forward_search
@@ -421,6 +482,10 @@
 
 
 
+;; From gtksourcelanguage-private.h
+
+
+
 ;; From gtksourcemark.h
 
 (define-function gtk_source_mark_get_type
@@ -464,6 +529,319 @@
 
 
 
+;; From gtksourceprintcompositor.h
+
+(define-function gtk_source_print_compositor_get_type
+  (c-name "gtk_source_print_compositor_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_source_print_compositor_new
+  (c-name "gtk_source_print_compositor_new")
+  (is-constructor-of "GtkSourcePrintCompositor")
+  (return-type "GtkSourcePrintCompositor*")
+  (parameters
+    '("GtkSourceBuffer*" "buffer")
+  )
+)
+
+(define-function gtk_source_print_compositor_new_from_view
+  (c-name "gtk_source_print_compositor_new_from_view")
+  (return-type "GtkSourcePrintCompositor*")
+  (parameters
+    '("GtkSourceView*" "view")
+  )
+)
+
+(define-method get_buffer
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_buffer")
+  (return-type "GtkSourceBuffer*")
+)
+
+(define-method set_tab_width
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_tab_width")
+  (return-type "none")
+  (parameters
+    '("guint" "width")
+  )
+)
+
+(define-method get_tab_width
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_tab_width")
+  (return-type "guint")
+)
+
+(define-method set_wrap_mode
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_wrap_mode")
+  (return-type "none")
+  (parameters
+    '("GtkWrapMode" "wrap_mode")
+  )
+)
+
+(define-method get_wrap_mode
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_wrap_mode")
+  (return-type "GtkWrapMode")
+)
+
+(define-method set_highlight_syntax
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_highlight_syntax")
+  (return-type "none")
+  (parameters
+    '("gboolean" "highlight")
+  )
+)
+
+(define-method get_highlight_syntax
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_highlight_syntax")
+  (return-type "gboolean")
+)
+
+(define-method set_print_line_numbers
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_print_line_numbers")
+  (return-type "none")
+  (parameters
+    '("guint" "interval")
+  )
+)
+
+(define-method get_print_line_numbers
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_print_line_numbers")
+  (return-type "guint")
+)
+
+(define-method set_body_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_body_font_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+  )
+)
+
+(define-method get_body_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_body_font_name")
+  (return-type "gchar*")
+)
+
+(define-method set_line_numbers_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_line_numbers_font_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+  )
+)
+
+(define-method get_line_numbers_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_line_numbers_font_name")
+  (return-type "gchar*")
+)
+
+(define-method set_header_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_header_font_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+  )
+)
+
+(define-method get_header_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_header_font_name")
+  (return-type "gchar*")
+)
+
+(define-method set_footer_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_footer_font_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+  )
+)
+
+(define-method get_footer_font_name
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_footer_font_name")
+  (return-type "gchar*")
+)
+
+(define-method get_top_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_top_margin")
+  (return-type "gdouble")
+  (parameters
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method set_top_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_top_margin")
+  (return-type "none")
+  (parameters
+    '("gdouble" "margin")
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method get_bottom_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_bottom_margin")
+  (return-type "gdouble")
+  (parameters
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method set_bottom_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_bottom_margin")
+  (return-type "none")
+  (parameters
+    '("gdouble" "margin")
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method get_left_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_left_margin")
+  (return-type "gdouble")
+  (parameters
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method set_left_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_left_margin")
+  (return-type "none")
+  (parameters
+    '("gdouble" "margin")
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method get_right_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_right_margin")
+  (return-type "gdouble")
+  (parameters
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method set_right_margin
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_right_margin")
+  (return-type "none")
+  (parameters
+    '("gdouble" "margin")
+    '("GtkUnit" "unit")
+  )
+)
+
+(define-method set_print_header
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_print_header")
+  (return-type "none")
+  (parameters
+    '("gboolean" "print")
+  )
+)
+
+(define-method get_print_header
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_print_header")
+  (return-type "gboolean")
+)
+
+(define-method set_print_footer
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_print_footer")
+  (return-type "none")
+  (parameters
+    '("gboolean" "print")
+  )
+)
+
+(define-method get_print_footer
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_print_footer")
+  (return-type "gboolean")
+)
+
+(define-method set_header_format
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_header_format")
+  (return-type "none")
+  (parameters
+    '("gboolean" "separator")
+    '("const-gchar*" "left")
+    '("const-gchar*" "center")
+    '("const-gchar*" "right")
+  )
+)
+
+(define-method set_footer_format
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_set_footer_format")
+  (return-type "none")
+  (parameters
+    '("gboolean" "separator")
+    '("const-gchar*" "left")
+    '("const-gchar*" "center")
+    '("const-gchar*" "right")
+  )
+)
+
+(define-method get_n_pages
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_n_pages")
+  (return-type "gint")
+)
+
+(define-method paginate
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_paginate")
+  (return-type "gboolean")
+  (parameters
+    '("GtkPrintContext*" "context")
+  )
+)
+
+(define-method get_pagination_progress
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_get_pagination_progress")
+  (return-type "gdouble")
+)
+
+(define-method draw_page
+  (of-object "GtkSourcePrintCompositor")
+  (c-name "gtk_source_print_compositor_draw_page")
+  (return-type "none")
+  (parameters
+    '("GtkPrintContext*" "context")
+    '("gint" "page_nr")
+  )
+)
+
+
+
 ;; From gtksourcestyle.h
 
 (define-function gtk_source_style_get_type
@@ -479,6 +857,10 @@
 
 
 
+;; From gtksourcestyle-private.h
+
+
+
 ;; From gtksourcestylescheme.h
 
 (define-function gtk_source_style_scheme_get_type
@@ -583,6 +965,75 @@
 
 
 
+;; From gtksourceundomanager.h
+
+(define-function gtk_source_undo_manager_get_type
+  (c-name "gtk_source_undo_manager_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_source_undo_manager_new
+  (c-name "gtk_source_undo_manager_new")
+  (is-constructor-of "GtkSourceUndoManager")
+  (return-type "GtkSourceUndoManager*")
+  (parameters
+    '("GtkTextBuffer*" "buffer")
+  )
+)
+
+(define-method can_undo
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_can_undo")
+  (return-type "gboolean")
+)
+
+(define-method can_redo
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_can_redo")
+  (return-type "gboolean")
+)
+
+(define-method undo
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_undo")
+  (return-type "none")
+)
+
+(define-method redo
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_redo")
+  (return-type "none")
+)
+
+(define-method begin_not_undoable_action
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_begin_not_undoable_action")
+  (return-type "none")
+)
+
+(define-method end_not_undoable_action
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_end_not_undoable_action")
+  (return-type "none")
+)
+
+(define-method get_max_undo_levels
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_get_max_undo_levels")
+  (return-type "gint")
+)
+
+(define-method set_max_undo_levels
+  (of-object "GtkSourceUndoManager")
+  (c-name "gtk_source_undo_manager_set_max_undo_levels")
+  (return-type "none")
+  (parameters
+    '("gint" "undo_levels")
+  )
+)
+
+
+
 ;; From gtksourceview.h
 
 (define-function gtk_source_view_get_type
@@ -809,6 +1260,14 @@
 
 
 
+;; From gtksourceview-i18n.h
+
+
+
+;; From gtksourceview-marshal.h
+
+
+
 ;; From gtksourceview-typebuiltins.h
 
 (define-function gtk_source_search_flags_get_type
@@ -817,3 +1276,124 @@
 )
 
 
+
+;; From gtksourceview-utils.h
+
+
+
+;; From gtktextregion.h
+
+(define-function gtk_text_region_new
+  (c-name "gtk_text_region_new")
+  (is-constructor-of "GtkTextRegion")
+  (return-type "GtkTextRegion*")
+  (parameters
+    '("GtkTextBuffer*" "buffer")
+  )
+)
+
+(define-method destroy
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_destroy")
+  (return-type "none")
+  (parameters
+    '("gboolean" "delete_marks")
+  )
+)
+
+(define-method get_buffer
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_get_buffer")
+  (return-type "GtkTextBuffer*")
+)
+
+(define-method add
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_add")
+  (return-type "none")
+  (parameters
+    '("const-GtkTextIter*" "_start")
+    '("const-GtkTextIter*" "_end")
+  )
+)
+
+(define-method subtract
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_subtract")
+  (return-type "none")
+  (parameters
+    '("const-GtkTextIter*" "_start")
+    '("const-GtkTextIter*" "_end")
+  )
+)
+
+(define-method subregions
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_subregions")
+  (return-type "gint")
+)
+
+(define-method nth_subregion
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_nth_subregion")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "subregion")
+    '("GtkTextIter*" "start")
+    '("GtkTextIter*" "end")
+  )
+)
+
+(define-method intersect
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_intersect")
+  (return-type "GtkTextRegion*")
+  (parameters
+    '("const-GtkTextIter*" "_start")
+    '("const-GtkTextIter*" "_end")
+  )
+)
+
+(define-method get_iterator
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_get_iterator")
+  (return-type "none")
+  (parameters
+    '("GtkTextRegionIterator*" "iter")
+    '("guint" "start")
+  )
+)
+
+(define-method is_end
+  (of-object "GtkTextRegionIterator")
+  (c-name "gtk_text_region_iterator_is_end")
+  (return-type "gboolean")
+)
+
+(define-method next
+  (of-object "GtkTextRegionIterator")
+  (c-name "gtk_text_region_iterator_next")
+  (return-type "gboolean")
+)
+
+(define-method get_subregion
+  (of-object "GtkTextRegionIterator")
+  (c-name "gtk_text_region_iterator_get_subregion")
+  (return-type "none")
+  (parameters
+    '("GtkTextIter*" "start")
+    '("GtkTextIter*" "end")
+  )
+)
+
+(define-method debug_print
+  (of-object "GtkTextRegion")
+  (c-name "gtk_text_region_debug_print")
+  (return-type "none")
+)
+
+
+
+;; From stamp-gtksourceview-typebuiltins.h
+
+

Modified: trunk/gtksourceview/src/sourcebuffer.ccg
==============================================================================
--- trunk/gtksourceview/src/sourcebuffer.ccg	(original)
+++ trunk/gtksourceview/src/sourcebuffer.ccg	Wed Feb  6 01:29:38 2008
@@ -39,24 +39,24 @@
     }
 }
 
-bool SourceBuffer::backward_iter_to_mark(Gtk::TextIter& iter)
+bool SourceBuffer::backward_iter_to_source_mark(Gtk::TextIter& iter)
 {
-    return gtk_source_buffer_backward_iter_to_mark(gobj(), iter.gobj(), NULL);
+    return gtk_source_buffer_backward_iter_to_source_mark(gobj(), iter.gobj(), NULL);
 }
 
-bool SourceBuffer::forward_iter_to_mark(Gtk::TextIter& iter)
+bool SourceBuffer::forward_iter_to_source_mark(Gtk::TextIter& iter)
 {
-    return gtk_source_buffer_forward_iter_to_mark(gobj(), iter.gobj(), NULL);
+    return gtk_source_buffer_forward_iter_to_source_mark(gobj(), iter.gobj(), NULL);
 }
 
-Glib::SListHandle<Glib::RefPtr<SourceMark> > SourceBuffer::get_marks_at_line(int line) const
+Glib::SListHandle<Glib::RefPtr<SourceMark> > SourceBuffer::get_source_marks_at_line(int line) const
 {
-    return Glib::SListHandle<Glib::RefPtr<SourceMark> >(gtk_source_buffer_get_marks_at_line(const_cast<GtkSourceBuffer*>(gobj()), line, NULL), Glib::OWNERSHIP_SHALLOW);
+    return Glib::SListHandle<Glib::RefPtr<SourceMark> >(gtk_source_buffer_get_source_marks_at_line(const_cast<GtkSourceBuffer*>(gobj()), line, NULL), Glib::OWNERSHIP_SHALLOW);
 }
 
-Glib::SListHandle<Glib::RefPtr<SourceMark> > SourceBuffer::get_marks_at_iter(Gtk::TextIter& iter) const
+Glib::SListHandle<Glib::RefPtr<SourceMark> > SourceBuffer::get_source_marks_at_iter(Gtk::TextIter& iter) const
 {
-    return Glib::SListHandle<Glib::RefPtr<SourceMark> >(gtk_source_buffer_get_marks_at_iter(const_cast<GtkSourceBuffer*>(gobj()), iter.gobj(), NULL), Glib::OWNERSHIP_SHALLOW);
+    return Glib::SListHandle<Glib::RefPtr<SourceMark> >(gtk_source_buffer_get_source_marks_at_iter(const_cast<GtkSourceBuffer*>(gobj()), iter.gobj(), NULL), Glib::OWNERSHIP_SHALLOW);
 }
 
 }//end namespace gtksourceview

Modified: trunk/gtksourceview/src/sourcebuffer.hg
==============================================================================
--- trunk/gtksourceview/src/sourcebuffer.hg	(original)
+++ trunk/gtksourceview/src/sourcebuffer.hg	Wed Feb  6 01:29:38 2008
@@ -199,30 +199,32 @@
   /// the list of undo actions is cleared and the undo manager is re-enabled.
   _WRAP_METHOD(void end_not_undoable_action(), gtk_source_buffer_end_not_undoable_action)
 
-  _WRAP_METHOD(bool backward_iter_to_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_backward_iter_to_mark)
+  _WRAP_METHOD(bool backward_iter_to_source_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_backward_iter_to_source_mark)
   // overload with category == NULL
-  bool backward_iter_to_mark(Gtk::TextIter& iter);
+  bool backward_iter_to_source_mark(Gtk::TextIter& iter);
 
-  _WRAP_METHOD(bool forward_iter_to_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_forward_iter_to_mark)
+  _WRAP_METHOD(bool forward_iter_to_source_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_forward_iter_to_source_mark)
   // overload with category == NULL
-  bool forward_iter_to_mark(Gtk::TextIter& iter);
+  bool forward_iter_to_source_mark(Gtk::TextIter& iter);
 
   _WRAP_METHOD(void ensure_highlight(const Gtk::TextIter& start, const Gtk::TextIter& end), gtk_source_buffer_ensure_highlight)
   _WRAP_METHOD(void set_style_scheme(const Glib::RefPtr<SourceStyleScheme>& scheme), gtk_source_buffer_set_style_scheme)
   _WRAP_METHOD(Glib::RefPtr<SourceStyleScheme> get_style_scheme(), gtk_source_buffer_get_style_scheme, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const SourceStyleScheme> get_style_scheme() const, gtk_source_buffer_get_style_scheme, constversion, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<SourceMark> create_mark(const Glib::ustring& name, const Glib::ustring& category, const Gtk::TextIter& where), gtk_source_buffer_create_mark)
+  _WRAP_METHOD(Glib::RefPtr<SourceMark> create_source_mark(const Glib::ustring& name, const Glib::ustring& category, const Gtk::TextIter& where), gtk_source_buffer_create_source_mark)
 
 #m4 _CONVERSION(`GSList*',`Glib::SListHandle<Glib::RefPtr<SourceMark> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
 #m4 _CONVERSION(`GSList*',`Glib::SListHandle<Glib::RefPtr<const SourceMark> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<SourceMark> > get_marks_at_line(int line, const Glib::ustring& category) const, gtk_source_buffer_get_marks_at_line)
+  _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_line(int line, const Glib::ustring& category) const, gtk_source_buffer_get_source_marks_at_line)
 
   // overloaded with category == NULL
-  Glib::SListHandle<Glib::RefPtr<SourceMark> > get_marks_at_line(int line) const;
-  _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<SourceMark> > get_marks_at_iter(Gtk::TextIter& iter, const Glib::ustring& category) const, gtk_source_buffer_get_marks_at_iter)
+  Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_line(int line) const;
+  _WRAP_METHOD(Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_iter(Gtk::TextIter& iter, const Glib::ustring& category) const, gtk_source_buffer_get_source_marks_at_iter)
   // overloaded with category == NULL
-  Glib::SListHandle<Glib::RefPtr<SourceMark> > get_marks_at_iter(Gtk::TextIter& iter) const;
+  Glib::SListHandle<Glib::RefPtr<SourceMark> > get_source_marks_at_iter(Gtk::TextIter& iter) const;
 
+  //TODO Fix the constness in the C API. See bug #
+  //_WRAP_METHOD(void remove_source_marks(const Gtk::TextIter& start, const Gtk::TextIter& end, const Glib::ustring& category), gtk_source_buffer_remove_source_marks)
 
   /// \name signals
   /// @{