[maemo-commits] [maemo-commits] r12125 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-06 13:27:24 +0300 (Wed, 06 Jun 2007)
New Revision: 12125

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c
   projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c
Log:

2007-06-06  Johan Bilien  <johan.bilien at nokia.com>

	* src/hd-plugin-loader-legacy.c, src/hd-plugin-loader-factory.c:
	- load the applet with G_MODULE_BIND_LOCAL to avoid conflict
	of symbols. Patch courtesy of Santtu Lakkala.
	Fixes: NB#59641



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-06 07:28:20 UTC (rev 12124)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-06 10:27:24 UTC (rev 12125)
@@ -1,3 +1,10 @@
+2007-06-06  Johan Bilien  <johan.bilien at nokia.com>
+
+	* src/hd-plugin-loader-legacy.c, src/hd-plugin-loader-factory.c:
+	- load the applet with G_MODULE_BIND_LOCAL to avoid conflict
+	of symbols. Patch courtesy of Santtu Lakkala.
+	Fixes: NB#59641
+
 2007-06-05  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-item.h:

Modified: projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c	2007-06-06 07:28:20 UTC (rev 12124)
+++ projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c	2007-06-06 10:27:24 UTC (rev 12125)
@@ -127,7 +127,8 @@
       GModule *module;
       gchar *libpath = g_build_filename (HD_PLUGIN_LOADER_MODULES_PATH, name, NULL);
 
-      module = g_module_open (libpath, G_MODULE_BIND_LAZY);
+      module = g_module_open (libpath,
+                              G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
 
       if (module != NULL)
       {

Modified: projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c	2007-06-06 07:28:20 UTC (rev 12124)
+++ projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-legacy.c	2007-06-06 10:27:24 UTC (rev 12125)
@@ -291,7 +291,9 @@
     g_free (module_file);
   }
 
-  priv->module = g_module_open (module_path, 0);
+  priv->module = g_module_open (module_path,
+                                G_MODULE_BIND_LAZY |
+                                G_MODULE_BIND_LOCAL);
   g_free (module_path);
 
   if (!priv->module)