Fixed psensor does not start: Attempt to unlock mutex that was not locked during...

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index c904764..6ac4846 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
@@ -37,6 +37,7 @@
 #include "ui_sensorlist.h"
 #include "ui_color.h"
 #include "lmsensor.h"
+#include "notify_cmd.h"
 #include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
@@ -68,8 +69,6 @@
 #include "cpu.h"
 #endif
 
-#include "compat.h"
-
 static const char *program_name;
 
 static void print_version()
@@ -78,10 +77,10 @@ static void print_version()
        printf(_("Copyright (C) %s jeanfi@gmail.com\n"
                 "License GPLv2: GNU GPL version 2 or later "
                 "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
-                "This is free software: you are free to change and "
+                "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-2013");
+              "2010-2014");
 }
 
 static void print_help()
@@ -220,7 +219,7 @@ gboolean ui_refresh_thread(gpointer data)
 #ifdef HAVE_UNITY
        ui_unity_launcher_entry_update(ui->sensors,
                                       !cfg->unity_launcher_count_disabled,
-                                      cfg->temperature_unit == CELCIUS);
+                                      cfg->temperature_unit == CELSIUS);
 #endif
 
        if (ui->graph_update_interval != cfg->graph_update_interval) {
@@ -243,6 +242,8 @@ static void cb_alarm_raised(struct psensor *sensor, void *data)
        if (sensor->alarm_enabled)
                ui_notify(sensor, (struct ui_psensor *)data);
 #endif
+
+       notify_cmd(sensor);
 }
 
 static void associate_colors(struct psensor **sensors)
@@ -261,22 +262,17 @@ static void associate_colors(struct psensor **sensors)
                {0x0000, 0x0000, 0x7fff},       /* dark blue */
                {0x0000, 0x7fff, 0x0000}        /* dark green */
        };
+       struct psensor **cur;
+       int i;
+       struct color c;
 
-       struct psensor **sensor_cur = sensors;
-       int i = 0;
-       while (*sensor_cur) {
-               struct color default_color;
-               color_set(&default_color,
+       for (cur = sensors, i = 0; *cur; cur++, i++) {
+               color_set(&c,
                          colors[i % COLORS_COUNT][0],
                          colors[i % COLORS_COUNT][1],
                          colors[i % COLORS_COUNT][2]);
 
-               (*sensor_cur)->color
-                   = config_get_sensor_color((*sensor_cur)->id,
-                                             &default_color);
-
-               sensor_cur++;
-               i++;
+               (*cur)->color = config_get_sensor_color((*cur)->id, &c);
        }
 }
 
@@ -314,7 +310,7 @@ static void associate_preferences(struct psensor **sensors)
                char *n;
                struct psensor *s = *sensor_cur;
 
-               s->enabled = config_is_sensor_enabled(s->id);
+               s->graph_enabled = config_is_sensor_enabled(s->id);
 
                n = config_get_sensor_name(s->id);
 
@@ -331,23 +327,19 @@ static void associate_preferences(struct psensor **sensors)
 
 static void log_init()
 {
-       char *home, *path, *dir;
+       const char *dir;
+       char *path;
 
-       home = getenv("HOME");
+       dir = get_psensor_user_dir();
 
-       if (!home)
+       if (!dir)
                return ;
 
-       dir = malloc(strlen(home)+1+strlen(".psensor")+1);
-       sprintf(dir, "%s/%s", home, ".psensor");
-       mkdir(dir, 0777);
-
        path = malloc(strlen(dir)+1+strlen("log")+1);
        sprintf(path, "%s/%s", dir, "log");
 
        log_open(path);
 
-       free(dir);
        free(path);
 }
 
@@ -559,7 +551,16 @@ int main(int argc, char **argv)
        g_thread_init(NULL);
 #endif
 
+#ifdef HAVE_APPINDICATOR_029
+       /* gdk_thread_enter/leave only used to workaround mutex bug
+        * of appindicator < 0.2.9, so do not call gdk_threads_init
+        * if useless. Calling this function leads to
+        * crash "Attempt to unlock mutex that was not locked" with
+        * GLib 2.41.2 (new checking) probably due to bugs in GTK
+        * itself.
+        */
        gdk_threads_init();
+#endif
 
        gtk_init(NULL, NULL);