X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=98bbb8d90d192b410fd1b22202da8461799f57a4;hp=9ddfc58853574a09d4d0073b052df14bced7054a;hb=5b8e525dfb2f18a4e0d67b9da264259159ad2184;hpb=d36700894126811870ae0a0bcb5dbdb59588289c

diff --git a/mood.c b/mood.c
index 9ddfc588..98bbb8d9 100644
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -520,7 +520,7 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
 	osl_close_disk_object(&mood_def);
 	if (ret < 0) {
 		PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
-			PARA_STRERROR(-ret));
+			para_strerror(-ret));
 		destroy_mood(mlpd.m);
 		return ret;
 	}
@@ -548,7 +548,7 @@ static int check_mood(struct osl_row *mood_row, void *data)
 		parse_mood_line, &mlpd);
 	if (ret < 0)
 		para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
-			PARA_STRERROR(-ret));
+			para_strerror(-ret));
 out:
 	osl_close_disk_object(&mood_def);
 	return 1;
@@ -1013,9 +1013,10 @@ int reload_current_mood(void)
 	int ret;
 	char *mood_name = NULL;
 
-	PARA_NOTICE_LOG("reloading current mood\n");
 	if (!current_mood)
 		return 1;
+	PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
+		current_mood->name : "(dummy)");
 	if (current_mood->name)
 		mood_name = para_strdup(current_mood->name);
 	close_current_mood();
@@ -1057,6 +1058,5 @@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb
 	default:
 		return 1;
 	}
-	return 1;
 }