[gtksourceview/gtksourcecompletion: 135/135] Merge branch 'master' into gtksourcecompletion

From: Jesse van den Kieboom <jessevdk src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gtksourceview/gtksourcecompletion: 135/135] Merge branch 'master' into gtksourcecompletion
Date: Sun, 20 Sep 2009 17:31:31 +0000 (UTC)
commit d6044693838ebb0b585d6c1d599bb7f5b28b3e52
Merge: 18d5595... 19702e7...
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sun Sep 20 18:46:24 2009 +0200

    Merge branch 'master' into gtksourcecompletion
    
    Conflicts:
    	ChangeLog
    	HACKING
    	docs/reference/Makefile.am
    	docs/reference/gtksourceview-2.0-sections.txt
    	docs/reference/gtksourceview-2.0.types
    	docs/reference/tmpl/view.sgml
    	gtksourceview/Makefile.am
    	gtksourceview/gtksourcecontextengine.c
    	gtksourceview/gtksourceview-marshal.list
    	gtksourceview/gtksourceview.c
    	gtksourceview/gtksourceview.h
    	tests/test-widget.c

 ChangeLog                                       | 2915 +---------------------
 ChangeLog-20090418                              | 2717 ++++++++++++++++++++
 HACKING                                         |    2 +-
 MAINTAINERS                                     |    4 +
 Makefile.am                                     |   37 +-
 NEWS                                            |   41 +
 README                                          |    6 +-
 configure.ac                                    |    5 +-
 docs/Makefile.am                                |    2 +
 docs/reference/Makefile.am                      |    5 +-
 docs/reference/gtksourceview-2.0-sections.txt   |   34 +
 docs/reference/gtksourceview-2.0.types          |    3 +-
 docs/reference/gtksourceview-docs.sgml          |    1 +
 docs/reference/lang-tutorial.sgml               |  124 +-
 docs/reference/tmpl/gutter.sgml                 |  171 ++
 docs/reference/tmpl/stylemanager.sgml           |  106 -
 docs/reference/tmpl/stylescheme.sgml            |    2 +-
 docs/reference/tmpl/styleschememanager.sgml     |  114 +
 docs/reference/tmpl/view.sgml                   |   90 +
 git.mk                                          |  182 ++
 gtksourceview.doap                              |   32 +
 gtksourceview/Makefile.am                       |   19 +-
 gtksourceview/gtksourcebuffer.c                 |   70 +-
 gtksourceview/gtksourcecontextengine.c          |    3 +-
 gtksourceview/gtksourcegutter-private.h         |   17 +
 gtksourceview/gtksourcegutter.c                 | 1223 +++++++++
 gtksourceview/gtksourcegutter.h                 |  107 +
 gtksourceview/gtksourcelanguage-parser-2.c      |   18 +-
 gtksourceview/gtksourcelanguage.c               |    7 +-
 gtksourceview/gtksourcelanguage.h               |    4 +-
 gtksourceview/gtksourceprintcompositor.c        |   13 +-
 gtksourceview/gtksourceundomanager.c            |   10 +-
 gtksourceview/gtksourceview-i18n.h              |    4 +-
 gtksourceview/gtksourceview-marshal.list        |    3 +
 gtksourceview/gtksourceview.c                   | 1953 +++++++++-----
 gtksourceview/gtksourceview.h                   |   62 +-
 gtksourceview/language-specs/Makefile.am        |    5 +
 gtksourceview/language-specs/asp.lang           |    6 +-
 gtksourceview/language-specs/cobalt.xml         |    2 +-
 gtksourceview/language-specs/cuda.lang          |  288 +++
 gtksourceview/language-specs/eiffel.lang        |  114 +-
 gtksourceview/language-specs/fortran.lang       |    1 +
 gtksourceview/language-specs/glsl.lang          |  407 +++
 gtksourceview/language-specs/haskell.lang       |    1 +
 gtksourceview/language-specs/kate.xml           |   19 +-
 gtksourceview/language-specs/lang_v1_to_v2.xslt |  476 ++--
 gtksourceview/language-specs/makefile.lang      |    2 +-
 gtksourceview/language-specs/mallard.lang       |  122 +
 gtksourceview/language-specs/oblivion.xml       |    1 +
 gtksourceview/language-specs/octave.lang        |    2 +-
 gtksourceview/language-specs/prolog.lang        |    3 +-
 gtksourceview/language-specs/python.lang        |    1 +
 gtksourceview/language-specs/sh.lang            |   95 +-
 gtksourceview/language-specs/testfiles.sh       |   31 +
 gtksourceview/language-specs/vala.lang          |    1 +
 gtksourceview/language-specs/verilog.lang       |   12 +-
 po/ChangeLog                                    |   10 +
 po/LINGUAS                                      |    1 +
 po/POTFILES.in                                  |    2 +
 po/POTFILES.skip                                |    2 +
 po/ar.po                                        |  248 +-
 po/as.po                                        |  339 ++--
 po/bg.po                                        |  117 +-
 po/bn.po                                        | 3111 ++++++++++++++---------
 po/bn_IN.po                                     |  357 +--
 po/ca valencia po                               | 2881 +++++++++++++++++++++
 po/da.po                                        |  126 +-
 po/de.po                                        |  126 +-
 po/en_GB.po                                     |  144 +-
 po/es.po                                        |  127 +-
 po/et.po                                        | 1453 ++---------
 po/eu.po                                        |  123 +-
 po/fi.po                                        |  125 +-
 po/fr.po                                        |  121 +-
 po/ga.po                                        | 2632 +++++++++++++-------
 po/gl.po                                        |  173 +-
 po/gu.po                                        |  159 +-
 po/hi.po                                        | 1151 ++++++----
 po/hu.po                                        |  137 +-
 po/it.po                                        |  164 +-
 po/kn.po                                        |  709 ++++--
 po/ko.po                                        |  124 +-
 po/lt.po                                        |  775 ++++--
 po/ml.po                                        |  255 +-
 po/mr.po                                        |  168 +-
 po/nb.po                                        |  204 +-
 po/or.po                                        |  138 +-
 po/pa.po                                        |  164 +-
 po/pl.po                                        |  151 +-
 po/pt.po                                        |  122 +-
 po/pt_BR.po                                     |  134 +-
 po/ro.po                                        |  782 ++----
 po/sl.po                                        |  121 +-
 po/sv.po                                        |  117 +-
 po/ta.po                                        |  165 +-
 po/te.po                                        |  272 +-
 po/th.po                                        |  127 +-
 po/tr.po                                        |  732 ++++--
 po/uk.po                                        |  721 ++++--
 po/zh_HK.po                                     |  130 +-
 po/zh_TW.po                                     |  130 +-
 tests/Makefile.am                               |    2 +
 tests/test-widget.c                             |  182 +-
 tests/testfiles.sh                              |   17 +
 104 files changed, 20571 insertions(+), 11395 deletions(-)
---
diff --cc docs/reference/Makefile.am
index 97684c3,2d8acff..b7f52de
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@@ -35,18 -34,7 +35,19 @@@ IGNORE_HFILES =					
  	gtksourceengine.h			\
  	gtksourcecontextengine.h		\
  	gtksourceprintjob.h			\
 -	gtksourcegutter-private.h
++	gtksourcegutter-private.h		\
 +	gtksourcecompletionmodel.h		\
 +	gtksourcecompletionutils.h		\
 +	../tests/gsc-devhelp-provider.h		\
 +	../tests/gsc-words-provider.h
 +
 +update-sections: $(HFILE_GLOB)
 +	@echo 'gtk-doc: Scanning header files'
 +	cp $(DOC_MODULE)-sections.txt $(DOC_MODULE)-sections.txt.old && \
 +	(cd $(srcdir) && \
 +	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" --rebuild-sections $(SCAN_OPTIONS) $(EXTRA_HFILES)) && \
 +	cp $(DOC_MODULE)-sections.txt $(DOC_MODULE)-sections.txt.new && \
 +	mv $(DOC_MODULE)-sections.txt.old $(DOC_MODULE)-sections.txt
  
  # Extra options to supply to gtkdoc-mkdb
  MKDB_OPTIONS = --sgml-mode --output-format=xml --ignore-files=trio
diff --cc docs/reference/gtksourceview-2.0-sections.txt
index 7c3780e,e5a2676..c0d208b
--- a/docs/reference/gtksourceview-2.0-sections.txt
+++ b/docs/reference/gtksourceview-2.0-sections.txt
@@@ -80,7 -87,7 +87,8 @@@ gtk_source_view_set_tab_widt
  gtk_source_view_get_tab_width
  gtk_source_view_set_draw_spaces
  gtk_source_view_get_draw_spaces
 +gtk_source_view_get_completion
+ gtk_source_view_get_gutter
  <SUBSECTION Standard>
  GTK_IS_SOURCE_VIEW
  GTK_IS_SOURCE_VIEW_CLASS
diff --cc docs/reference/gtksourceview-2.0.types
index 14bb7ee,fe4d27d..d3bdb12
--- a/docs/reference/gtksourceview-2.0.types
+++ b/docs/reference/gtksourceview-2.0.types
@@@ -5,13 -5,8 +5,14 @@@
  #include <gtksourceview/gtksourcelanguagemanager.h>
  #include <gtksourceview/gtksourcestyleschememanager.h>
  #include <gtksourceview/gtksourcemark.h>
+ #include <gtksourceview/gtksourcegutter.h>
  
 +#include <gtksourceview/gtksourcecompletion.h>
 +#include <gtksourceview/gtksourcecompletionprovider.h>
 +#include <gtksourceview/gtksourcecompletionproposal.h>
 +#include <gtksourceview/gtksourcecompletionitem.h>
 +#include <gtksourceview/gtksourcecompletioninfo.h>
 +
  gtk_source_view_get_type
  gtk_source_buffer_get_type
  gtk_source_language_get_type
@@@ -21,9 -16,4 +22,9 @@@ gtk_source_style_get_typ
  gtk_source_style_scheme_get_type
  gtk_source_style_scheme_manager_get_type
  gtk_source_mark_get_type
- 
 +gtk_source_completion_get_type
 +gtk_source_completion_provider_get_type
 +gtk_source_completion_proposal_get_type
 +gtk_source_completion_item_get_type
 +gtk_source_completion_info_get_type
+ gtk_source_gutter_get_type
diff --cc docs/reference/gtksourceview-docs.sgml
index 235835b,47cef36..6ef7d83
--- a/docs/reference/gtksourceview-docs.sgml
+++ b/docs/reference/gtksourceview-docs.sgml
@@@ -14,12 -14,8 +14,13 @@@
    <reference>
      <title>API reference</title>
      <xi:include href="xml/buffer.xml"/>
 +    <xi:include href="xml/completion.xml"/>
 +    <xi:include href="xml/completioninfo.xml"/>
 +    <xi:include href="xml/completionitem.xml"/>
 +    <xi:include href="xml/completionproposal.xml"/>
 +    <xi:include href="xml/completionprovider.xml"/>
      <xi:include href="xml/iter.xml"/>
+     <xi:include href="xml/gutter.xml"/>
      <xi:include href="xml/mark.xml"/>
      <xi:include href="xml/view.xml"/>
      <xi:include href="xml/language.xml"/>
diff --cc docs/reference/tmpl/view.sgml
index c172bc9,35f2b15..1239923
--- a/docs/reference/tmpl/view.sgml
+++ b/docs/reference/tmpl/view.sgml
@@@ -119,11 -116,21 +128,21 @@@ a text view which syntax highlighting, 
  @parent_class: 
  @undo: 
  @redo: 
+ @line_mark_activated: 
 + show_completion: 
  @_gtk_source_reserved1: 
  @_gtk_source_reserved2: 
  @_gtk_source_reserved3: 
  
+ <!-- ##### USER_FUNCTION GtkSourceViewMarkTooltipFunc ##### -->
+ <para>
+ Function type for setting up a tooltip for #GtkSourceMark.
+ </para>
+ 
+ @mark: the #GtkSourceMark
+ @user_data: user data pointer which was passed to gtk_source_view_set_mark_category_tooltip_func()
+ @Returns: a new-allocated text that is going to be shown as tooltip text.
+ 
 -
  <!-- ##### ENUM GtkSourceSmartHomeEndType ##### -->
  <para>
  
@@@ -439,12 -508,13 +520,21 @@@
  @Returns: 
  
  
 +<!-- ##### FUNCTION gtk_source_view_get_completion ##### -->
 +<para>
 +
 +</para>
 +
 + view: 
 + Returns: 
 +
+ <!-- ##### FUNCTION gtk_source_view_get_gutter ##### -->
+ <para>
+ 
+ </para>
+ 
+ @view: 
+ @window_type: 
+ @Returns: 
+ 
  
diff --cc gtksourceview/Makefile.am
index 26f8fa0,95372e3..76f4c7d
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@@ -28,16 -28,7 +28,18 @@@ libgtksourceview_headers =			
  	gtksourcestylescheme.h			\
  	gtksourcemark.h				\
  	gtksourceprintcompositor.h		\
 -	gtksourcegutter.h
++	gtksourcegutter.h			\
 +	gtksourcecompletion.h			\
 +	gtksourcecompletioninfo.h		\
 +	gtksourcecompletionitem.h		\
 +	gtksourcecompletionproposal.h		\
 +	gtksourcecompletionprovider.h 		\
 +	gtksourcecompletioncontext.h
 +
 +NOINST_H_FILES = \
 +	gtksourcecompletionutils.h		\
- 	gtksourcecompletion-private.h
++	gtksourcecompletion-private.h		\
++	gtksourcegutter-private.h
  
  libgtksourceview_2_0_la_SOURCES = 	\
  	gtksourcebuffer.c 		\
@@@ -66,17 -57,9 +68,18 @@@
  	gtksourcecontextengine.c	\
  	gtksourcemark.c			\
  	gtksourceprintcompositor.c      \
 -	gtksourcegutter-private.h	\
+ 	gtksourcegutter.c		\
 -	$(libgtksourceview_headers)
 +	gtksourcecompletion.c		\
 +	gtksourcecompletioninfo.c	\
 +	gtksourcecompletionitem.c	\
 +	gtksourcecompletionproposal.c	\
 +	gtksourcecompletionprovider.c	\
 +	gtksourcecompletionmodel.c	\
 +	gtksourcecompletionmodel.h	\
 +	gtksourcecompletionutils.c	\
 +	gtksourcecompletioncontext.c 	\
 +	$(libgtksourceview_headers)	\
 +	$(NOINST_H_FILES)
  
  # do not distribute generated files
  nodist_libgtksourceview_2_0_la_SOURCES =\
@@@ -90,14 -73,11 +93,14 @@@ libgtksourceview_2_0_include_HEADERS 
  	$(libgtksourceview_headers)		\
  	gtksourceview-typebuiltins.h
  
 +uidir = $(datadir)/gtksourceview-2.0/ui
 +ui_DATA = completion.ui
 +
  gtksourceview-marshal.h: gtksourceview-marshal.list $(GLIB_GENMARSHAL)
- 	$(GLIB_GENMARSHAL) $< --header --prefix=_gtksourceview_marshal > $@
+ 	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=_gtksourceview_marshal > $@
  
  gtksourceview-marshal.c: gtksourceview-marshal.list $(GLIB_GENMARSHAL)
- 	echo "#include \"gtksourceview-marshal.h\"" > $@ && \
+ 	$(AM_V_GEN) echo "#include \"gtksourceview-marshal.h\"" > $@ && \
  	$(GLIB_GENMARSHAL) $< --body --prefix=_gtksourceview_marshal >> $@
  
  gtksourceview-typebuiltins.c: stamp-gtksourceview-typebuiltins.c
@@@ -138,7 -118,8 +141,9 @@@ stamp-gtksourceview-typebuiltins.h: Mak
  	&& rm -f xgen-gth && echo stamp > $(@F)
  
  EXTRA_DIST = \
 -	gtksourceview-marshal.list
 +	gtksourceview-marshal.list \
 +	$(ui_DATA)
  
  CLEANFILES = $(BUILT_SOURCES) stamp-gtksourceview-typebuiltins.h stamp-gtksourceview-typebuiltins.c
+ 
+ -include $(top_srcdir)/git.mk
diff --cc gtksourceview/gtksourceview-marshal.list
index 477f96f,5518236..84dd412
--- a/gtksourceview/gtksourceview-marshal.list
+++ b/gtksourceview/gtksourceview-marshal.list
@@@ -4,8 -4,6 +4,11 @@@ VOID:BOXE
  VOID:BOXED,BOXED
  VOID:INT,INT
  VOID:STRING
 +BOOLEAN:POINTER
 +BOOLEAN:VOID
 +BOOLEAN:OBJECT
 +BOOLEAN:OBJECT,OBJECT
 +VOID:ENUM,INT
+ VOID:OBJECT,BOXED,POINTER
+ BOOL:OBJECT,BOXED,OBJECT
+ VOID:BOXED,POINTER
diff --cc gtksourceview/gtksourceview.c
index 276e389,d92c565..b7676ff
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@@ -39,8 -39,7 +39,9 @@@
  #include "gtksourceview-typebuiltins.h"
  #include "gtksourcemark.h"
  #include "gtksourceview.h"
 +#include "gtksourcecompletion-private.h"
 +#include "gtksourcecompletionutils.h"
+ #include "gtksourcegutter-private.h"
  
  /*
  #define ENABLE_DEBUG
@@@ -81,7 -79,7 +81,8 @@@
  enum {
  	UNDO,
  	REDO,
 +	SHOW_COMPLETION,
+ 	LINE_MARK_ACTIVATED,
  	LAST_SIGNAL
  };
  
@@@ -131,13 -128,15 +132,18 @@@ struct _GtkSourceViewPrivat
  	GHashTable 	*mark_categories;
  
  	GtkSourceBuffer *source_buffer;
- 	gint		 old_lines;
  
+ 	GtkSourceGutter *left_gutter;
+ 	GtkSourceGutter *right_gutter;
+ 
+ 	GtkCellRenderer *line_renderer;
+ 	GtkCellRenderer *marks_renderer;
+ 	
  	GdkColor         current_line_color;
  	guint            current_line_color_set : 1;
 +	
 +	GtkSourceCompletion	*completion;
 +	gboolean         destroy_has_run;
  };
  
  
@@@ -449,30 -452,30 +478,53 @@@ gtk_source_view_class_init (GtkSourceVi
  			      _gtksourceview_marshal_VOID__VOID,
  			      G_TYPE_NONE,
  			      0);
 +			    
 +	/**
 +	 * GtkSourceView::show-completion:
 +	 * @view: The #GtkSourceView who emits the signal
 +	 *
 +	 * The ::show-completion signal is a keybinding signal which gets 
 +	 * emitted when the user initiates a completion in default mode.
 +	 *
 +	 * Applications should not connect to it, but may emit it with
 +	 * #g_signal_emit_by_name if they need to control the default mode
 +	 * completion activation.
 +	 *
 +	 */
 +	signals [SHOW_COMPLETION] =
 +		g_signal_new ("show-completion",
 +			      G_TYPE_FROM_CLASS (klass),
 +			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 +			      G_STRUCT_OFFSET (GtkSourceViewClass, show_completion),
 +			      NULL,
 +			      NULL,
 +			      _gtksourceview_marshal_VOID__VOID,
 +			      G_TYPE_NONE,
 +			      0);
  
+ 	/**
+ 	 * GtkSourceView::line-mark-activated:
+ 	 * @view: the #GtkSourceView
+ 	 * @iter: a #GtkTextIter
+ 	 * @event: the #GdkEvent that activated the event
+ 	 *
+ 	 * Emitted when a line mark has been activated (for instance when there 
+ 	 * was a button press in the line marks gutter). You can use @iter to
+ 	 * determine on which line the activation took place.
+ 	 */
+ 	signals [LINE_MARK_ACTIVATED] =
+ 		g_signal_new ("line-mark-activated",
+ 			      G_TYPE_FROM_CLASS (klass),
+ 			      G_SIGNAL_RUN_LAST,
+ 			      G_STRUCT_OFFSET (GtkSourceViewClass, line_mark_activated),
+ 			      NULL,
+ 			      NULL,
+ 			      _gtksourceview_marshal_VOID__BOXED_POINTER,
+ 			      G_TYPE_NONE,
+ 			      2,
+ 			      GTK_TYPE_TEXT_ITER,
+ 			      G_TYPE_POINTER);
+ 
  	binding_set = gtk_binding_set_by_class (klass);
  
  	gtk_binding_entry_add_signal (binding_set,
@@@ -4104,25 -4486,49 +4608,70 @@@ gtk_source_view_update_style_scheme (Gt
  			view->priv->style_scheme_applied = FALSE;
  	}
  }
 +							 
 +/**
 + * gtk_source_view_get_completion:
 + * @view: a #GtkSourceView
 + *
 + * Gets the #GtkSourceCompletion associated with @view.
 + *
 + * Returns: the #GtkSourceCompletion associated with @view.
 + */
 +GtkSourceCompletion *
 +gtk_source_view_get_completion (GtkSourceView *view)
 +{
 +	g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
 +	
 +	if (view->priv->completion == NULL)
 +	{
 +		view->priv->completion = gtk_source_completion_new (view);
 +		g_object_ref_sink (view->priv->completion);
 +	}
 +	
 +	return view->priv->completion;
 +}
+ 
+ /**
+  * gtk_source_view_get_gutter:
+  * @view: a #GtkSourceView
+  * @window_type: the gutter window type
+  *
+  * Returns the #GtkSourceGutter object associated with @window_type for @view.
+  * Only GTK_TEXT_WINDOW_LEFT and GTK_TEXT_WINDOW_RIGHT are supported, 
+  * respectively corresponding to the left and right gutter. The line numbers
+  * and mark category icons are rendered in the gutter corresponding to
+  * GTK_TEXT_WINDOW_LEFT.
+  *
+  * Since: 2.8
+  *
+  * Returns: the #GtkSourceGutter.
+  **/
+ GtkSourceGutter *
+ gtk_source_view_get_gutter (GtkSourceView     *view,
+                             GtkTextWindowType  window_type)
+ {
+ 	g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
+ 	g_return_val_if_fail (window_type == GTK_TEXT_WINDOW_LEFT ||
+ 	                      window_type == GTK_TEXT_WINDOW_RIGHT, NULL);
+ 
+ 	if (window_type == GTK_TEXT_WINDOW_LEFT)
+ 	{
+ 		if (view->priv->left_gutter == NULL)
+ 		{
+ 			view->priv->left_gutter = gtk_source_gutter_new (view,
+ 			                                                 window_type);
+ 		}
+ 
+ 		return view->priv->left_gutter;
+ 	}
+ 	else
+ 	{
+ 		if (view->priv->right_gutter == NULL)
+ 		{
+ 			view->priv->right_gutter = gtk_source_gutter_new (view,
+ 			                                                 window_type);
+ 		}
+ 
+ 		return view->priv->right_gutter;
+ 	}
+ }
 -
diff --cc gtksourceview/gtksourceview.h
index 06b21e5,eb15ff8..88984c7
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtksourceview.h
@@@ -28,7 -28,7 +28,8 @@@
  #include <gtk/gtktextview.h>
  
  #include <gtksourceview/gtksourcebuffer.h>
 +#include <gtksourceview/gtksourcecompletion.h>
+ #include <gtksourceview/gtksourcegutter.h>
  
  G_BEGIN_DECLS
  
@@@ -56,14 -61,16 +62,16 @@@ struct _GtkSourceViewClas
  {
  	GtkTextViewClass parent_class;
  
- 	void (*undo) 			(GtkSourceView *view);
- 	void (*redo) 			(GtkSourceView *view);
- 	void (*show_completion) 	(GtkSourceView *view);
+ 	void (*undo) (GtkSourceView *view);
+ 	void (*redo) (GtkSourceView *view);
+ 	void (*line_mark_activated) (GtkSourceView *view, 
+ 	                             GtkTextIter   *iter,
+ 	                             GdkEvent      *event);
++	void (*show_completion) (GtkSourceView *view);
  
  	/* Padding for future expansion */
- 	void (*_gtk_source_reserved1) 	(void);
- 	void (*_gtk_source_reserved2) 	(void);
- 	void (*_gtk_source_reserved3) 	(void);
+ 	void (*_gtk_source_reserved1) (void);
+ 	void (*_gtk_source_reserved2) (void);
 -	void (*_gtk_source_reserved3) (void);
  };
  
  /**
@@@ -199,8 -241,8 +242,11 @@@ void		 gtk_source_view_set_draw_spaces	
  GtkSourceDrawSpacesFlags
  		gtk_source_view_get_draw_spaces		(GtkSourceView   *view);
  
 +GtkSourceCompletion *
 +		gtk_source_view_get_completion		(GtkSourceView   *view);
 +
+ GtkSourceGutter *gtk_source_view_get_gutter		(GtkSourceView     *view,
+                                                          GtkTextWindowType  window_type);
+ 
  G_END_DECLS
  #endif				/* end of SOURCE_VIEW_H__ */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]