mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 23:16:14 +01:00
Merge branch 'fix_more_warnings' into 'master'
Fix more warnings See merge request GNOME/glib!1815
This commit is contained in:
commit
6723633fd7
@ -770,6 +770,7 @@ static GSourceFuncs cancellable_source_funcs =
|
||||
cancellable_source_dispatch,
|
||||
NULL,
|
||||
(GSourceFunc)cancellable_source_closure_callback,
|
||||
NULL,
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -73,7 +73,8 @@ g_context_specific_source_new (const gchar *name,
|
||||
NULL,
|
||||
NULL,
|
||||
g_context_specific_source_dispatch,
|
||||
g_context_specific_source_finalize
|
||||
g_context_specific_source_finalize,
|
||||
NULL, NULL
|
||||
};
|
||||
GContextSpecificSource *css;
|
||||
GSource *source;
|
||||
|
@ -372,8 +372,8 @@ ik_source_new (gboolean (* callback) (ik_event_t *event))
|
||||
{
|
||||
static GSourceFuncs source_funcs = {
|
||||
NULL, NULL,
|
||||
ik_source_dispatch
|
||||
/* should have a finalize, but it will never happen */
|
||||
ik_source_dispatch,
|
||||
NULL, NULL, NULL
|
||||
};
|
||||
InotifyKernelSource *iks;
|
||||
GSource *source;
|
||||
|
@ -554,7 +554,7 @@ properties_get_property (void)
|
||||
{ "bar", G_TYPE_INVALID, G_VALUE_INIT },
|
||||
{ "bar", G_TYPE_STRING, G_VALUE_INIT },
|
||||
};
|
||||
int i;
|
||||
gsize i;
|
||||
|
||||
g_test_summary ("g_object_get_property() accepts uninitialized, "
|
||||
"initialized, and transformable values");
|
||||
|
@ -1148,7 +1148,7 @@ test_introspection (void)
|
||||
guint *ids;
|
||||
guint n_ids;
|
||||
const gchar *name;
|
||||
gint i;
|
||||
guint i;
|
||||
const gchar *names[] = {
|
||||
"simple",
|
||||
"simple-detailed",
|
||||
|
@ -40,7 +40,8 @@ prefix ## _get_type (void) \
|
||||
NULL, /* class_data */ \
|
||||
sizeof (name), \
|
||||
0, /* n_prelocs */ \
|
||||
(GInstanceInitFunc) instance_init \
|
||||
(GInstanceInitFunc) instance_init, \
|
||||
(const GTypeValueTable *) NULL, \
|
||||
}; \
|
||||
\
|
||||
object_type = g_type_register_static (parent_type, \
|
||||
@ -72,6 +73,12 @@ prefix ## _get_type (void) \
|
||||
(GBaseInitFunc) base_init, \
|
||||
(GBaseFinalizeFunc) NULL, \
|
||||
(GClassInitFunc) dflt_init, \
|
||||
(GClassFinalizeFunc) NULL, \
|
||||
(gconstpointer) NULL, \
|
||||
(guint16) 0, \
|
||||
(guint16) 0, \
|
||||
(GInstanceInitFunc) NULL, \
|
||||
(const GTypeValueTable*) NULL, \
|
||||
}; \
|
||||
\
|
||||
iface_type = g_type_register_static (G_TYPE_INTERFACE, \
|
||||
|
Loading…
Reference in New Issue
Block a user