Kouhei Sutou
kous****@users*****
2006年 11月 30日 (木) 12:11:12 JST
Index: tomoe/module/dict/tomoe-dict-xml.c
diff -u tomoe/module/dict/tomoe-dict-xml.c:1.2 tomoe/module/dict/tomoe-dict-xml.c:1.3
--- tomoe/module/dict/tomoe-dict-xml.c:1.2 Thu Nov 30 11:22:31 2006
+++ tomoe/module/dict/tomoe-dict-xml.c Thu Nov 30 12:11:12 2006
@@ -21,7 +21,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-dict-xml.c,v 1.2 2006/11/30 02:22:31 kous Exp $
+ * $Id: tomoe-dict-xml.c,v 1.3 2006/11/30 03:11:12 kous Exp $
*/
#include <stdio.h>
@@ -56,7 +56,7 @@
{
TomoeDict object;
gchar *filename;
- gchar *name;
+ gchar *dict_name;
GPtrArray *chars;
gboolean editable;
@@ -148,7 +148,7 @@
init (TomoeDictXML *dict)
{
dict->filename = NULL;
- dict->name = NULL;
+ dict->dict_name = NULL;
dict->chars = g_ptr_array_new();
dict->modified = FALSE;
dict->editable = FALSE;
@@ -269,14 +269,14 @@
tomoe_dict_xml_save (dict);
}
- if (dict->name)
- g_free (dict->name);
+ if (dict->dict_name)
+ g_free (dict->dict_name);
if (dict->filename)
g_free (dict->filename);
if (dict->chars)
TOMOE_PTR_ARRAY_FREE_ALL(dict->chars, g_object_unref);
- dict->name = NULL;
+ dict->dict_name = NULL;
dict->filename = NULL;
dict->chars = NULL;
@@ -288,7 +288,7 @@
{
TomoeDictXML *dict = TOMOE_DICT_XML (_dict);
g_return_val_if_fail (TOMOE_IS_DICT_XML (dict), NULL);
- return dict->name;
+ return dict->dict_name;
}
static gboolean
@@ -462,8 +462,8 @@
result.chars = dict->chars;
success = _tomoe_xml_parser_parse_dictionary_file (dict->filename, &result);
if (result.name) {
- g_free (dict->name);
- dict->name = g_strdup (result.name);
+ g_free (dict->dict_name);
+ dict->dict_name = g_strdup (result.name);
g_free (result.name);
}
g_ptr_array_sort (dict->chars, letter_compare_func);
@@ -492,9 +492,9 @@
if (fwrite (head, strlen (head), 1, f) < 1) goto ERROR;
g_free (head);
- if (dict->name)
+ if (dict->dict_name)
head = g_markup_printf_escaped ("<dictionary name=\"%s\">\n",
- dict->name);
+ dict->dict_name);
else
head = g_strdup ("<dictionary>\n");
if (fwrite (head, strlen (head), 1, f) < 1) goto ERROR;