# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1121379862 -3600
# Node ID 1ceb68eb2fc1b116c571387f114f0302bce8f5f1
# Parent  d5ea0a05ba72bf9aa4e0b9c1d1e21503ef005f35# Parent  f0b7ff2df7e8c8f0ef831600b2edc6fd86f48a12
Merge Ctrl-C stuff


diff -r f0b7ff2df7e8 -r 1ceb68eb2fc1 mcabber/ChangeLog
--- a/mcabber/ChangeLog	Thu Jul 14 23:17:21 2005 +0100
+++ b/mcabber/ChangeLog	Thu Jul 14 23:24:22 2005 +0100
@@ -1,6 +1,7 @@
 mcabber (0.6.4-dev)
 
- 
+ * One Ctrl-C does not terminate mcabber anymore (the 2nd Ctrl-C do), but
+   abort current completion
 
  -- Mikael, ?
 
diff -r f0b7ff2df7e8 -r 1ceb68eb2fc1 mcabber/TODO
--- a/mcabber/TODO	Thu Jul 14 23:17:21 2005 +0100
+++ b/mcabber/TODO	Thu Jul 14 23:24:22 2005 +0100
@@ -20,10 +20,10 @@
 * Handle message type "error"
 * Show status changes in buddy window (if open)?
 * Options completion
+* Configuration file parsing: parse as commands (set, alias, bind)
 * Auto away
-* Maybe Ctrl-c should not (immediately) quit mcabber.  What about:
-  - 1 Ctrl-c leaves completion/multi-line modes
-  - 2 Ctrl-c in less than 2 seconds leave mcabber
+* Add a sample script for the events command
+* Make first Ctrl-C leave multi-line mode
 * Keep track of buddy resources.  Ex.:
   - buddy A connects with resource r1
   - buddy A connects with resource r2
@@ -49,6 +49,7 @@
   - /auth request|send [jid]
   - /search <jid>|name
     (server search)
+  - status status Message
   - /help
   - /rawxml...
 
diff -r f0b7ff2df7e8 -r 1ceb68eb2fc1 mcabber/src/main.c
diff -r f0b7ff2df7e8 -r 1ceb68eb2fc1 mcabber/src/screen.c
diff -r f0b7ff2df7e8 -r 1ceb68eb2fc1 mcabber/src/screen.h