tomoe/tomoe-0.6.0-bz502662.patch

   1 --- ./lib/tomoe-dict-ptr-array.c.bz502662       2007-06-21 11:48:57.000000000 +1000
   2 +++ ./lib/tomoe-dict-ptr-array.c        2009-06-02 13:23:40.000000000 +1000
   3 @@ -50,7 +50,7 @@ struct _TomoeDictPtrArrayPrivate
   4
   5  static TomoeDictClass *parent_class;
   6
   7 -G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, _tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
   8 +G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
   9
  10  static void         dispose                    (GObject       *object);
  11  static void         set_property               (GObject       *object,
  12 @@ -75,7 +75,7 @@ static gboolean     is_editable
  13  static gchar       *get_available_private_utf8 (TomoeDict     *dict);
  14
  15  static void
  16 -_tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
  17 +tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
  18  {
  19      GObjectClass *gobject_class;
  20      TomoeDictClass *dict_class;
  21 @@ -123,7 +123,7 @@ _tomoe_dict_ptr_array_class_init (TomoeD
  22  }
  23
  24  static void
  25 -_tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
  26 +tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
  27  {
  28      TomoeDictPtrArrayPrivate *priv = TOMOE_DICT_PTR_ARRAY_GET_PRIVATE (dict);
  29      priv->chars    = g_ptr_array_new();
  30 @@ -196,7 +196,7 @@ char_compare_func (gconstpointer a, gcon
  31  }
  32
  33  void
  34 -_tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
  35 +tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
  36  {
  37      TomoeDictPtrArrayPrivate *priv;
  38
  39 @@ -219,7 +219,7 @@ register_char (TomoeDict *dict, TomoeCha
  40
  41      unregister_char (dict, tomoe_char_get_utf8 (chr));
  42      g_ptr_array_add (priv->chars, g_object_ref (G_OBJECT (chr)));
  43 -    _tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
  44 +    tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
  45
  46      priv->modified = TRUE;
  47
  48 @@ -523,7 +523,7 @@ get_available_private_utf8 (TomoeDict *d
  49  }
  50
  51  GPtrArray *
  52 -_tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
  53 +tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
  54  {
  55      g_return_val_if_fail (TOMOE_IS_DICT_PTR_ARRAY (dict), NULL);
  56
  57 --- ./lib/tomoe-dict-ptr-array.h.bz502662       2007-06-21 11:48:57.000000000 +1000
  58 +++ ./lib/tomoe-dict-ptr-array.h        2009-06-02 13:27:12.000000000 +1000
  59 @@ -29,7 +29,7 @@ G_BEGIN_DECLS
  60
  61  #include "tomoe-dict.h"
  62
  63 -#define TOMOE_TYPE_DICT_PTR_ARRAY            (_tomoe_dict_ptr_array_get_type ())
  64 +#define TOMOE_TYPE_DICT_PTR_ARRAY            (tomoe_dict_ptr_array_get_type ())
  65  #define TOMOE_DICT_PTR_ARRAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArray))
  66  #define TOMOE_DICT_PTR_ARRAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArrayClass))
  67  #define TOMOE_IS_DICT_PTR_ARRAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOMOE_TYPE_DICT_PTR_ARRAY))
  68 @@ -49,9 +49,11 @@ struct _TomoeDictPtrArrayClass
  69      TomoeDictClass parent_class;
  70  };
  71
  72 -GType     _tomoe_dict_ptr_array_get_type        (void) G_GNUC_CONST;
  73 -void      _tomoe_dict_ptr_array_sort            (TomoeDictPtrArray *dict);
  74 -GPtrArray *_tomoe_dict_ptr_array_get_array      (TomoeDictPtrArray *dict);
  75 +GType     tomoe_dict_ptr_array_get_type        (void) G_GNUC_CONST;
  76 +void      tomoe_dict_ptr_array_sort            (TomoeDictPtrArray *dict);
  77 +#define  _tomoe_dict_ptr_array_sort tomoe_dict_ptr_array_sort
  78 +GPtrArray *tomoe_dict_ptr_array_get_array      (TomoeDictPtrArray *dict);
  79 +#define _tomoe_dict_ptr_array_get_array tomoe_dict_ptr_array_get_array
  80
  81  G_END_DECLS
  82
  83 --- ./lib/tomoe-xml-parser.c.bz502662   2007-04-10 17:24:21.000000000 +1000
  84 +++ ./lib/tomoe-xml-parser.c    2009-06-02 13:23:40.000000000 +1000
  85 @@ -428,7 +428,7 @@ init_parse_data (ParseData *data, TomoeX
  86  }
  87
  88  gboolean
  89 -_tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
  90 +tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
  91                                           TomoeXMLParsedData *result)
  92  {
  93      GMarkupParseContext *context;
  94 @@ -469,7 +469,7 @@ _tomoe_xml_parser_parse_dictionary_file
  95  }
  96
  97  TomoeChar *
  98 -_tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
  99 +tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
 100  {
 101      GMarkupParseContext *context;
 102      TomoeXMLParsedData result;
 103 --- ./lib/tomoe-xml-parser.h.bz502662   2007-04-10 17:24:21.000000000 +1000
 104 +++ ./lib/tomoe-xml-parser.h    2009-06-02 13:23:40.000000000 +1000
 105 @@ -37,11 +37,12 @@ struct _TomoeXMLParsedData
 106      GPtrArray *chars;
 107  };
 108
 109 -gboolean   _tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
 110 +gboolean   tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
 111                                                      TomoeXMLParsedData *result);
 112 -TomoeChar *_tomoe_xml_parser_parse_char_data       (const gchar *xml,
 113 +#define   _tomoe_xml_parser_parse_dictionary_file tomoe_xml_parser_parse_dictionary_file
 114 +TomoeChar *tomoe_xml_parser_parse_char_data       (const gchar *xml,
 115                                                      gssize      len);
 116 -
 117 +#define   _tomoe_xml_parser_parse_char_data tomoe_xml_parser_parse_char_data
 118
 119  G_END_DECLS
 120