[gtksourceview] Factor out utility to lookup the root context definition.
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Factor out utility to lookup the root context definition.
- Date: Mon, 26 Dec 2011 17:18:18 +0000 (UTC)
commit 49b167c0a3d0ddcf76c24b9b65ab5d80ea31dd6a
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Dec 26 18:20:40 2011 +0100
Factor out utility to lookup the root context definition.
gtksourceview/gtksourcecontextengine.c | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c
index b15328d..ed17331 100644
--- a/gtksourceview/gtksourcecontextengine.c
+++ b/gtksourceview/gtksourcecontextengine.c
@@ -532,6 +532,21 @@ gtk_source_context_data_lookup (GtkSourceContextData *ctx_data, const char *id)
return g_hash_table_lookup (ctx_data->definitions, id);
}
+static ContextDefinition *
+gtk_source_context_data_lookup_root (GtkSourceContextData *ctx_data)
+{
+ const gchar *lang_id;
+ gchar *root_id;
+ ContextDefinition *root_definition;
+
+ lang_id = gtk_source_language_get_id (ctx_data->lang);
+ root_id = g_strdup_printf ("%s:%s", lang_id, lang_id);
+ root_definition = gtk_source_context_data_lookup (ctx_data, root_id);
+ g_free (root_id);
+
+ return root_definition;
+}
+
/* TAGS AND STUFF -------------------------------------------------------------- */
GtkSourceContextClass *
@@ -2606,16 +2621,10 @@ gtk_source_context_engine_attach_buffer (GtkSourceEngine *engine,
if (buffer != NULL)
{
- const gchar *lang_id;
- gchar *root_id;
ContextDefinition *main_definition;
GtkTextIter start, end;
- /* Create the root context. */
- lang_id = gtk_source_language_get_id (ce->priv->ctx_data->lang);
- root_id = g_strdup_printf ("%s:%s", lang_id, lang_id);
- main_definition = gtk_source_context_data_lookup (ce->priv->ctx_data, root_id);
- g_free (root_id);
+ main_definition = gtk_source_context_data_lookup_root (ce->priv->ctx_data);
/* If we don't abort here, we will crash later (#485661). But it should
* never happen, _gtk_source_context_data_finish_parse checks main context. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]