[Xfce4-commits] [xfce/xfce4-panel] 02/03: Don't show or try to load Gtk2 plugins anymore

[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 xfce/xfce4-panel.

commit 01e2fef26281e45ca47fd81ffd2d7e2848e63709
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Sep 19 15:45:22 2019 +0200

    Don't show or try to load Gtk2 plugins anymore
---
 panel/panel-module.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/panel/panel-module.c b/panel/panel-module.c
index 079d6e3..02a7b25 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -325,6 +325,14 @@ panel_module_new_from_desktop_file (const gchar *filename,
       return NULL;
     }
 
+  if (g_strcmp0 (xfce_rc_read_entry (rc, "X-XFCE-API", "1.0"), "2.0") != 0)
+    {
+      g_critical ("Plugin %s: The Desktop file %s requested the Gtk2 API (v1.0), which is "
+                  "no longer supported.", name, filename);
+      xfce_rc_close (rc);
+      return NULL;
+    }
+
   xfce_rc_set_group (rc, "Xfce Panel");
 
   /* read module location from the desktop file */
@@ -365,8 +373,7 @@ panel_module_new_from_desktop_file (const gchar *filename,
             {
               module->mode = WRAPPER;
               g_free (module->api);
-              //module->api = g_strdup (xfce_rc_read_entry (rc, "X-XFCE-API", LIBXFCE4PANEL_VERSION_API));
-              module->api = g_strdup (xfce_rc_read_entry (rc, "X-XFCE-API", "1.0"));
+              module->api = g_strdup (xfce_rc_read_entry (rc, "X-XFCE-API", LIBXFCE4PANEL_VERSION_API));
             }
           else
             module->mode = INTERNAL;

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