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

Compare commits

base: p:fcc0c3ef2d90603776c915335ed8bacf678cb278
Branches Tags
p:master
...
compare: p:675139edb03f1eed43361b1bc6b1bcacf63327d9
Branches Tags
p:master

2 Commits
fcc0c3ef2d ... 675139edb0

Author SHA1 Message Date
Přemysl Eric Janouch 675139edb0
Disable GLib deprecation warnings 
Not very useful.
 2020-04-15 07:07:47 +02:00
Přemysl Eric Janouch 1289c98ca8
Bump to GLib 2.38 because of deprecation warnings 2020-04-15 07:00:36 +02:00
3 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -174,6 +174,7 @@ set (project_headers
${project_common_headers})
# Build the main executable and link it
add_definitions (-DGLIB_DISABLE_DEPRECATION_WARNINGS)
add_executable (${PROJECT_NAME}
${project_sources} ${project_headers} ${project_common_sources})
target_link_libraries (${PROJECT_NAME} ${project_common_libraries})

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_TYPE_FILTER_INPUT_STREAM, 0,
G_ADD_PRIVATE (DictzipInputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, dictzip_input_stream_seekable_init))
static gboolean seekable_true (G_GNUC_UNUSED GSeekable *x) { return TRUE; }
@ -312,8 +313,6 @@ dictzip_input_stream_seekable_init
static void
dictzip_input_stream_class_init (DictzipInputStreamClass *klass)
{
g_type_class_add_private (klass, sizeof (DictzipInputStreamPrivate));
GInputStreamClass *stream_class = G_INPUT_STREAM_CLASS (klass);
stream_class->read_fn = dictzip_input_stream_read;
stream_class->skip = dictzip_input_stream_skip;
@ -325,8 +324,7 @@ dictzip_input_stream_class_init (DictzipInputStreamClass *klass)
static void
dictzip_input_stream_init (DictzipInputStream *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
DICTZIP_TYPE_INPUT_STREAM, DictzipInputStreamPrivate);
self->priv = dictzip_input_stream_get_instance_private (self);
}
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
};
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
stardict_dict_finalize (GObject *self)
@ -426,15 +427,13 @@ stardict_dict_finalize (GObject *self)
static void
stardict_dict_class_init (StardictDictClass *klass)
{
g_type_class_add_private (klass, sizeof (StardictDictPrivate));
G_OBJECT_CLASS (klass)->finalize = stardict_dict_finalize;
}
static void
stardict_dict_init (StardictDict *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
STARDICT_TYPE_DICT, StardictDictPrivate);
self->priv = stardict_dict_get_instance_private (self);
}
/// Load a StarDict dictionary.