[geany/geany-plugins] 8ceebe: scope - simplified parse mode names

[Dimitar Zhekov]

Branch:      refs/heads/master
Author:      Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer:   Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date:        Tue, 11 Dec 2012 17:45:33 UTC
Commit:      8ceebedfd97a26aae407709afa68989d755beba7
             https://github.com/geany/geany-plugins/commit/8ceebedfd97a26aae407709afa68989d755beba7

Log Message:
-----------
scope - simplified parse mode names


Modified Paths:
--------------
    scope/src/inspect.c
    scope/src/parse.c
    scope/src/watch.c

Modified: scope/src/inspect.c
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -701,7 +701,7 @@ static gboolean inspect_load(GKeyFile *config, const char *section)
 {
 	char *name = utils_key_file_get_string(config, section, "name");
 	gchar *expr = utils_key_file_get_string(config, section, "expr");
-	gint hb_mode = g_key_file_get_integer(config, section, "hb_mode", NULL);
+	gint hb_mode = g_key_file_get_integer(config, section, "hbit", NULL);
 	char *frame = utils_key_file_get_string(config, section, "frame");
 	gboolean run_apply = g_key_file_get_boolean(config, section, "run_apply", NULL);
 	gint start = g_key_file_get_integer(config, section, "start", NULL);
@@ -749,7 +749,7 @@ static gboolean inspect_save(GKeyFile *config, const char *section, GtkTreeIter
 		INSPECT_FORMAT, &format, -1);
 	g_key_file_set_string(config, section, "name", name);
 	g_key_file_set_string(config, section, "expr", expr);
-	g_key_file_set_integer(config, section, "hb_mode", hb_mode);
+	g_key_file_set_integer(config, section, "hbit", hb_mode);
 	g_key_file_set_string(config, section, "frame", frame);
 	g_key_file_set_boolean(config, section, "run_apply", run_apply);
 	g_key_file_set_integer(config, section, "start", start);


Modified: scope/src/parse.c
12 files changed, 6 insertions(+), 6 deletions(-)
===================================================================
@@ -480,8 +480,8 @@ static void parse_mode_free(ParseMode *pm)
 static gboolean parse_mode_load(GKeyFile *config, const char *section)
 {
 	char *name = utils_key_file_get_string(config, section, "name");
-	gint hb_mode = g_key_file_get_integer(config, section, "hb_mode", NULL);
-	gint mr_mode = g_key_file_get_integer(config, section, "mr_mode", NULL);
+	gint hb_mode = g_key_file_get_integer(config, section, "hbit", NULL);
+	gint mr_mode = g_key_file_get_integer(config, section, "member", NULL);
 
 	if (name && (unsigned) hb_mode < HB_COUNT && (unsigned) mr_mode < MR_MODIFY)
 	{
@@ -500,8 +500,8 @@ static gboolean parse_mode_load(GKeyFile *config, const char *section)
 static gboolean parse_mode_save(GKeyFile *config, const char *section, ParseMode *pm)
 {
 	g_key_file_set_string(config, section, "name", pm->name);
-	g_key_file_set_integer(config, section, "hb_mode", pm->hb_mode);
-	g_key_file_set_integer(config, section, "mr_mode", pm->mr_mode);
+	g_key_file_set_integer(config, section, "hbit", pm->hb_mode);
+	g_key_file_set_integer(config, section, "member", pm->mr_mode);
 	return TRUE;
 }
 
@@ -585,12 +585,12 @@ gboolean parse_variable(GArray *nodes, ParseVariable *var, const char *children)
 void parse_load(GKeyFile *config)
 {
 	array_clear(parse_modes, (GFreeFunc) parse_mode_free);
-	utils_load(config, "parse_mode", parse_mode_load);
+	utils_load(config, "parse", parse_mode_load);
 }
 
 void parse_save(GKeyFile *config)
 {
-	array_save(parse_modes, config, "parse_mode", (ASaveFunc) parse_mode_save);
+	array_save(parse_modes, config, "parse", (ASaveFunc) parse_mode_save);
 }
 
 void parse_init(void)


Modified: scope/src/watch.c
8 files changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -236,8 +236,8 @@ void watches_delete_all(void)
 static gboolean watch_load(GKeyFile *config, const char *section)
 {
 	gchar *expr = utils_key_file_get_string(config, section, "expr");
-	gint hb_mode = g_key_file_get_integer(config, section, "hb_mode", NULL);
-	gint mr_mode = g_key_file_get_integer(config, section, "mr_mode", NULL);
+	gint hb_mode = g_key_file_get_integer(config, section, "hbit", NULL);
+	gint mr_mode = g_key_file_get_integer(config, section, "member", NULL);
 	gboolean enabled = g_key_file_get_boolean(config, section, "enabled", NULL);
 	gboolean valid = FALSE;
 
@@ -271,8 +271,8 @@ static gboolean watch_save(GKeyFile *config, const char *section, GtkTreeIter *i
 	gtk_tree_model_get(model, iter, WATCH_EXPR, &expr, WATCH_HB_MODE, &hb_mode,
 		WATCH_MR_MODE, &mr_mode, WATCH_ENABLED, &enabled, -1);
 	g_key_file_set_string(config, section, "expr", expr);
-	g_key_file_set_integer(config, section, "hb_mode", hb_mode);
-	g_key_file_set_integer(config, section, "mr_mode", mr_mode);
+	g_key_file_set_integer(config, section, "hbit", hb_mode);
+	g_key_file_set_integer(config, section, "member", mr_mode);
 	g_key_file_set_boolean(config, section, "enabled", enabled);
 	return TRUE;
 }



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).