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

Compare commits

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

No commits in common. "675139edb03f1eed43361b1bc6b1bcacf63327d9" and "fcc0c3ef2d90603776c915335ed8bacf678cb278" have entirely different histories.
675139edb0 ... fcc0c3ef2d

3 changed files with 8 additions and 6 deletions
Show Stats Expand all files Collapse all files

1
CMakeLists.txt
View File

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

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

@ -294,7 +294,6 @@ 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; }
@ -313,6 +312,8 @@ 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;
@ -324,7 +325,8 @@ 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 = dictzip_input_stream_get_instance_private (self); self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
DICTZIP_TYPE_INPUT_STREAM, DictzipInputStreamPrivate);
} }
static void static void

7
src/stardict.c
View File

@ -392,8 +392,7 @@ 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_WITH_CODE (StardictDict, stardict_dict, G_TYPE_OBJECT, G_DEFINE_TYPE (StardictDict, stardict_dict, G_TYPE_OBJECT)
G_ADD_PRIVATE (StardictDict))
static void static void
stardict_dict_finalize (GObject *self) stardict_dict_finalize (GObject *self)
@ -427,13 +426,15 @@ 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 = stardict_dict_get_instance_private (self); self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
STARDICT_TYPE_DICT, StardictDictPrivate);
} }
/// Load a StarDict dictionary. /// Load a StarDict dictionary.