[maemo-commits] [maemo-commits] r8994 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Jan 9 11:58:14 EET 2007 
Author: lucasr
Date: 2007-01-09 11:58:13 +0200 (Tue, 09 Jan 2007)
New Revision: 8994

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ltmain.sh
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in
Log:
2007-01-09  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-plugin-loader-factory.c: changed default loaders dir to
	/usr/lib/hildon-desktop/loaders. Tiny CS fixes. Removed uneeded python
	checks.
	* configure.ac, src/Makefile.am: renamed some dirs for consistency.
	* src/hildon-desktop.pc.in: added hildondesktoplibdir.


Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-09 09:55:57 UTC (rev 8993)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-09 09:58:13 UTC (rev 8994)
@@ -1,3 +1,11 @@
+2007-01-09  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-plugin-loader-factory.c: changed default loaders dir to
+	/usr/lib/hildon-desktop/loaders. Tiny CS fixes. Removed uneeded python
+	checks.
+	* configure.ac, src/Makefile.am: renamed some dirs for consistency.
+	* src/hildon-desktop.pc.in: added hildondesktoplibdir.
+
 2007-01-08  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-plugin-loader-factory.c: Added support for
@@ -25,7 +33,7 @@
 2007-01-05  Karoliina Salminen  <karoliina.t.salminen at nokia.com>
 
 	* updated some comments
-        * added some missing license related files 
+	* added some missing license related files 
 
 2007-01-03  Lucas Rocha  <lucas.rocha at nokia.com>
 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-01-09 09:55:57 UTC (rev 8993)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-01-09 09:58:13 UTC (rev 8994)
@@ -162,8 +162,8 @@
 hildoncpdesktopentrydir=${datadir}/applications/hildon-control-panel
 AC_SUBST(hildoncpdesktopentrydir)
 
-hildonpluginloaderpathlib=${libdir}/hildon-desktop-loaders
-AC_SUBST(hildonpluginloaderpathlib)
+hildonpluginloaderlibdir=${hildondesktoplibdir}/loaders
+AC_SUBST(hildonpluginloaderlibdir)
 
 #++++++++++++++++++++
 # Background Manager 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ltmain.sh
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ltmain.sh	2007-01-09 09:55:57 UTC (rev 8993)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ltmain.sh	2007-01-09 09:58:13 UTC (rev 8994)
@@ -1 +1 @@
-link /scratchbox/compilers/cs2005q3.2-glibc-i386/libtool/share/libtool/ltmain.sh
\ No newline at end of file
+link /scratchbox/compilers/cs2005q3.2-glibc-i386/arch_tools/share/libtool/ltmain.sh
\ No newline at end of file

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am	2007-01-09 09:55:57 UTC (rev 8993)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am	2007-01-09 09:58:13 UTC (rev 8994)
@@ -16,9 +16,9 @@
 	-DHD_DESKTOP_CONFIG_PATH=\"$(hildondesktopconfdir)\" 		   \
 	-DHD_DESKTOP_MODULE_PATH=\"$(hildondesktoplibdir)\"                \
 	-DHD_DESKTOP_BACKGROUNDS_PATH=\"$(hildondesktopbackgroundsdir)\"   \
+	-DHD_PLUGIN_LOADER_MODULES_PATH=\"$(hildonpluginloaderlibdir)\"    \
 	-DHD_PLUGIN_LOADER_LEGACY_HOME_MODULE_PATH=\"$(hildonhomelibdir)\" \
-	-DHD_PLUGIN_LOADER_LEGACY_NAVIGATOR_MODULE_PATH=\"$(hildonnavigatorlibdir)\" \
-	-DHD_PLUGIN_LOADER_MODULES_PATH=\"$(hildonpluginloaderpathlib)\"
+	-DHD_PLUGIN_LOADER_LEGACY_NAVIGATOR_MODULE_PATH=\"$(hildonnavigatorlibdir)\"
 
 hildon_desktop_LDFLAGS  = \
 	$(HILDON_LIBS)	  \

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.c	2007-01-09 09:55:57 UTC (rev 8993)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-plugin-loader-factory.c	2007-01-09 09:58:13 UTC (rev 8994)
@@ -39,7 +39,7 @@
 #endif
 
 #ifndef HD_PLUGIN_LOADER_MODULES_PATH
-#define HD_PLUGIN_LOADER_MODULES_PATH "/usr/lib/hildon-desktop"
+#define HD_PLUGIN_LOADER_MODULES_PATH "/usr/lib/hildon-desktop/loaders"
 #endif
 
 #define MODULE_LOAD_SYMBOL 	   "hd_plugin_loader_module_type"
@@ -66,7 +66,7 @@
   GDir *path_modules;
   const gchar *name;
 
-  path_modules = g_dir_open (HD_PLUGIN_LOADER_MODULES_PATH,0,&error);
+  path_modules = g_dir_open (HD_PLUGIN_LOADER_MODULES_PATH, 0, &error);
 
   if (error != NULL)
   { 
@@ -82,7 +82,7 @@
     if (g_str_has_suffix (name,".so"))
     {
       GModule *module;
-      gchar *libpath = g_build_filename (HD_PLUGIN_LOADER_MODULES_PATH,name,NULL);
+      gchar *libpath = g_build_filename (HD_PLUGIN_LOADER_MODULES_PATH,name, NULL);
 
       module = g_module_open (libpath, G_MODULE_BIND_MASK);
 
@@ -90,10 +90,10 @@
       {
         if (g_module_symbol (module,
 			     MODULE_LOAD_SYMBOL,
-			     (gpointer *)&factory->priv->load_module))
+			     (gpointer *) &factory->priv->load_module))
 	{
 	  g_hash_table_insert (factory->priv->modules,
-			       factory->priv->load_module,
+			       factory->priv->load_module (),
 			       module);
 	}
 	else
@@ -122,8 +122,8 @@
   factory->priv->modules  = 
     g_hash_table_new_full (g_str_hash, 
 	  		   g_str_equal,
-			   (GDestroyNotify)g_free,
-			   (GDestroyNotify)g_module_close);
+			   (GDestroyNotify) g_free,
+			   (GDestroyNotify) g_module_close);
 
   hd_plugin_loader_factory_load_modules (factory);
 }
@@ -268,7 +268,7 @@
       {
         if (g_module_symbol (module,
 			     MODULE_GET_INSTANCE_SYMBOL,
-			     (gpointer *)&factory->priv->get_instance))
+			     (gpointer *) &factory->priv->get_instance))
         {
 	  loader = priv->get_instance ();
 	  
@@ -277,7 +277,7 @@
 	else
 	{
 	  g_debug ("%s: module invalid, discarding it for future use",__FILE__);
-	  g_hash_table_remove (priv->modules,type);
+	  g_hash_table_remove (priv->modules, type);
 	}
       }
       else

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in	2007-01-09 09:55:57 UTC (rev 8993)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hildon-desktop.pc.in	2007-01-09 09:58:13 UTC (rev 8994)
@@ -2,7 +2,8 @@
 exec_prefix=@exec_prefix@
 includedir=@includedir@/hildon-desktop
 localedir=@localedir@
-hildonpluginloaderpathlib=@hildonpluginloaderpathlib@
+hildonpluginloaderlibdir=@hildonpluginloaderlibdir@
+hildondesktoplibdir=@hildondesktoplibdir@
 
 Name: hildon-desktop
 Description: Hildon Desktop Headers
More information about the maemo-commits mailing list