[gtksourceview] Add Context as argument to gsc_provider_get_start_iter
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtksourceview] Add Context as argument to gsc_provider_get_start_iter
- Date: Sun, 4 Oct 2009 11:50:09 +0000 (UTC)
commit 4e1cfcf68321cebc2a052b72aa7d38cd542457d5
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Sun Oct 4 13:49:50 2009 +0200
Add Context as argument to gsc_provider_get_start_iter
.../words/gtksourcecompletionwords.c | 6 +++++-
gtksourceview/gtksourcecompletion.c | 4 +++-
gtksourceview/gtksourcecompletionprovider.c | 5 +++++
gtksourceview/gtksourcecompletionprovider.h | 2 ++
4 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
index 3da031c..30c3ad2 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
@@ -505,12 +505,16 @@ gtk_source_completion_words_class_init (GtkSourceCompletionWordsClass *klass)
static gboolean
gtk_source_completion_words_get_start_iter (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal,
+ GtkSourceCompletionContext *context,
GtkTextIter *iter)
{
GtkTextBuffer *buffer;
GtkSourceCompletionWordsBuffer *buf;
+ GtkTextIter it;
- buffer = gtk_text_iter_get_buffer (iter);
+ gtk_source_completion_context_get_iter (context, &it);
+
+ buffer = gtk_text_iter_get_buffer (&it);
buf = GET_WORDS_BUFFER (buffer);
gtk_text_buffer_get_iter_at_mark (buffer,
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 5ebcd5d..ce93275 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -239,6 +239,7 @@ activate_current_proposal (GtkSourceCompletion *completion)
has_start = gtk_source_completion_provider_get_start_iter (provider,
proposal,
+ completion->priv->context,
&start);
/* First hide the completion because the activation might actually
@@ -986,7 +987,8 @@ update_window_position (GtkSourceCompletion *completion)
gtk_text_buffer_get_start_iter (buffer, &iter);
if (gtk_source_completion_provider_get_start_iter (provider,
- proposal,
+ proposal,
+ completion->priv->context,
&iter))
{
gtk_source_completion_utils_move_to_iter (GTK_WINDOW (completion->priv->window),
diff --git a/gtksourceview/gtksourcecompletionprovider.c b/gtksourceview/gtksourcecompletionprovider.c
index b03e003..7b67003 100644
--- a/gtksourceview/gtksourcecompletionprovider.c
+++ b/gtksourceview/gtksourcecompletionprovider.c
@@ -82,6 +82,7 @@ gtk_source_completion_provider_update_info_default (GtkSourceCompletionProvider
static gboolean
gtk_source_completion_provider_get_start_iter_default (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal,
+ GtkSourceCompletionContext *context,
GtkTextIter *iter)
{
return FALSE;
@@ -289,6 +290,7 @@ gtk_source_completion_provider_update_info (GtkSourceCompletionProvider *provide
* gtk_source_completion_provider_get_start_iter:
* @provider: A #GtkSourceCompletionProvider
* @proposal: A #GtkSourceCompletionProposal
+ * @context: A #GtkSourceCompletionContext
* @iter: A #GtkTextIter
*
* Get the #GtkTextIter at which the completion for @proposal starts. When
@@ -302,14 +304,17 @@ gtk_source_completion_provider_update_info (GtkSourceCompletionProvider *provide
gboolean
gtk_source_completion_provider_get_start_iter (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal,
+ GtkSourceCompletionContext *context,
GtkTextIter *iter)
{
g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), FALSE);
g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), FALSE);
+ g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_start_iter (provider,
proposal,
+ context,
iter);
}
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h
index 148fadc..a681cad 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtksourcecompletionprovider.h
@@ -69,6 +69,7 @@ struct _GtkSourceCompletionProviderIface
gboolean (*get_start_iter) (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal,
+ GtkSourceCompletionContext *context,
GtkTextIter *iter);
gboolean (*activate_proposal) (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal,
@@ -100,6 +101,7 @@ void gtk_source_completion_provider_update_info (GtkSourceCompletionProvider
gboolean gtk_source_completion_provider_get_start_iter (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal,
+ GtkSourceCompletionContext *context,
GtkTextIter *iter);
gboolean gtk_source_completion_provider_activate_proposal (GtkSourceCompletionProvider *provider,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]