Takuro Ashie
makei****@users*****
2006年 11月 26日 (日) 08:04:48 JST
Index: tomoe/lib/tomoe-config.c
diff -u tomoe/lib/tomoe-config.c:1.37 tomoe/lib/tomoe-config.c:1.38
--- tomoe/lib/tomoe-config.c:1.37 Sat Nov 25 20:07:07 2006
+++ tomoe/lib/tomoe-config.c Sun Nov 26 08:04:47 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.37 2006/11/25 11:07:07 makeinu Exp $
+ * $Id: tomoe-config.c,v 1.38 2006/11/25 23:04:47 makeinu Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -36,7 +36,7 @@
#define TOMOE_CONFIG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOMOE_TYPE_CONFIG, TomoeConfigPrivate))
-typedef struct _TomoeConfigPrivate TomoeConfigPrivate;
+typedef struct _TomoeConfigPrivate TomoeConfigPrivate;
struct _TomoeConfigPrivate
{
gchar *filename;
@@ -45,8 +45,8 @@
enum
{
- PROP_0,
- PROP_FILENAME
+ PROP_0,
+ PROP_FILENAME
};
@@ -206,8 +206,8 @@
priv->filename = NULL;
priv->key_file = NULL;
- if (G_OBJECT_CLASS (tomoe_config_parent_class)->dispose)
- G_OBJECT_CLASS (tomoe_config_parent_class)->dispose (object);
+ if (G_OBJECT_CLASS (tomoe_config_parent_class)->dispose)
+ G_OBJECT_CLASS (tomoe_config_parent_class)->dispose (object);
}
static void
@@ -438,7 +438,7 @@
if (!g_str_has_suffix (filename, ".xml"))
continue;
- path = g_build_filename(TOMOEDATADIR, filename, NULL);
+ path = g_build_filename(TOMOEDATADIR, filename, NULL);
if (tomoe_shelf_has_dict (shelf, path)) {
g_free (path);
continue;
Index: tomoe/lib/tomoe-dict.c
diff -u tomoe/lib/tomoe-dict.c:1.74 tomoe/lib/tomoe-dict.c:1.75
--- tomoe/lib/tomoe-dict.c:1.74 Sat Nov 25 23:24:52 2006
+++ tomoe/lib/tomoe-dict.c Sun Nov 26 08:04:47 2006
@@ -21,7 +21,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-dict.c,v 1.74 2006/11/25 14:24:52 makeinu Exp $
+ * $Id: tomoe-dict.c,v 1.75 2006/11/25 23:04:47 makeinu Exp $
*/
#include <stdio.h>
@@ -660,18 +660,18 @@
}
static GMarkupParser parser = {
- start_element_handler,
- end_element_handler,
- text_handler,
- passthrough_handler,
- error_handler,
+ start_element_handler,
+ end_element_handler,
+ text_handler,
+ passthrough_handler,
+ error_handler,
};
static gboolean
tomoe_dict_load_xml (TomoeDict *dict)
{
TomoeDictPrivate *priv = TOMOE_DICT_GET_PRIVATE(dict);
- GMarkupParseContext *context;
+ GMarkupParseContext *context;
FILE *f;
gint bytes;
gchar buf[4096];