AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-15 14:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'simplify-get-module-path' into 'master'

Browse Source 
modules: Simplify _gtk_get_module_path

See merge request GNOME/gtk!3113
This commit is contained in:
Matthias Clasen 2021-01-26 02:53:38 +00:00
commit ea48506a32
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkmodules.c
View File

@ -160,24 +160,10 @@ _gtk_get_module_path (const char *type)
count = 0;
for (path = get_module_path (); *path; path++)
{
int use_version, use_host;
for (use_version = TRUE; use_version >= FALSE; use_version--)
for (use_host = TRUE; use_host >= FALSE; use_host--)
{
char *tmp_dir;
if (use_version && use_host)
tmp_dir = g_build_filename (*path, GTK_BINARY_VERSION, GTK_HOST, type, NULL);
else if (use_version)
tmp_dir = g_build_filename (*path, GTK_BINARY_VERSION, type, NULL);
else if (use_host)
tmp_dir = g_build_filename (*path, GTK_HOST, type, NULL);
else
tmp_dir = g_build_filename (*path, type, NULL);
result[count++] = tmp_dir;
}
result[count++] = g_build_filename (*path, GTK_BINARY_VERSION, GTK_HOST, type, NULL);
result[count++] = g_build_filename (*path, GTK_BINARY_VERSION, type, NULL);
result[count++] = g_build_filename (*path, GTK_HOST, type, NULL);
result[count++] = g_build_filename (*path, type, NULL);
}
result[count++] = NULL;