[Xfce4-commits] [xfce/xfce4-panel] 07/73: Make sure version API is set.

[noreply at xfce.org]

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

andrzejr pushed a commit to branch master
in repository xfce/xfce4-panel.

commit f576cdc2f485950b80e249271e3e1e1e33818198
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Wed Dec 18 19:55:28 2013 +0000

    Make sure version API is set.
    
    Start-up crashes of external plugins resulted in API being not set properly,
    Then, the panel was trying to use a non-existing "wrapper" binary.
    This prevented normal crash reporting mechanism from working and resulted
    in an "empty" plugin being inserted into the panel.
---
 panel/panel-module.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/panel/panel-module.c b/panel/panel-module.c
index 48d9745..2eee356 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -147,7 +147,7 @@ panel_module_init (PanelModule *module)
   module->library = NULL;
   module->construct_func = NULL;
   module->plugin_type = G_TYPE_NONE;
-  module->api = NULL;
+  module->api = g_strdup (LIBXFCE4PANEL_VERSION_API);
 }
 
 
@@ -219,6 +219,7 @@ panel_module_load (GTypeModule *type_module)
 
       /* from now on, run this plugin in a wrapper */
       module->mode = WRAPPER;
+      g_free (module->api);
       module->api = g_strdup (LIBXFCE4PANEL_VERSION_API);
 
       return FALSE;
@@ -367,7 +368,8 @@ panel_module_new_from_desktop_file (const gchar *filename,
           if (force_external || !xfce_rc_read_bool_entry (rc, "X-XFCE-Internal", FALSE))
             {
               module->mode = WRAPPER;
-              module->api = g_strdup (xfce_rc_read_entry (rc, "X-XFCE-API", "1.0"));
+              g_free (module->api);
+              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.