From d77c397b180c337c4215cf3b97d80bd58ecd297a Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Thu, 9 Feb 2012 20:52:56 +0000
Subject: [PATCH] Removed subscription from roster

---
 README    | 21 +++++++++++++++++++++
 jabber.c  | 10 ++++------
 windows.c |  3 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/README b/README
index e9c70601..58c210ec 100644
--- a/README
+++ b/README
@@ -9,3 +9,24 @@ To make:
 To run:
 
     ./profanity
+
+WORKLIST:
+
+Features:
+    Show login attempts in console
+    Show roster on login
+    Add /msg command
+    Handle resize terminal in X windows
+    Secure XMPP
+    Window buffers for scrolling, with page up and down
+    Left right arrow keys whilst typing commands
+    Up down arrow keys for command history
+    
+Bugs:
+    Glitch with something flashing in status bar on login
+    Correctly handling string lengths
+
+One day:
+    Other IM protocols
+    Log chat history to file option
+    Tab completion on commands
diff --git a/jabber.c b/jabber.c
index 110ec008..67280088 100644
--- a/jabber.c
+++ b/jabber.c
@@ -146,15 +146,13 @@ static int _roster_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanz
                 item = xmpp_stanza_get_next(item)) {
             if ((name = xmpp_stanza_get_attribute(item, "name"))) {
                 char line[200];
-                sprintf(line, "  %s (%s) sub=%s", name,
-                    xmpp_stanza_get_attribute(item, "jid"),
-                    xmpp_stanza_get_attribute(item, "subscription"));
+                sprintf(line, "  %s (%s)", name,
+                    xmpp_stanza_get_attribute(item, "jid"));
                 cons_show(line);
             } else {
                 char line[200];
-                sprintf(line, "  %s sub=%s",
-                    xmpp_stanza_get_attribute(item, "jid"),
-                    xmpp_stanza_get_attribute(item, "subscription"));
+                sprintf(line, "  %s",
+                    xmpp_stanza_get_attribute(item, "jid"));
                 cons_show(line);
             }
         }
diff --git a/windows.c b/windows.c
index da51741d..bed8d9cb 100644
--- a/windows.c
+++ b/windows.c
@@ -150,7 +150,8 @@ void cons_help(void)
     wprintw(wins[0].win, " [%s]     /close : Close a chat window.\n", tstmp);
     wprintw(wins[0].win, " [%s]     /quit : Quits Profanity.\n", tstmp);
     wprintw(wins[0].win, " [%s]   Shortcuts:\n", tstmp);
-    wprintw(wins[0].win, " [%s]     F Keys : Chat windows.\n", tstmp);
+    wprintw(wins[0].win, " [%s]     F1 : Console window.\n", tstmp);
+    wprintw(wins[0].win, " [%s]     F2-10 : Chat windows.\n", tstmp);
 
     // if its the current window, draw it
     if (curr_win == 0) {