[gimp/gimp-2-8] Bug 672100: gimptool returns wrong system plugin dir if libdir has been customized.



commit 80d11a46a84460ee9ada53266064b0210148fa3c
Author: Jehan <jehan girinstud io>
Date:   Thu Jul 4 22:11:47 2013 +0900

    Bug 672100: gimptool returns wrong system plugin dir if libdir has been customized.
    
    On UNIX platforms, use the actual libdir value, which has been set at compile time.
    (cherry picked from commit 97d14ebda3d5790b92f8bfa2a4b3291ccb9289e6)

 tools/gimptool.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 4a7bac4..f75545a 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -554,6 +554,7 @@ do_install_nogimpui (const gchar *what)
 static gchar *
 get_sys_plugin_dir (gboolean forward_slashes)
 {
+#ifdef G_OS_WIN32
   const gchar *rprefix;
 
   rprefix = get_runtime_prefix (forward_slashes ? '/' : G_DIR_SEPARATOR);
@@ -564,6 +565,14 @@ get_sys_plugin_dir (gboolean forward_slashes)
                        GIMP_PLUGIN_VERSION,
                        "plug-ins",
                        NULL);
+#else
+  return g_build_path (forward_slashes ? "/" : G_DIR_SEPARATOR_S,
+                       LIBDIR,
+                       "gimp",
+                       GIMP_PLUGIN_VERSION,
+                       "plug-ins",
+                       NULL);
+#endif
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]