Takuro Ashie
makei****@users*****
2006年 11月 27日 (月) 17:15:32 JST
Index: tomoe/lib/tomoe-char.c
diff -u tomoe/lib/tomoe-char.c:1.51 tomoe/lib/tomoe-char.c:1.52
--- tomoe/lib/tomoe-char.c:1.51 Mon Nov 27 16:05:51 2006
+++ tomoe/lib/tomoe-char.c Mon Nov 27 17:15:32 2006
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-char.c,v 1.51 2006/11/27 07:05:51 kous Exp $
+ * $Id: tomoe-char.c,v 1.52 2006/11/27 08:15:32 makeinu Exp $
*/
#include <stdlib.h>
@@ -245,21 +245,6 @@
priv->writing = g_object_ref (writing);
}
-gint
-tomoe_char_compare (const TomoeChar *a, const TomoeChar *b)
-{
- TomoeCharPrivate *priv_a, *priv_b;
-
- if (!a || !b) return 0;
-
- priv_a = TOMOE_CHAR_GET_PRIVATE (a);
- priv_b = TOMOE_CHAR_GET_PRIVATE (b);
- if (!priv_a || !priv_b) return 0;
-
- if (!priv_a->utf8 || !priv_b->utf8) return 0;
- return strcmp (priv_a->utf8, priv_b->utf8);
-}
-
void
tomoe_char_register_meta_data (TomoeChar *chr, const gchar *key,
const gchar *value)
@@ -304,6 +289,21 @@
g_hash_table_foreach (priv->meta, func, user_data);
}
+gint
+tomoe_char_compare (const TomoeChar *a, const TomoeChar *b)
+{
+ TomoeCharPrivate *priv_a, *priv_b;
+
+ if (!a || !b) return 0;
+
+ priv_a = TOMOE_CHAR_GET_PRIVATE (a);
+ priv_b = TOMOE_CHAR_GET_PRIVATE (b);
+ if (!priv_a || !priv_b) return 0;
+
+ if (!priv_a->utf8 || !priv_b->utf8) return 0;
+ return strcmp (priv_a->utf8, priv_b->utf8);
+}
+
static void
tomoe_char_to_xml_utf8 (TomoeChar *chr, TomoeCharPrivate *priv,
Index: tomoe/lib/tomoe-char.h
diff -u tomoe/lib/tomoe-char.h:1.47 tomoe/lib/tomoe-char.h:1.48
--- tomoe/lib/tomoe-char.h:1.47 Mon Nov 27 16:05:51 2006
+++ tomoe/lib/tomoe-char.h Mon Nov 27 17:15:32 2006
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-char.h,v 1.47 2006/11/27 07:05:51 kous Exp $
+ * $Id: tomoe-char.h,v 1.48 2006/11/27 08:15:32 makeinu Exp $
*/
/** @file tomoe-char.h
@@ -81,16 +81,6 @@
TomoeChar *tomoe_char_get_variant (TomoeChar *chr);
void tomoe_char_set_variant (TomoeChar *chr,
TomoeChar *variant);
-
-/**
- * @brief Compare two tomoe_letter.
- * @param a - Pointer to the tomoe_letter 1 pointer.
- * @param b - Pointer to the tomoe_letter 2 pointer.
- * @return -1 a < b, 0 a= b, 1 a > b
- */
-gint tomoe_char_compare (const TomoeChar *a,
- const TomoeChar *b);
-
const char *tomoe_char_get_meta_data (TomoeChar *chr,
const gchar *key);
void tomoe_char_register_meta_data (TomoeChar *chr,
@@ -101,6 +91,15 @@
GHFunc func,
gpointer user_data);
+/**
+ * @brief Compare two tomoe_letter.
+ * @param a - Pointer to the tomoe_letter 1 pointer.
+ * @param b - Pointer to the tomoe_letter 2 pointer.
+ * @return -1 a < b, 0 a= b, 1 a > b
+ */
+gint tomoe_char_compare (const TomoeChar *a,
+ const TomoeChar *b);
+
gchar *tomoe_char_to_xml (TomoeChar* chr);
G_END_DECLS