tomoe-multiarch-conflict.patch

   1 diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
   2 --- ./doc/reference/tomoe-docs.sgml.multiarch-conflict  2007-04-10 17:24:20.000000000 +1000
   3 +++ ./doc/reference/tomoe-docs.sgml     2009-01-19 09:57:04.000000000 +1000
   4 @@ -40,7 +40,7 @@
   5      &tomoe-Writing;
   6    </chapter>
   7
   8 -  <index>
   9 +  <index id="index_page">
  10      <title>Index</title>
  11    </index>
  12  <!--
  13 diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
  14 --- ./lib/tomoe-char.c.multiarch-conflict       2007-06-18 11:35:43.000000000 +1000
  15 +++ ./lib/tomoe-char.c  2009-01-16 17:55:11.000000000 +1000
  16 @@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
  17      spec = g_param_spec_int ("n_strokes",
  18                               N_("Number of strokes"),
  19                               N_("Number of strokes of the character."),
  20 -                             -1, G_MAXINT32, -1,
  21 +                             -2, G_MAXINT32, -1,
  22                               G_PARAM_READABLE | G_PARAM_WRITABLE);
  23      g_object_class_install_property (gobject_class, PROP_N_STROKES, spec);
  24
  25 diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
  26 --- ./lib/tomoe-query.c.multiarch-conflict      2007-06-07 17:04:20.000000000 +1000
  27 +++ ./lib/tomoe-query.c 2009-01-16 17:55:11.000000000 +1000
  28 @@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass
  29                               N_("Minimum number of strokes"),
  30                               N_("Minimum number of strokes of searched "
  31                                  "character."),
  32 -                             -1, G_MAXINT32, -1,
  33 +                             -2, G_MAXINT32, -1,
  34                               G_PARAM_READWRITE);
  35      g_object_class_install_property (gobject_class, PROP_MIN_N_STROKES, spec);
  36
  37 @@ -103,7 +103,7 @@ tomoe_query_class_init (TomoeQueryClass
  38                               N_("Maximum number of strokes"),
  39                               N_("Maximum number of strokes of searched "
  40                                  "character."),
  41 -                             -1, G_MAXINT32, -1,
  42 +                             -2, G_MAXINT32, -1,
  43                               G_PARAM_READWRITE);
  44      g_object_class_install_property (gobject_class, PROP_MAX_N_STROKES, spec);
  45