From 6241354fec6a1a94623e46c592377eda322a2777 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 13 Dec 2007 15:20:42 +0100
Subject: [PATCH] prefix eprint() with awesome:

---
 awesome.c | 8 ++++----
 config.c  | 4 ++--
 util.c    | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/awesome.c b/awesome.c
index f801c8e4..4aa26dbb 100644
--- a/awesome.c
+++ b/awesome.c
@@ -229,7 +229,7 @@ setup_screen(awesome_config *awesomeconf, int screen)
 static int __attribute__ ((noreturn))
 xerrorstart(Display * disp __attribute__ ((unused)), XErrorEvent * ee __attribute__ ((unused)))
 {
-    eprint("awesome: another window manager is already running\n");
+    eprint("another window manager is already running\n");
 }
 
 /** Quit awesome
@@ -302,17 +302,17 @@ main(int argc, char *argv[])
             if(a_strlen(argv[2]))
                 confpath = argv[2];
             else
-                eprint("awesome: -c require a file\n");
+                eprint("-c require a file\n");
         }
         else
-            eprint("usage: awesome [-v | -c configfile]\n");
+            eprint("options: [-v | -c configfile]\n");
     }
 
     /* Tag won't be printed otherwised */
     setlocale(LC_CTYPE, "");
 
     if(!(dpy = XOpenDisplay(NULL)))
-        eprint("awesome: cannot open display\n");
+        eprint("cannot open display\n");
 
     xfd = ConnectionNumber(dpy);
 
diff --git a/config.c b/config.c
index 2666ed57..def470af 100644
--- a/config.c
+++ b/config.c
@@ -495,7 +495,7 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
         }
 
         if(!awesomeconf->screens[screen].nlayouts)
-            eprint("awesome: fatal: no default layout available\n");
+            eprint("fatal: no default layout available\n");
 
         /* Tags */
         awesomeconf->screens[screen].ntags = cfg_size(cfg_tags, "tag");
@@ -519,7 +519,7 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
         }
 	 
         if(!awesomeconf->screens[screen].ntags)
-            eprint("awesome: fatal: no tags found in configuration file\n");
+            eprint("fatal: no tags found in configuration file\n");
 
         /* select first tag by default */
         awesomeconf->screens[screen].tags[0].selected = True;
diff --git a/util.c b/util.c
index c04f0d1e..40735a68 100644
--- a/util.c
+++ b/util.c
@@ -45,6 +45,7 @@ eprint(const char *fmt, ...)
     va_list ap;
 
     va_start(ap, fmt);
+    fprintf(stderr, "awesome: ");
     vfprintf(stderr, fmt, ap);
     va_end(ap);
     exit(EXIT_FAILURE);