added --use_libwqsmart option

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ae63a1e..71bb1e8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2012 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -80,7 +80,7 @@ static void print_version()
                 "This is free software: you are free to change and "
                 " redistribute it.\n"
                 "There is NO WARRANTY, to the extent permitted by law.\n"),
-              "2010-2011");
+              "2010-2012");
 }
 
 static void print_help()
@@ -347,6 +347,7 @@ static void log_init()
 }
 
 static struct option long_options[] = {
+       {"use_libatasmart", no_argument, 0, 0},
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"url", required_argument, 0, 'u'},
@@ -376,14 +377,26 @@ static gboolean initial_window_show(gpointer data)
        return FALSE;
 }
 
+static void log_glib_info()
+{
+       log_debug("Compiled with GLib %d.%d.%d",
+                 GLIB_MAJOR_VERSION,
+                 GLIB_MINOR_VERSION,
+                 GLIB_MICRO_VERSION);
+
+       log_debug("Running with GLib %d.%d.%d",
+                 glib_major_version,
+                 glib_minor_version,
+                 glib_micro_version);
+}
+
 int main(int argc, char **argv)
 {
        struct ui_psensor ui;
        GError *error;
        GThread *thread;
-       int optc;
+       int optc, cmdok, opti, use_libatasmart;
        char *url = NULL;
-       int cmdok = 1;
 
        program_name = argv[0];
 
@@ -394,9 +407,16 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
 #endif
 
+       use_libatasmart = 0;
+
+       cmdok = 1;
        while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
-                                  NULL)) != -1) {
+                                  &opti)) != -1) {
                switch (optc) {
+               case 0:
+                       if (!strcmp(long_options[opti].name, "use_libatasmart"))
+                               use_libatasmart = 1;
+                       break;
                case 'u':
                        if (optarg)
                                url = strdup(optarg);
@@ -408,8 +428,8 @@ int main(int argc, char **argv)
                        print_version();
                        exit(EXIT_SUCCESS);
                case 'd':
-                       printf(_("Enables debug mode.\n"));
                        log_level = atoi(optarg);
+                       log_printf(LOG_INFO, _("Enables debug mode."));
                        break;
                default:
                        cmdok = 0;
@@ -425,9 +445,17 @@ int main(int argc, char **argv)
 
        log_init();
 
+       log_glib_info();
+#if !(GLIB_CHECK_VERSION(2, 31, 0))
+       /*
+        * Since GLib 2.31 g_thread_init call is deprecated and not
+        * needed.
+        */
+       log_debug("Calling g_thread_init(NULL)");
        g_thread_init(NULL);
+#endif
+
        gdk_threads_init();
-       /* gdk_threads_enter(); */
 
        gtk_init(NULL, NULL);
 
@@ -449,7 +477,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
 #endif
        } else {
-               ui.sensors = get_all_sensors(600);
+               ui.sensors = get_all_sensors(use_libatasmart, 600);
 #ifdef HAVE_NVIDIA
                ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
 #endif