[gtksourceview] Bracket matching: rename instance variable bracket_match
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Bracket matching: rename instance variable bracket_match
- Date: Sat, 24 Oct 2015 13:50:02 +0000 (UTC)
commit d1d66f569acb94681ca78b62c6470743c44e8fe1
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sat Oct 24 15:46:18 2015 +0200
Bracket matching: rename instance variable bracket_match
The name bracket_match is more logical to use for a GtkTextIter, for the
bracket match location. So rename to bracket_match_state.
gtksourceview/gtksourcebuffer.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index b010833..c4055b9 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -173,7 +173,7 @@ enum
struct _GtkSourceBufferPrivate
{
GtkTextTag *bracket_match_tag;
- GtkSourceBracketMatchType bracket_match;
+ GtkSourceBracketMatchType bracket_match_state;
/* Hash table: category -> MarksSequence */
GHashTable *source_marks;
@@ -543,7 +543,7 @@ gtk_source_buffer_init (GtkSourceBuffer *buffer)
priv->highlight_syntax = TRUE;
priv->highlight_brackets = TRUE;
- priv->bracket_match = GTK_SOURCE_BRACKET_MATCH_NONE;
+ priv->bracket_match_state = GTK_SOURCE_BRACKET_MATCH_NONE;
priv->max_undo_levels = -1;
priv->source_marks = g_hash_table_new_full (g_str_hash,
@@ -912,13 +912,14 @@ cursor_moved (GtkSourceBuffer *source_buffer)
&insert_iter,
gtk_text_buffer_get_insert (buffer));
- previous_state = source_buffer->priv->bracket_match;
- source_buffer->priv->bracket_match = _gtk_source_buffer_find_bracket_match (source_buffer,
- &insert_iter,
- &bracket,
- &bracket_match);
+ previous_state = source_buffer->priv->bracket_match_state;
+ source_buffer->priv->bracket_match_state =
+ _gtk_source_buffer_find_bracket_match (source_buffer,
+ &insert_iter,
+ &bracket,
+ &bracket_match);
- if (source_buffer->priv->bracket_match == GTK_SOURCE_BRACKET_MATCH_FOUND)
+ if (source_buffer->priv->bracket_match_state == GTK_SOURCE_BRACKET_MATCH_FOUND)
{
GtkTextIter next_iter;
@@ -948,13 +949,13 @@ cursor_moved (GtkSourceBuffer *source_buffer)
* positions are nonbrackets.
*/
if (previous_state != GTK_SOURCE_BRACKET_MATCH_NONE ||
- source_buffer->priv->bracket_match != GTK_SOURCE_BRACKET_MATCH_NONE)
+ source_buffer->priv->bracket_match_state != GTK_SOURCE_BRACKET_MATCH_NONE)
{
g_signal_emit (source_buffer,
buffer_signals[BRACKET_MATCHED],
0,
NULL,
- source_buffer->priv->bracket_match);
+ source_buffer->priv->bracket_match_state);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]