From 9959169bb056b1970f20208f1d9757014e0632f1 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 18 Jun 2008 17:19:36 +0200
Subject: [PATCH] statusbar: check for widget uniqness

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 awesomerc.lua.in |  4 ++--
 statusbar.c      | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/awesomerc.lua.in b/awesomerc.lua.in
index 5ac4bde6..5b55c089 100644
--- a/awesomerc.lua.in
+++ b/awesomerc.lua.in
@@ -91,7 +91,7 @@ mytasklist:set("text_focus", "<bg color='"..bg_focus.."'/> <span color='"..fg_fo
 mytextbox = widget.new({ type = "textbox", name = "mytextbox", align = "right" })
 -- Set the default text in textbox
 mytextbox:set("text", "<b><small> awesome " .. AWESOME_VERSION .. " </small></b>")
-mymenubox = widget.new({ type = "textbox", name = "mytextbox", align = "left" })
+mymenubox = widget.new({ type = "textbox", name = "mymenubox", align = "left" })
 
 -- Create an iconbox widget
 myiconbox = widget.new({ type = "iconbox", name = "myiconbox", align = "left" })
@@ -104,7 +104,7 @@ mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" }
 -- We need one layoutbox per screen.
 mylayoutbox = {}
 for s = 1, screen.count() do
-    mylayoutbox[s] = widget.new({ type = "iconbox", name = "myiconbox", align = "right" })
+    mylayoutbox[s] = widget.new({ type = "iconbox", name = "mylayoutbox", align = "right" })
     mylayoutbox[s]:mouse_add(mouse.new({ }, 1, function () awful.layout.inc(layouts, 1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 3, function () awful.layout.inc(layouts, -1) end))
     mylayoutbox[s]:mouse_add(mouse.new({ }, 4, function () awful.layout.inc(layouts, 1) end))
diff --git a/statusbar.c b/statusbar.c
index 75fb46a8..47ab0145 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -360,7 +360,15 @@ luaA_statusbar_widget_add(lua_State *L)
 {
     statusbar_t **sb = luaA_checkudata(L, 1, "statusbar");
     widget_t **widget = luaA_checkudata(L, 2, "widget");
-    widget_node_t *w = p_new(widget_node_t, 1);
+    widget_node_t *witer, *w = p_new(widget_node_t, 1);
+
+    /* check that there is not already a widget with that name in the titlebar */
+    for(witer = (*sb)->widgets; witer; witer = witer->next)
+        if(witer->widget == *widget)
+            luaL_error(L, "widget `%s' is already on statusbar");
+        else if(!a_strcmp(witer->widget->name, (*widget)->name))
+            luaL_error(L, "a widget with name `%s' already on statusbar `%s'",
+                       witer->widget->name, (*sb)->name);
 
     (*sb)->need_update = true;
     w->widget = *widget;