GType type;
class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
+ if (!class)
+ return NULL;
type = u_object_module_get_class(package, class);
if (type) {
/* Logging helpers that automatically prepend the UObject class information. */
void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap)
{
- g_return_if_fail(IS_U_OBJECT(o));
- UObject *uo = U_OBJECT(o);
- char *new_fmt = NULL;
-
- if (uo->pkg_name) {
- new_fmt = prepend_fmt(uo->pkg_name, fmt);
- if (!new_fmt) {
- g_log(G_OBJECT_TYPE_NAME(o), level, "%s",
- uo->pkg_file->name);
- } else {
+ char *new_fmt = NULL, *obj_prefix = NULL;
+
+ if (IS_U_OBJECT(o)) {
+ obj_prefix = U_OBJECT(o)->pkg_name;
+ } else if (G_IS_TYPE_MODULE(o)) {
+ obj_prefix = G_TYPE_MODULE(o)->name;
+ }
+
+ if (obj_prefix) {
+ new_fmt = prepend_fmt(obj_prefix, fmt);
+ if (!new_fmt)
+ g_log(G_OBJECT_TYPE_NAME(o), level, "%s", obj_prefix);
+ else
fmt = new_fmt;
- }
}
g_logv(G_OBJECT_TYPE_NAME(o), level, fmt, ap);