p
/
tdv
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump to GLib 2.38 because of deprecation warnings

This commit is contained in:
Přemysl Eric Janouch 2020-04-15 06:56:58 +02:00
parent fcc0c3ef2d
commit 1289c98ca8
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dictzip-input-stream.c
View File

@ -294,6 +294,7 @@ struct dictzip_input_stream_private
G_DEFINE_TYPE_EXTENDED (DictzipInputStream, dictzip_input_stream, G_DEFINE_TYPE_EXTENDED (DictzipInputStream, dictzip_input_stream,
G_TYPE_FILTER_INPUT_STREAM, 0, G_TYPE_FILTER_INPUT_STREAM, 0,
G_ADD_PRIVATE (DictzipInputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, dictzip_input_stream_seekable_init)) G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, dictzip_input_stream_seekable_init))
static gboolean seekable_true (G_GNUC_UNUSED GSeekable *x) { return TRUE; } static gboolean seekable_true (G_GNUC_UNUSED GSeekable *x) { return TRUE; }
@ -312,8 +313,6 @@ dictzip_input_stream_seekable_init
static void static void
dictzip_input_stream_class_init (DictzipInputStreamClass *klass) dictzip_input_stream_class_init (DictzipInputStreamClass *klass)
{ {
g_type_class_add_private (klass, sizeof (DictzipInputStreamPrivate));
GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass); GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass);
stream_class->read_fn = dictzip_input_stream_read; stream_class->read_fn = dictzip_input_stream_read;
stream_class->skip = dictzip_input_stream_skip; stream_class->skip = dictzip_input_stream_skip;
@ -325,8 +324,7 @@ dictzip_input_stream_class_init (DictzipInputStreamClass *klass)
static void static void
dictzip_input_stream_init (DictzipInputStream *self) dictzip_input_stream_init (DictzipInputStream *self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = dictzip_input_stream_get_instance_private (self);
DICTZIP_TYPE_INPUT_STREAM, DictzipInputStreamPrivate);
} }
static void static void

7
src/stardict.c
View File

@ -392,7 +392,8 @@ struct stardict_dict_private
gsize dict_length; //!< Length of the dict data in bytes gsize dict_length; //!< Length of the dict data in bytes
}; };
G_DEFINE_TYPE (StardictDict, stardict_dict, G_TYPE_OBJECT) G_DEFINE_TYPE_WITH_CODE (StardictDict, stardict_dict, G_TYPE_OBJECT,
G_ADD_PRIVATE (StardictDict))
static void static void
stardict_dict_finalize (GObject *self) stardict_dict_finalize (GObject *self)
@ -426,15 +427,13 @@ stardict_dict_finalize (GObject *self)
static void static void
stardict_dict_class_init (StardictDictClass *klass) stardict_dict_class_init (StardictDictClass *klass)
{ {
g_type_class_add_private (klass, sizeof (StardictDictPrivate));
G_OBJECT_CLASS (klass)->finalize = stardict_dict_finalize; G_OBJECT_CLASS (klass)->finalize = stardict_dict_finalize;
} }
static void static void
stardict_dict_init (StardictDict *self) stardict_dict_init (StardictDict *self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = stardict_dict_get_instance_private (self);
STARDICT_TYPE_DICT, StardictDictPrivate);
} }
/// Load a StarDict dictionary. /// Load a StarDict dictionary.