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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-10-29 13:00:16 +0200 (Mon, 29 Oct 2007)
New Revision: 14664

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c
Log:
2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-plugin-loader-factory.c
	(hd_plugin_loader_factory_load_modules): g_strdup() the plugin loader
	key to fix a crasher. Do not use G_MODULE_BIND_LOCAL flag when loading
	plugin loader module in order to correctly load all its dependencies in
	the global symbol table.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 10:56:29 UTC (rev 14663)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-29 11:00:16 UTC (rev 14664)
@@ -1,5 +1,13 @@
 2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-plugin-loader-factory.c
+	(hd_plugin_loader_factory_load_modules): g_strdup() the plugin loader
+	key to fix a crasher. Do not use G_MODULE_BIND_LOCAL flag when loading
+	plugin loader module in order to correctly load all its dependencies in
+	the global symbol table.
+
+2007-10-29  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-applications-menu.c (hd_applications_menu_unmap,
 	hd_applications_menu_init): make the initial setup (select first
 	category) on window unmap instead of window popdown in order to avoid

Modified: projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c	2007-10-29 10:56:29 UTC (rev 14663)
+++ projects/haf/trunk/hildon-desktop/src/hd-plugin-loader-factory.c	2007-10-29 11:00:16 UTC (rev 14664)
@@ -127,8 +127,7 @@
       GModule *module;
       gchar *libpath = g_build_filename (HD_PLUGIN_LOADER_MODULES_PATH, name, NULL);
 
-      module = g_module_open (libpath,
-                              G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+      module = g_module_open (libpath, G_MODULE_BIND_LAZY);
 
       if (module != NULL)
       {
@@ -137,7 +136,7 @@
 			     (void *) &factory->priv->load_module))
 	{
 	  g_hash_table_insert (factory->priv->modules,
-			       factory->priv->load_module (),
+			       g_strdup (factory->priv->load_module ()),
 			       module);
 	}
 	else