Reporting cleaned up and levels made more consistent.

server/commands/client_commands.c

@@ -44,7 +44,7 @@ test_func_func (Client * c, int argc, char **argv)
 	char str[256];
 
 	for (i = 0; i < argc; i++) {
-		snprintf (str, sizeof(str), "test_func_func:  %i -> %s\n", i, argv[i]);
+		snprintf (str, sizeof(str), "%s:  %i -> %s\n", __FUNCTION__, i, argv[i]);
 		report (RPT_INFO, str);
 		sock_send_string (c->sock, str);
 	}

server/commands/menu_commands.c

@@ -89,6 +89,7 @@ menu_add_item_func (Client * c, int argc, char **argv)
 	/* Does the client have a menu already ? */
 	if (!c->menu) {
 		/* We need to create it */
+		report( RPT_INFO, "Client [%d] is using the menu", c->sock );
 		c->menu = menu_create ("_client_menu_", menu_commands_handler, c->name, c);
 		menu_add_item (main_menu, c->menu);
 	}

server/commands/screen_commands.c

@@ -82,7 +82,7 @@ screen_add_func (Client * c, int argc, char **argv)
 		report(RPT_WARNING, "screen_add_func: Error adding screen");
 		sock_send_string (c->sock, "huh?  Failed to add screen\n");
 	}
-	report(RPT_NOTICE, "added a screen (%s) to the display", s->id);
+	report(RPT_INFO, "Client on socket %d added added screen \"%s\"", c->sock, s->id);
 	return 0;
 }
 
@@ -125,7 +125,9 @@ screen_del_func (Client * c, int argc, char **argv)
 	} else
 		sock_send_string (c->sock, "huh?  Unknown screen id\n");
 
-	report(RPT_NOTICE, "removed a screen (%s) from the display", argv[1]);
+	report(RPT_INFO, "Client on socket %d removed screen \"%s\"", c->sock, s->id);
+
+	screen_destroy(s);
 	return 0;
 }