Revision: 5279 http://geany.svn.sourceforge.net/geany/?rev=5279&view=rev Author: ntrel Date: 2010-10-04 14:33:21 +0000 (Mon, 04 Oct 2010)

Log Message: ----------- Avoid global variable.

Modified Paths: -------------- trunk/src/editor.c

Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2010-10-04 14:29:44 UTC (rev 5278) +++ trunk/src/editor.c 2010-10-04 14:33:21 UTC (rev 5279) @@ -229,9 +229,7 @@ }

-static const gchar kb_group[] = "Keybindings"; - -static void add_kb(GKeyFile *keyfile, gchar **keys) +static void add_kb(GKeyFile *keyfile, const gchar *group, gchar **keys) { gsize i;

@@ -241,7 +239,7 @@ { guint key; GdkModifierType mods; - gchar *accel_string = g_key_file_get_value(keyfile, kb_group, keys[i], NULL); + gchar *accel_string = g_key_file_get_value(keyfile, group, keys[i], NULL);

gtk_accelerator_parse(accel_string, &key, &mods); g_free(accel_string); @@ -260,6 +258,7 @@

static void load_kb(GKeyFile *sysconfig, GKeyFile *userconfig) { + const gchar kb_group[] = "Keybindings"; gchar **keys = g_key_file_get_keys(userconfig, kb_group, NULL, NULL); gchar **ptr;

@@ -267,11 +266,11 @@ foreach_strv(ptr, keys) g_key_file_remove_key(sysconfig, kb_group, *ptr, NULL);

- add_kb(userconfig, keys); + add_kb(userconfig, kb_group, keys); g_strfreev(keys);

keys = g_key_file_get_keys(sysconfig, kb_group, NULL, NULL); - add_kb(sysconfig, keys); + add_kb(sysconfig, kb_group, keys); g_strfreev(keys); }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.