From 58b98b941ffc3a05bcb8c9ff6f2cb3ce6b846d4a Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 19 Jan 2021 11:40:00 +0100 Subject: [PATCH] libgimpbase: remove case of plug-ins binaries directly under plug-ins/. In GIMP 3, plug-ins are mandatorily under a subdirectory. Though on GIMP 2.10.x, both cases are still possible. So only the previous commit should be backported to gimp-2-10 branch. See discussion in !392. Thanks also to Christopher Nielsen for helping. --- libgimpbase/gimpenv.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libgimpbase/gimpenv.c b/libgimpbase/gimpenv.c index 720dab3cf6..5a12462d94 100644 --- a/libgimpbase/gimpenv.c +++ b/libgimpbase/gimpenv.c @@ -422,18 +422,6 @@ gimp_installation_directory (void) toplevel = g_strdup (dirname); } - else if (! strcmp (basename, "plug-ins")) - { - /* same for plug-ins, go three levels up from prefix/lib/gimp/x.y */ - - gchar *tmp = g_path_get_dirname (dirname); - gchar *tmp2 = g_path_get_dirname (tmp); - - toplevel = g_path_get_dirname (tmp2); - - g_free (tmp); - g_free (tmp2); - } else if (! strcmp (g_path_get_basename (dirname), "plug-ins")) { /* same for plug-ins in subdirectory, go three levels up from prefix/lib/gimp/x.y */ -- GitLab