From 351ff752a7b11408e62f00cb8b5778a58e8fdda7 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Wed, 28 Jan 2015 20:35:00 +0000
Subject: [PATCH] Renamed command group presence->presences to avoid clash

---
 src/command/command.c  | 2 +-
 src/command/commands.c | 2 +-
 src/config/theme.c     | 2 +-
 src/ui/console.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/command/command.c b/src/command/command.c
index 8e16276b..f1926dbb 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1141,7 +1141,7 @@ cmd_init(void)
     autocomplete_add(help_ac, "basic");
     autocomplete_add(help_ac, "chatting");
     autocomplete_add(help_ac, "groupchat");
-    autocomplete_add(help_ac, "presence");
+    autocomplete_add(help_ac, "presences");
     autocomplete_add(help_ac, "contacts");
     autocomplete_add(help_ac, "service");
     autocomplete_add(help_ac, "settings");
diff --git a/src/command/commands.c b/src/command/commands.c
index 25314c2e..2059c982 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -714,7 +714,7 @@ cmd_help(gchar **args, struct cmd_help_t help)
             "/rooms", "/tiny", "/who", "/nick", "/privileges", "/info", "/occupants" };
         _cmd_show_filtered_help("Groupchat commands", filter, ARRAY_SIZE(filter));
 
-    } else if (strcmp(args[0], "presence") == 0) {
+    } else if (strcmp(args[0], "presences") == 0) {
         gchar *filter[] = { "/autoaway", "/away", "/chat", "/dnd",
             "/online", "/priority", "/account", "/status", "/statuses", "/who",
             "/xa" };
diff --git a/src/config/theme.c b/src/config/theme.c
index 6d3c5938..a5dbd0dd 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -592,7 +592,7 @@ theme_attrs(theme_item_t attrs)
     case THEME_BLACK_BOLD:              result = COLOR_PAIR(52); break;
     case THEME_MAGENTA:                 result = COLOR_PAIR(53); break;
     case THEME_MAGENTA_BOLD:            result = COLOR_PAIR(53); break;
-    default:                           break;
+    default:                            break;
     }
 
     if (g_hash_table_lookup(bold_items, GINT_TO_POINTER(attrs))) {
diff --git a/src/ui/console.c b/src/ui/console.c
index dd50d6d3..cdf5d1b8 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1402,7 +1402,7 @@ cons_help(void)
     cons_show("/help basic      - List basic commands for getting started.");
     cons_show("/help chatting   - List chat commands.");
     cons_show("/help groupchat  - List groupchat commands.");
-    cons_show("/help presence   - List commands to change presence.");
+    cons_show("/help presences  - List commands to change presence.");
     cons_show("/help contacts   - List commands for manipulating your roster.");
     cons_show("/help service    - List service discovery commands.");
     cons_show("/help settings   - List commands for changing settings.");