update e-mail address and README

21 files changed, 48 insertions, 89 deletions

diff --git a/README b/README
index d635b3fe..0c81c143 100644
--- a/README
+++ b/README
@@ -10,41 +10,48 @@
 Homepage:	http://poezio.eu
 Forge Page:	http://codingteam.net/projet/poezio
 
-Poezio is a console Jabber client. Its goal is to use anonymous
-connections to let the user join MultiUserChats. This way, the user
+Poezio is a console Jabber/XMPP client. Its goal is to use anonymous
+connections to simply let the user join MultiUserChats. This way, the user
 doesn't have to create a Jabber account, exactly like people are using
-IRC. It doesn't handle contact list at all.
-Poezio's commands are designed to be (if possible) like IRC
+IRC. Poezio's commands are designed to be (if possible) like IRC
 clients (weechat, irssi, etc).
+Since version 0.7, poezio can handle real Jabber accounts along with
+roster and one to one conversation, making it a full-featured console
+Jabber client, but still MultiUserChats-centered.
 
 =======================
 	Install
 =======================
-You need python (with argparse, optionnaly)
-and the xmpppy lib at the 0.5.0 version or higher.
+You need python 3.0 or higher, and the SleekXMPP python library.
+You can find my patched version at http://github.com/louiz/SleekXMPP until
+my changes (required to properly run poezio) are merged upstream.
 
 you can launch poezio with
 sh launch.sh
 
 or you can install it with (as root or with sudo)
 make install
-(`make uninstall` works, don't worry ;))
-you can then simply launch poezio
+(`make uninstall' works, don't worry ;))
+you can now simply launch `poezio'
 
 You can edit the config file (~/.config/poezio/poezio.cfg by default)
 or data/default_config.cfg (if you want to edit the config before the
 first launch)
 
-See the online documentation for more information:
+Please, see the online documentation for more information on installing,
+configuring or using poezio:
 http://codingteam.net/project/poezio/doc
 
+If you still have questions, or you're lost, don't hesitate to come
+talk to us directly on our Jabber chat room (see Contact section).
+
 Please DO report any bug you encounter and ask for any
 feature you want.
 
 =======================
 	Authors
 =======================
-Florent Le Coz (louiz') <louizatakk@fedoraproject.org> (main developper)
+Florent Le Coz (louiz') <louiz@louiz.org> (main developper)
 
 =======================
     Contact/support
@@ -70,68 +77,17 @@ the Creative Commons BY license (http://creativecommons.org/licenses/by/2.0/)
 =======================
 = People =
  Link Mauve - Code (a little)
- Erwan Briand - Handler and MultiUserChat classes
+ Erwan Briand - Code
  Gaëtan Ribémont (http://www.bonbref.com) - Logo design
  Ovart - Testing
- mathieui - Testing
+ mathieui - Testing, Makefile and Donation
  Gapan - Makefile
+ Koshie - Donation
 = Project =
  Gajim - send_vcard method and common.py
 
-======================
-       The code
-======================
-
-Classes:
-  - Connection *receives* messages from the Jabber network
-  - MultiUserChat *sends* messages to the Jabber network
-  - Gui displays everything on the screen and gets the user inputs
-  - Handler is the "link" between all these classes :
-a class emits a signal and the others classes listen to this signal
-and do what they have to do whenever this signal is emitted by any class
-
-Q: Why not use Connection to receive AND send the messages to Jabber network?
-A: I like it this way.
-
-Q: Could you please make a nice ASCII art, so I could understand all
-   the beauty and the complexity of this awesome software ?
-A: Of course, here it is:
-
-                 ___________________________
-                /                           \
-                |                           |
-                |     Jabber Network        |
-                |   (roomchats and people   |
-                |       inside them)        |
-                |                           |
-                \__________________________/
-                    |                   ^
-                    | receive     send  |          ____ Poezio ____
-                    v                   |
-           /----------------\   /-----------------\
-           |                |   |                 |
-           |   Connection   |   |  MultiUserChat  |
-           |                |   |                 |
-           \----------------/   \-----------------/
-                ^ |emit             emit | ^
-                | |      /---------\     | |
-       connect  \ \----> |         |<----/ / connect
-                 \______ | Handler |______/
-                         |         |
-                         \---------/
-                             | ^
-                     connect | | emit
-                             v |
-          /----------\   /---------\
-          |          |   |         |
-          |  Window  |<--|   Gui   |
-          |   etc    |   |         |
-          \----------/   \---------/
-              |               ^
-              |               | Keyboard
-              |               |
-              \          /---------\
-               \Screen   |         |
-                \        |   YOU   |
-                 ------->|         |
-                         \---------/
+=======================
+        Donate
+=======================
+If you're willing to thank me, or ask for an on-demand feature, please
+see the page http://louiz.org/donate.html and contact me.
diff --git a/data/default_config.cfg b/data/default_config.cfg
index 2944f4b1..b299f871 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -11,7 +11,10 @@ server = anon.louiz.org
 port = 5222
 
 # the resource you will use
-resource = poezio
+# If it's empty, your resource will be chosen (most likely randomly) by the server
+# It is not recommended to use a resource that is easy to guess, because it can lead
+# to presence leak.
+resource = 
 
 # the nick you will use when joining a room with no associated nick
 # If this is empty, the $USER variable will be used
diff --git a/src/common.py b/src/common.py
index cbe29fb0..f3fb878d 100644
--- a/src/common.py
+++ b/src/common.py
@@ -14,7 +14,7 @@
 ##                    Jonathan Schleifer <js-gajim AT webkeks.org>
 ##
 
-# Copyright 2010, Florent Le Coz <louizatakk@fedoraproject.org>
+# Copyright 2010, Florent Le Coz <louiz@louiz.org>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/config.py b/src/config.py
index b13c3148..287c47ec 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1,5 +1,5 @@
 # Copyright 2009 chickenzilla
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/connection.py b/src/connection.py
index 797205d9..7390e1e4 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/contact.py b/src/contact.py
index 435251a7..8966289b 100644
--- a/src/contact.py
+++ b/src/contact.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/gui.py b/src/gui.py
index 09e6f0f6..a35dfd96 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/handler.py b/src/handler.py
index dd848061..350ea0ed 100644
--- a/src/handler.py
+++ b/src/handler.py
@@ -1,5 +1,5 @@
 # Copyright 2009, 2010 Erwan Briand
-# Copyright 2010, Florent Le Coz <louizatakk@fedoraproject.org>
+# Copyright 2010, Florent Le Coz <louiz@louiz.org>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/keyboard.py b/src/keyboard.py
index 4a577d16..cdfb6dfb 100644
--- a/src/keyboard.py
+++ b/src/keyboard.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/logger.py b/src/logger.py
index 2070c2a6..4cfb7793 100644
--- a/src/logger.py
+++ b/src/logger.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/message.py b/src/message.py
index db355435..07526819 100644
--- a/src/message.py
+++ b/src/message.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index 41b1ebd5..2e04c609 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -1,4 +1,4 @@
-# Copyright 2010, Florent Le Coz <louizatakk@fedoraproject.org>
+# Copyright 2010, Florent Le Coz <louiz@louiz.org>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/poezio.py b/src/poezio.py
index 4c8c2cdb..8b245c08 100644
--- a/src/poezio.py
+++ b/src/poezio.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/room.py b/src/room.py
index adc2c44f..f2a608fc 100644
--- a/src/room.py
+++ b/src/room.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/roster.py b/src/roster.py
index 209f7134..72f885bc 100644
--- a/src/roster.py
+++ b/src/roster.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/singleton.py b/src/singleton.py
index 312d6d50..688d20f0 100644
--- a/src/singleton.py
+++ b/src/singleton.py
@@ -1,5 +1,5 @@
 # Copyright 2009, 2010 Erwan Briand
-# Copyright 2010, Florent Le Coz <louizatakk@fedoraproject.org>
+# Copyright 2010, Florent Le Coz <louiz@louiz.org>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/tab.py b/src/tab.py
index d5734941..8cb3ed0c 100644
--- a/src/tab.py
+++ b/src/tab.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/text_buffer.py b/src/text_buffer.py
index ad002892..203a966e 100644
--- a/src/text_buffer.py
+++ b/src/text_buffer.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/theme.py b/src/theme.py
index f4c5af48..c93db449 100644
--- a/src/theme.py
+++ b/src/theme.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/user.py b/src/user.py
index 8ddf47fc..1ed2a9f1 100644
--- a/src/user.py
+++ b/src/user.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #
diff --git a/src/window.py b/src/window.py
index 6f97f660..797575b7 100644
--- a/src/window.py
+++ b/src/window.py
@@ -1,4 +1,4 @@
-# Copyright 2010 Le Coz Florent <louizatakk@fedoraproject.org>
+# Copyright 2010 Le Coz Florent <louiz@louiz.org>
 #
 # This file is part of Poezio.
 #