[lcd4linux @ 2004-01-10 17:45:26 by reinelt]

changed initialization order so cfg() gets initialized before plugins.
This way a plugin's init() can use cfg_get().
Thanks to Xavier for reporting this one!

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@303 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/lcd4linux.c b/lcd4linux.c
index 28e39ff152575a5b051ae7ad5ab33e48f26f6418..745c8e3a740522ffa26e09ca77362359b926e98a 100644 (file)
--- a/lcd4linux.c
+++ b/lcd4linux.c
@@ -1,4 +1,4 @@
-/* $Id: lcd4linux.c,v 1.56 2004/01/09 17:03:07 reinelt Exp $
+/* $Id: lcd4linux.c,v 1.57 2004/01/10 17:45:26 reinelt Exp $
  *
  * LCD4Linux
  *
@@ -22,6 +22,11 @@
  *
  *
  * $Log: lcd4linux.c,v $
+ * Revision 1.57  2004/01/10 17:45:26  reinelt
+ * changed initialization order so cfg() gets initialized before plugins.
+ * This way a plugin's init() can use cfg_get().
+ * Thanks to Xavier for reporting this one!
+ *
  * Revision 1.56  2004/01/09 17:03:07  reinelt
  * initiated transfer to new driver architecture
  * new file 'drv.c' will someday replace 'display.c'
@@ -456,10 +461,10 @@ int main (int argc, char *argv[])
     info ("invoked without full path; restart may not work!");
   }
   
-  if (plugin_init()==-1)
+  if (cfg_init(cfg)==-1)
     exit (1);
   
-  if (cfg_init(cfg)==-1)
+  if (plugin_init()==-1)
     exit (1);
   
   display=cfg_get(NULL, "Display", NULL);

diff --git a/plugin.c b/plugin.c
index 0729a025c83044cf70842e2c58b092e42e314f0d..44363d34396129fabe28ac980288f7bcc58bca55 100644 (file)
--- a/plugin.c
+++ b/plugin.c
@@ -1,4 +1,4 @@
-/* $Id: plugin.c,v 1.6 2004/01/10 17:36:56 reinelt Exp $
+/* $Id: plugin.c,v 1.7 2004/01/10 17:45:26 reinelt Exp $
  *
  * plugin handler for the Evaluator
  *
@@ -22,6 +22,11 @@
  *
  *
  * $Log: plugin.c,v $
+ * Revision 1.7  2004/01/10 17:45:26  reinelt
+ * changed initialization order so cfg() gets initialized before plugins.
+ * This way a plugin's init() can use cfg_get().
+ * Thanks to Xavier for reporting this one!
+ *
  * Revision 1.6  2004/01/10 17:36:56  reinelt
  *
  * I2C Sensors plugin from Xavier added
@@ -91,7 +96,7 @@ int plugin_init (void)
   plugin_init_math();
   plugin_init_string();
   plugin_init_xmms();
-  plugin_init_i2c_sensors;
+  plugin_init_i2c_sensors();
   
   return 0;
 }