From 26fc571dcd0aba326d03e73357bfe858ab94045d Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Mon, 22 Dec 2008 12:50:19 +0000
Subject: [PATCH] Rename stash_group_load() ->
 stash_group_load_from_key_file(). Rename stash_group_save() ->
 stash_group_save_to_key_file().

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3415 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog     | 7 +++++++
 src/keyfile.c | 4 ++--
 src/stash.c   | 6 ++++--
 src/stash.h   | 4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0609895f..b967565f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/stash.c, src/stash.h, src/keyfile.c:
+   Rename stash_group_load() -> stash_group_load_from_key_file().
+   Rename stash_group_save() -> stash_group_save_to_key_file().
+
+
 2008-12-21  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * data/global.tags:
diff --git a/src/keyfile.c b/src/keyfile.c
index 2d1d5d6a..1260e4da 100644
--- a/src/keyfile.c
+++ b/src/keyfile.c
@@ -180,9 +180,9 @@ static void settings_action(GKeyFile *config, SettingAction action)
 		switch (action)
 		{
 			case SETTING_READ:
-				stash_group_load(group, config); break;
+				stash_group_load_from_key_file(group, config); break;
 			case SETTING_WRITE:
-				stash_group_save(group, config); break;
+				stash_group_save_to_key_file(group, config); break;
 		}
 	}
 }
diff --git a/src/stash.c b/src/stash.c
index dae8ae7c..260497ea 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -161,13 +161,13 @@ static void keyfile_action(SettingAction action, GeanyPrefGroup *group, GKeyFile
 }
 
 
-void stash_group_load(GeanyPrefGroup *group, GKeyFile *keyfile)
+void stash_group_load_from_key_file(GeanyPrefGroup *group, GKeyFile *keyfile)
 {
 	keyfile_action(SETTING_READ, group, keyfile);
 }
 
 
-void stash_group_save(GeanyPrefGroup *group, GKeyFile *keyfile)
+void stash_group_save_to_key_file(GeanyPrefGroup *group, GKeyFile *keyfile)
 {
 	keyfile_action(SETTING_WRITE, group, keyfile);
 }
@@ -240,6 +240,8 @@ void stash_group_add_string(GeanyPrefGroup *group, gchar **setting,
 }
 
 
+/* *** GTK-related functions *** */
+
 static void handle_toggle_button(GtkWidget *widget, gboolean *setting,
 		PrefAction action)
 {
diff --git a/src/stash.h b/src/stash.h
index d427f02e..394cea59 100644
--- a/src/stash.h
+++ b/src/stash.h
@@ -50,9 +50,9 @@ void stash_group_add_radio_buttons(GeanyPrefGroup *group, gint *setting,
 		const gchar *key_name, gint default_value,
 		gpointer widget_id, gint enum_id, ...) G_GNUC_NULL_TERMINATED;
 
-void stash_group_load(GeanyPrefGroup *group, GKeyFile *keyfile);
+void stash_group_load_from_key_file(GeanyPrefGroup *group, GKeyFile *keyfile);
 
-void stash_group_save(GeanyPrefGroup *group, GKeyFile *keyfile);
+void stash_group_save_to_key_file(GeanyPrefGroup *group, GKeyFile *keyfile);
 
 void stash_group_display(GeanyPrefGroup *group, GtkWidget *owner);