X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fmain.c;h=9106b59e4824fc83df3efbe6edcbe79493c58145;hp=ede84e6f104b94a551ebc64658c61d6296c68045;hb=ecd968930278d22ce234485d1bddced831c82f0f;hpb=ba85e3eadb75ad8bd62d9f46f5f13c33b42cb864

diff --git a/src/main.c b/src/main.c
index ede84e6..9106b59 100644
--- 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
@@ -77,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()
@@ -219,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) {
@@ -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],
@@ -555,7 +555,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);