[Xfce4-commits] r23199 - xfce4-panel/trunk/panel

[Jasper Huijsmans]

Author: jasper
Date: 2006-09-24 08:33:46 +0000 (Sun, 24 Sep 2006)
New Revision: 23199

Modified:
   xfce4-panel/trunk/panel/panel-app.c
   xfce4-panel/trunk/panel/panel-item-manager.c
Log:
Use G_MODULE_BIND_LOCAL for internal plugins. Seems to work fine. Bug #2314.

Modified: xfce4-panel/trunk/panel/panel-app.c
===================================================================
--- xfce4-panel/trunk/panel/panel-app.c	2006-09-23 11:31:59 UTC (rev 23198)
+++ xfce4-panel/trunk/panel/panel-app.c	2006-09-24 08:33:46 UTC (rev 23199)
@@ -256,7 +256,7 @@
 }
 
 static gboolean
-set_signal_state (GIOChannel * source, GIOCondition cond, gpointer d)
+set_signal_state (GIOChannel * source, GIOCondition cond, gpointer data)
 {
     GError *error = NULL;
     GIOStatus status;

Modified: xfce4-panel/trunk/panel/panel-item-manager.c
===================================================================
--- xfce4-panel/trunk/panel/panel-item-manager.c	2006-09-23 11:31:59 UTC (rev 23198)
+++ xfce4-panel/trunk/panel/panel-item-manager.c	2006-09-24 08:33:46 UTC (rev 23199)
@@ -359,7 +359,8 @@
             XfcePanelPluginFunc (*get_construct) (void);
             XfcePanelPluginCheck (*get_check) (void);
             
-            if (!(class->gmodule = g_module_open (class->file, 0)))
+	    class->gmodule = g_module_open (class->file, G_MODULE_BIND_LOCAL);
+            if (G_UNLIKELY (class->gmodule == NULL))
             {
                 g_critical ("Could not open \"%s\": %s", 
                             class->name, g_module_error ());