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 3d93fd0..6ac4846 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -77,7 +77,7 @@ 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-2014");
@@ -266,7 +266,7 @@ static void associate_colors(struct psensor **sensors)
        int i;
        struct color c;
 
-       for (cur = sensors, i = 0; *cur; cur++) {
+       for (cur = sensors, i = 0; *cur; cur++, i++) {
                color_set(&c,
                          colors[i % COLORS_COUNT][0],
                          colors[i % COLORS_COUNT][1],
@@ -327,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);
 }
 
@@ -555,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);