aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lcd4linux.c11
-rw-r--r--plugin.c9
2 files changed, 15 insertions, 5 deletions
diff --git a/lcd4linux.c b/lcd4linux.c
index 28e39ff..745c8e3 100644
--- 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 0729a02..44363d3 100644
--- 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;
}