Kouhei Sutou
kous****@users*****
2006年 12月 12日 (火) 19:08:12 JST
Index: tomoe/lib/tomoe-config.c
diff -u tomoe/lib/tomoe-config.c:1.53 tomoe/lib/tomoe-config.c:1.54
--- tomoe/lib/tomoe-config.c:1.53 Mon Dec 11 15:15:01 2006
+++ tomoe/lib/tomoe-config.c Tue Dec 12 19:08:11 2006
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-config.c,v 1.53 2006/12/11 06:15:01 kous Exp $
+ * $Id: tomoe-config.c,v 1.54 2006/12/12 10:08:11 kous Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -491,7 +491,7 @@
{
TomoeDict *dict;
GError *error = NULL;
- gchar *name, *database_name;
+ gchar *name, *database;
gboolean user_dict, editable;
name = g_key_file_get_string (key_file, dict_name, "name", &error);
@@ -500,8 +500,7 @@
return NULL;
}
- database_name = g_key_file_get_string (key_file, dict_name,
- "database", &error);
+ database = g_key_file_get_string (key_file, dict_name, "database", &error);
if (error) {
TOMOE_HANDLE_ERROR (error);
return NULL;
@@ -513,19 +512,19 @@
"user", TRUE);
if (!user_dict) {
gchar *tmp;
- tmp = g_build_filename (DICT_DATADIR, database_name, NULL);
- g_free (database_name);
- database_name = tmp;
+ tmp = g_build_filename (DICT_DATADIR, database, NULL);
+ g_free (database);
+ database = tmp;
}
dict = tomoe_dict_new ("est",
"name", name,
- "database_name", database_name,
+ "database", database,
"editable", editable,
NULL);
g_free (name);
- g_free (database_name);
+ g_free (database);
return dict;
}