projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lmsensor init/cleanup moved from main.c to lmsensor.c and called in psensor.c
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
51b4a1b
..
da7fdef
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-27,9
+27,6
@@
#include <gtk/gtk.h>
#include <gtk/gtk.h>
-#include <sensors/sensors.h>
-#include <sensors/error.h>
-
#include "config.h"
#include "cfg.h"
#include "config.h"
#include "cfg.h"
@@
-287,7
+284,7
@@
int main(int argc, char **argv)
struct ui_psensor ui;
GError *error;
GThread *thread;
struct ui_psensor ui;
GError *error;
GThread *thread;
- int
err,
optc;
+ int optc;
char *url = NULL;
int cmdok = 1;
char *url = NULL;
int cmdok = 1;
@@
-341,12
+338,7
@@
int main(int argc, char **argv)
ui.config = config_load();
ui.config = config_load();
- err = lmsensor_init();
- if (!err) {
- fprintf(stderr, _("ERROR: lmsensor init failure: %s\n"),
- sensors_strerror(err));
- exit(EXIT_FAILURE);
- }
+ psensor_init();
if (url) {
#ifdef HAVE_REMOTE_SUPPORT
if (url) {
#ifdef HAVE_REMOTE_SUPPORT
@@
-397,7
+389,7
@@
int main(int argc, char **argv)
/* main loop */
gtk_main();
/* main loop */
gtk_main();
-
sensors
_cleanup();
+
psensor
_cleanup();
psensor_list_free(ui.sensors);
psensor_list_free(ui.sensors);