[Xfce4-commits] [apps/parole] 01/01: Always store plugins by basename, fixes disabling vendor-enabled plugins

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/parole.

commit 59462f87f7dfd5eef53a57e9fce2a120de82485d
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Apr 3 19:49:05 2019 -0400

    Always store plugins by basename, fixes disabling vendor-enabled plugins
---
 src/parole-plugins-manager.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 6122fb5..68d8f28 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -192,6 +192,7 @@ static void
 parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, gboolean active) {
     gchar **saved_plugins;
     gchar **plugins_rc;
+    gchar  *basename;
     guint num = 0, i, count = 0;
 
     saved_plugins = parole_conf_read_entry_list(PAROLE_CONF(manager->priv->conf), "plugins");
@@ -206,17 +207,19 @@ parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, g
             plugins_rc[i] = g_strdup(saved_plugins[i]);
         }
 
-        plugins_rc[num] = g_strdup(filename);
+        plugins_rc[num] = g_path_get_basename(filename);
         plugins_rc[num + 1] = NULL;
         parole_conf_write_entry_list(PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);
     } else {
         plugins_rc = g_new0(gchar *, num + 1);
 
         for (i = 0; i < num; i++) {
-            if ( g_strcmp0(saved_plugins[i], filename) != 0 ) {
+            basename = g_path_get_basename (filename);
+            if ( g_strcmp0(saved_plugins[i], filename) != 0 && g_strcmp0(saved_plugins[i], basename) != 0 ) {
                 plugins_rc[count] = g_strdup(saved_plugins[i]);
                 count++;
             }
+            g_free (basename);
         }
         plugins_rc[num] = NULL;
         parole_conf_write_entry_list(PAROLE_CONF(manager->priv->conf), "plugins", plugins_rc);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.