callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extend the mixed-dependency check to modules as well

Browse Source 
This helps prevent accidents with GTK_PATH.
This commit is contained in:
Matthias Clasen
2011-02-08 18:02:48 -05:00
parent bd0f159b6c
commit 64adba6e3e
3 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkmodules.c
View File

@ -237,7 +237,16 @@ find_module (const gchar *name)
}
module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
g_free(module_name);
if (_gtk_module_has_mixed_deps (module))
{
g_warning ("GTK+ module %s cannot be loaded.\n"
"GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported.", module_name);
g_module_close (module);
module = NULL;
}
g_free (module_name);
return module;
}
@ -354,8 +363,13 @@ load_module (GSList *module_list,
}
}
else
g_message ("Failed to load module \"%s\": %s", name, g_module_error ());
{
const gchar *error = g_module_error ();
g_message ("Failed to load module \"%s\"%s%s",
name, error ? ": " : "", error ? error : "");
}
return module_list;
}