[Xfce4-commits] [apps/xfce4-panel-profiles] 150/162: Be careful about which plugins are deleted.

[noreply at xfce.org]

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

o   c   h   o   s   i       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/xfce4-panel-profiles.

commit d4799e07eb24e67f2d8b23fea5637ba0913b4a43
Author: Alistair Buxton <a.j.buxton at gmail.com>
Date:   Fri Apr 20 06:11:24 2018 +0100

    Be careful about which plugins are deleted.
    
    If the key /plugins/plugin-2 is deemed to be bad, we should not delete
    /plugins/plugin-20 for example. So check that the keys to be deleted
    either exactly match, or start with the pattern + '/'.
---
 xfpanel-switch/panelconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfpanel-switch/panelconfig.py b/xfpanel-switch/panelconfig.py
index 609034e..f554f84 100644
--- a/xfpanel-switch/panelconfig.py
+++ b/xfpanel-switch/panelconfig.py
@@ -150,8 +150,8 @@ class PanelConfig(object):
         keys = list(self.properties.keys())
         for param in keys:
             for bad_plugin in rem_keys:
-                if param.startswith(bad_plugin):
-                    self.properties.pop(param, None)
+                if param == bad_plugin or param.startswith(bad_plugin+'/'):
+                    del self.properties[param]
 
     def get_desktop_source_file(self, desktop):
         if getattr(self, 'source', None) is None:

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