Index: i/trunk/.darcs_binaries
===================================================================
--- /psi/trunk/.darcs_binaries	(revision 189)
+++ 	(revision )
@@ -1,41 +1,0 @@
-# Binary file regexps:
-\.png$
-\.PNG$
-\.gz$
-\.GZ$
-\.pdf$
-\.PDF$
-\.jpg$
-\.JPG$
-\.gif$
-\.GIF$
-\.tar$
-\.TAR$
-\.bz2$
-\.BZ2$
-\.z$
-\.Z$
-\.zip$
-\.ZIP$
-\.jar$
-\.JAR$
-\.so$
-\.SO$
-\.a$
-\.A$
-\.tgz$
-\.TGZ$
-\.jpeg$
-\.JPEG$
-\.mpg$
-\.MPG$
-\.mpeg$
-\.MPEG$
-\.iso$
-\.ISO$
-\.exe$
-\.EXE$
-\.doc$
-\.DOC$
-\.jisp$
-\.JISP$
Index: i/trunk/.darcs_boring
===================================================================
--- /psi/trunk/.darcs_boring	(revision 189)
+++ 	(revision )
@@ -1,64 +1,0 @@
-# Boring file regexps:
-\.hi$
-#\.o$
-\.o\.cmd$
-\.ko$
-\.ko\.cmd$
-\.mod\.c$
-(^|/)\.tmp_versions($|/)
-#(^|/)CVS($|/)
-(^|/)RCS($|/)
-~$
-#(^|/)\.[^/]
-(^|/)_darcs($|/)
-\.bak$
-\.BAK$
-\.orig$
-(^|/)vssver\.scc$
-\.swp$
-(^|/)MT($|/)
-(^|/)\{arch\}($|/)
-(^|/).arch-ids($|/)
-(^|/),
-\.class$
-\.prof$
-(^|/)\.DS_Store$
-(^|/)BitKeeper($|/)
-(^|/)ChangeSet($|/)
-(^|/)\.svn($|/)
-\.py[co]$
-\#
-#\.cvsignore$
-(^|/)Thumbs\.db$
-
-# Binaries
-^src/psi$
-^src/psi.app$
-
-# Mac binaries
-^mac/disk
-^mac/Psi-.*
-^mac/(template|wc)\.dmg($|\.bz2$)
-
-# Windows
-^psiwin/.*$
-
-# libpsi
-^libpsi/psiwidgets/.*\.(o|moc|dylib)$
-^libpsi/psiwidgets/moc_.*\.cpp$
-
-# QMake makefiles
-^Makefile
-^src/Makefile
-^libpsi/psiwidgets/Makefile
-
-# QConf
-^conf.log
-^conf.pri
-^extra.pri
-^src/config.h
-
-# Qt dirs
-(^|/).ui($|/)
-(^|/).obj($|/)
-(^|/).moc($|/)
Index: i/trunk/COPYING
===================================================================
--- /psi/trunk/COPYING	(revision 189)
+++ 	(revision )
@@ -1,300 +1,0 @@
-
-  As a special exception, the copyright holder(s) give permission to link
-  this program with the Qt Library (commercial or non-commercial edition),
-  and distribute the resulting executable, without including the source
-  code for the Qt library in the source distribution.
-
-  As a special exception, the copyright holder(s) give permission to link
-  this program with any other library, and distribute the resulting
-  executable, without including the source code for the library in the
-  source distribution, provided that the library interfaces with this
-  program only via the following plugin interfaces:
-
-    1. The Qt Plugin APIs, only as authored by Trolltech
-    2. The QCA Plugin API, only as authored by Justin Karneges
-
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
Index: i/trunk/ChangeLog.original
===================================================================
--- /psi/trunk/ChangeLog.original	(revision 189)
+++ 	(revision )
@@ -1,678 +1,0 @@
-
-2005-08-22, Kevin Smith <psi-changelog@kismith.co.uk>
-	Made the auto-expanding text input the default.
-
-2005-08-22, Remko Troncon <remko@psi-im.org>
-	Added a UI option for auto-resizing text input.
-	
-	Added a message dialog suggesting you should restart.
-
-	Fixed Mac OS X focus problem in GC dialog.
-	This is the same patch as the earlier one for the chat dialog.
-
-	Reverted Fran's checkboxes for every sound event. (due to bugs)
-
-	Agents now get other types of initial presence as well (FS#464).
-	Patch by IceRAM.
-
-	Fixed authorization ping-pong issue.
-	Upon automatically granting authorzation, Psi no longer requests auth
-	when the subscription is already To or Both.
-	
-2005-08-21, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed single-line edit. Now it should behave ok when pasting large chunks
-	of text at a time. 
-	
-2005-06-24, Remko Troncon <remko@psi-im.org>
-	Added an option to set roster & chat dialog opacity (Win & Mac)
-
-	Moved Misc. Appearance options to a separate tab
-
-2005-06-23, Remko Troncon <remko@psi-im.org>
-	Added new appearance tweak options:
-	The group headings and account headings can now be assigned separate 
-	foreground and background colours.
-	The group headings can now be set in 'slim' mode from the options dialog.
-	The outline of the headings can be toggled.
-
-2005-06-21, Remko Troncon <remko@psi-im.org>
-	Hide unavailable platform-specific options from the UI
-
-	Added 'Dock Bounce' option to the options dialog
-
-	Changed 'MacOS X' into 'Mac OS X' here and there
-
-2005-06-19, Remko Troncon <remko@psi-im.org>
-	Clarified the JID field of the 'Register Account' dialog
-
-2005-06-14, Remko Troncon <remko@psi-im.org>
-	Mac OS X Dock icon changes: 
-	Added an option to bounce the dock once/never/forever. 
-	Added an overlayed event count to the dock icon.
-
-2005-06-08, Remko Troncon <remko@psi-im.org>
-	Separate checkboxes for every sound event + global checkbox in options
-	dialog. Patch by Fran.
-
-2005-05-24, Kevin Smith <psi-changelog@kismith.co.uk>
-	Finally fixed that tabs bug that could cause segfaults and strange behaviours
-
-2005-05-14, Remko Troncon <remko@psi-im.org>
-	Updates to the About Dialog
-
-	Fixed a memory leak in the Growl notification popups
-
-	Change Gadu-Gadu version string to the registered one (patch by
-	Maciek Niedzielski)
-
-	Fixed Mac OS X focus problems in the Chat Dialog
-
-	Flattened account context menu
-
-	Moved 'Check Status' dialog into the 'User Info' (VCard) dialog
-
-	Merged all iconset tabs into the appearance tab
-	Applied Kris Vandenbroek's fix for the iconset tabs
-	Misc. iconset details dialog improvements
-
-	Added 'Chat' button to the event dialog
-
-	Cleaning up the Account Dialog
-
-2005-05-04, Kevin Smith <psi-changelog@kismith.co.uk>
-	Changed the default from off to on for the previous patch
-
-2005-05-01, Remko Troncon <remko@psi-im.org>
-	Added an option to be notified of receiving authorization. Turned off by
-	default (as in about every IM client out there). In combination with
-	'auto-authorize', this makes a temporary solution for clean registration
-	with transports.
-
-2005-04-16, Remko Troncon <remko@psi-im.org>
-	Support clicking on Growl notifications. Fix some possible memory leaks
-	in GrowlNotifier.
-
-2005-04-14, Remko Troncon <remko@psi-im.org>
-	Translated all the Growl strings.
-	
-2005-04-14, Remko Troncon <remko@psi-im.org>
-	Modified the VCard dialog to enable displaying and setting of the photo
-	field (patch by Fran Rodríguez)
-
-2005-04-12, Kevin Smith <psi-changelog@kismith.co.uk>
-	Commiting Remko's growl patch. Strings aren't properly translated, he'll 
-	have to fix this sometime
-
-2005-04-07, Kevin Smith <psi-changelog@kismith.co.uk>
-	Committed a Linux From Scratch detection patch by Christopher Beppler
-
-2005-04-07, Kevin Smith <psi-changelog@kismith.co.uk>
-	Committed Remko's avatars patch to enable people to work on a central 
-	codebase.
-
-2005-03-29, Kevin Smith <psi-changelog@kismith.co.uk>
-	Machekku's selection Auto-copy patch.
-
-2005-03-22, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Updated roster auto-resize code. Now it should work for toggling self
-	contact too.
-	
-2005-03-12, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed bug: when loading eventqueue. If account name for event is not 
-	specified or incorrect, it's unable to display that message.
-	
-2005-03-09, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now, appending lines to the history files would not require index.
-	Thus, major speedup.
-	
-2005-03-05, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Ctrl-I shortcut will now trigger VCard dialog in MainWin, ChatDlg and
-	EventDlg.
-
-	Single-line edit should now work fine in tabbed chats too.
-	
-2005-02-28, Kevin Smith <psichangelog@kismith.co.uk>
-	Added icons and close buttons to each tab, getting rid of the unsightly one
-	in the corner.
-	
-2005-02-28, Kevin Smith <psichangelog@kismith.co.uk>
-	Added the option to have tabs at the bottom of windows instead, and
-	added drag and drop between tab windows.
-
-2005-02-28, Kevin Smith <psichangelog@kismith.co.uk>
-	Patch by PSZ to make Psi remember the last-used paths for file dialogs
-	on exit.
-
-2005-02-24, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now Shift+Space and Ctrl+Shift+Space global shortcuts should work on 
-	Linux too. And the GlobalAccel feature should now be used by everyone ;)
-	
-2005-02-22, Kevin Smith <psichangelog@kismith.co.uk>
-	Remko's patch for the mac menu.
-
-2005-02-20, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Psi won't stick to hidden windows anymore.
-
-	Now, config.xml should not be saved when processing new events.
-
-	Slightly better auto-roster-resizing on account enabling/disabling.
-	
-2005-02-13, Michail Pishchagin <mblsha@users.sourceforge.net>	
-	New AdvancedWidget template class, which implements sticking to screen
-	edges, and to other top-level widgets of the same app. Also implements
-	taskbar flashing. Chat, GroupChat, MainWin, Message dialogs are now
-	AdvancedWidget-enabled.
-	
-2005-02-13, Kevin Smith <psi-changelog@kismith.co.uk>
-	Newer version of the tabs code. Hopefully now it'll compile on non-linux without problems
-
-2005-02-13, Kevin Smith <psi-changelog@kismith.co.uk>
-	Remko's menubar patch
-
-2005-01-23, Kevin Smith <psi-changelog@kismith.co.uk>
-	Remko's memory leak in eventdb patch
-
-2005-02-06, Michail Pishchagin <mblsha@users.sourceforge.net>	
-	New autoRosterSize option, which automatically resizes your roster window
-	to fit as many contacts as possible. Please test it well ;)
-
-	Automatically resolve names of newly added contacts, if they don't have
-	assigned name yet. Could be useful when ICQ Transport is configured to
-	automatically add ICQ users to your roster. Also it could save you some 
-	time, clicking the Resolve button if you want to keep default nickname.
-	
-2005-01-30, Michail Pishchagin <mblsha@users.sourceforge.net>	
-	Groupchat with single-line edit enabled would no longer be unneedlessly
-	resized during nick completion.
-	
-2005-01-29, Michail Pishchagin <mblsha@users.sourceforge.net>	
-	Small chats now have effect on groupchats too. As well as single-line edit.
-
-	Mac: In single-line enabled chats and groupchats, the lineedits would be
-	paned by empty space from left and right and also would be centered. 
-
-2005-01-27, Michail Pishchagin <mblsha@users.sourceforge.net>	
-	Now scrollbar in single-line chat edit should no longer flicker.
-	
-2005-01-26, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Reduced flickering in single-line edit. Removed horizontal scrollbar.
-	Does not resize the dialog when it takes more than 90% of desktop's
-	area.
-		
-2005-01-24, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Experimental single-line edit in chat dialog. Seems to be useable.
-	
-2005-01-17, Kevin Smith <psi-changelog@kismith.co.uk>
-	Basic tab support. DO NOT USE THIS YET.
-
-2005-01-09, Kevin Smith <psi-changelog@kismith.co.uk>
-	Added the SystemWatch stuff for power saving notification on windows and osx
-
-2005-01-09, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now IconButton class would try to specify icon using QIconSet whenever
-	possible, what should improve the looks of disabled buttons.
-
-	Now Process Next Event would process events from a non-DND account prior 
-	to the DND one.
-
-	On MacOS, Psi dock icon would no longer bounce on messages from DND accounts.
-
-	Global Shortcuts patch by GreyCat. At the moment, if you want it, you
-	should configure the keys by editing the config.xml file.
-
----- Psi 0.9.3 Release ----
-
-2005-01-08, Kevin Smith <psi-changelog@kismith.co.uk>
-	Minor compiler error fix, and Release 0.9.3
-
-2004-12-28, Kevin Smith <psi-changelog@kismith.co.uk>
-	Two patches, one various x:data fixes, and the other a fix for the accounts 
-	combobox, which now only includes available accounts. 
-	Thanks to Remko for both.
-
-2004-11-20, Kevin Smith <psi-changelog@kismith.co.uk>
-	Minor change of defaults (particularly colour scheme on OSX) and removal of 
-	ugly bar when there's no scrollbars on OSX (Thanks Remko).
-
-2004-11-19, Kevin Smith <psi-changelog@kismith.co.uk>
-	GUI option for smallChats (thanks Pintail). Various string consistencies and 
-	clarifications (thanks Remko). New Mac build scripts (thanks Remko)
-
-2004-11-19, Kevin Smith <psi-changelog@kismith.co.uk>
-	Previously enabling "Ignore events from non-roster contacts" ignored private
-	groupchat messages, now it doesn't (although there's an xml option to revert)
-
-2004-10-31, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Corrected the name of AlertIcon class (it messed up the caching of
-	MTray icons).
-
-	QPixmapTray will be cleared on iconset change.
-
-	IceRAM's patch for beauty tray icons on Linux.
-	
-2004-10-29, Kevin Smith <psi-changelog@kismith.co.uk>
-	Committed Misha's fix to the MTray segfaults.
-	Fixed the Segfault when a contact went offline during regrouping.
-
-2004-10-28, Kevin Smith <psi-changelog@kismith.co.uk>
-	Windows 2003 detection code added. (MichalJ)
-	QT Translations (Skazi)
-
-2004-10-20, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Message events patch by Remko Troncon.
-
-	No toolbars on Mac by default by Remko Troncon.
-	
-2004-10-11, Michail Pishchagin <mblsha@users.sourceforge.net>
-	http://ftp.xiaoka.com/friends/skazi/psi/patches/
-	psi-tooltip_version_noslash-mod.diff
-	
-2004-10-03, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Another set of patches by Remko:
-	
-	* Ability to disable online accounts, in which case a dialog will pop
-	  up.
-	* Ability to enter empty status messages.
-	* Removed badly-looking icons on Mac.
-	* Some changes in menu layout on Mac.
-	* Modifications to system iconset, so there will be different icons
-	  for Roster and Advanced tabs in options.
-	
-2004-09-24, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Corrected 'Use Sounds' setting loading. Thanks to Marcel Naziri for
-	writing a fix!
-	
-2004-09-06, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Dynamic 'avatars', 'vcard' and 'history' directory recreation, and 
-	removal of unused 'info' dir.
-	
-2004-08-18, Michail Pishchagin <mblsha@users.sourceforge.net>
-	TrayIcon correction by William Waghorn, so it should work correctly
-	on Gnome from now on. But there'll be dependency on PsiApplication :-/
-
-	Disabled the unfinished avatar support in preparations for 0.9.3
-	release. Patch by Remko.
-
-2004-08-16, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Small fix for default profile by Remko.
-
-	Created general-like menu on MacOS by Remko.
-
-2004-08-12, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now tooltip of account will display number of online contacts and
-	total number of contacts in roster by Remko.
-
-	Fixes to the Mac menu by Remko.
-
-2004-08-09, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now IconAction should correctly remove unnecessary cached QPopupMenu 
-	pointers, and shouldn't crash.
-	
-2004-08-08, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Major speedup when parsing disco#items results in Service Discovery
-	dialog.
-	
-2004-08-05, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now MainWin uses new action customization framework. Test it, break it,
-	fix it :-)
-	
-2004-08-03, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now ShowSelf action will be shown in the mac menu too
-	(thanks to Remko, as usual)
-
-2004-08-02, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Ability to initiate file transfers by dropping files in the ChatDlg 
-	by Remko:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/filetrans-chatdlg_psi.diff
-
-	Fixed joining groupchat rooms by Remko:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/accountscombobox-fix_psi.diff
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/eventdlg-onlineonly_psi.diff
-
-	Selfcontact action + account tip by Remko:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/selfcontact+accounttip_psi.diff
-
-2004-07-25, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Changed the toolbars configuration format in config.xml. Do not use
-	older Psi's after upgrading to this one, or your toolbar configuation
-	will be lost!
-	
-2004-07-18, Michail Pishchagin <mblsha@users.sourceforge.net>
-	x:data support for iq:register dialog.
-	x:data support for iq:search dialog.
-
-	SkaZi's offline status message patch.
-
-	Default profile Remko's patch:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/defaultprofile_psi.diff
-
-	Select only online accounts in Join Groupchat dialog by Remko:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/groupchat-onlineonly_psi.diff
-	
-2004-07-14, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Avatar patch by Remko:
-	* Added new icons & updated others
-	* When a new VCard is retrieved, the corresponding avatar is updated
-	  automatically
-	* Added run-time options for avatars (enable switch + dimension)
-	* Added 'Clear  avatar' context menu. Grouped avatar-related context menu
-	  in 1 popup.
-	* When there is no avatar, show no avatar (instead of showing a default one)
-	* When a contact is removed, remove its associated avatar too.
-	* Comments are now Psi-style
-	
-2004-07-11, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Support for getting VCard image as avatar by Remko.
-	
-2004-07-10, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Improved the avatar in the tooltip appearance somewhat.
-	Thanks to IceRAM.
-
-	Now CVS builds will be timestamped.
-
-2004-07-09, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed crash in groupchat's rosters' tooltips. Thanks, Remko!
-	
-2004-07-08, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now status buttons should have effect on connecting accounts too.
-	
-2004-07-07, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now ChatDlg uses toolbar to display it's toolbuttons. Later it should
-	become customizeable!!
-	
-2004-07-05, Kevin Smith <psi-changelog@kismith.co.uk>
-	Added Passive Popup for file transfers:
-	ftp://ftp.patryk.one.pl/pub/windows/siec/psi/selfmade/patches/psi-popup_file.diff
-
-2004-07-05, Kevin Smith <psi-changelog@kismith.co.uk>
-	Added Skazi, Remko, Hal and IceRam to the thanks page of the about dialog. 
-	Thanks Guys.
-
-	Added support for static (locally defined) avatars. Haven't added a toggle
-	yet, I'm waiting to see if anyone actually *doesn't* want it.
-
-2004-07-01, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Show 'Insert Emoticon' toolbutton in chat dialog when it's not in compact
-	mode:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/chatdlg-emot_psi.diff
-
-	Smart change status button:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/statuschange_psi.diff
-
-	Now dragging multiple files at once will result in many FT dialogs.
-	Thanks to Remko Troncon ;-)
-
-	Now Service Disovery dialog uses PsiToolBar.
-	
-2004-06-30, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added 'Get vCard' and 'Resolve Nick' buttons to the Add new user dialog.	
-	Removed 'XML Console' from 'Psi' menu.
-
-	Fixed translations of compact chat mode:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/chatdlg-menu_psi.diff
-
-	Drag-n-Drop support for File Transfer:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/dragdropfile_psi.diff
-
-	Mac menu:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/macmenu_psi.diff
-
-	Mac roster grip:
-	http://www.cs.kuleuven.ac.be/~remko/psi/patches/macstatusbottom_psi.diff
-	
-2004-06-14, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now Psi wouldn't load successfully with the absent default icons.
-	
----- Psi 0.9.2 Release ----
-
-2004-06-05, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added 'Psi Handbook' entry to the Help menu.
-	
-2004-05-29, Michail Pishchagin <mblsha@users.sourceforge.net>
-        Fixed Tip of The Day's What's This string.
-
-2004-05-26, Michail Pishchagin <mblsha@users.sourceforge.net>
-        Fixed tab order in Sound tab in Options dialog.
-
-2004-05-04, Justin Karneges <justin@affinix.com>
-        Added file transfer manager.
-
-2004-05-04, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed a bug, when you had some popups on the screen, and quitted psi,
-	it always segfaulted.
-	
-2004-05-01, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added "Incoming File Transfer" and "File Transfer Complete" sounds to the
-	Sound tab in Options dialog and common.h. 
-	Now it's up to Justin to actually use them :)
-
-	Now sounds from iconsets shouldn't be played when sounds are disabled.
-
-	Hopefully fixed the 'next' button's icon on non-X11 platforms.
-
-	Fixed line endings in Export History dialog.
-	
-2004-04-30, Michail Pishchagin <mblsha@users.sourceforge.net>
-	ed2k:// patch by SkaZi.
-
-	Bug with IRC gateway icon and Service Discovery dialog.
-
-	Added selection of Popup Font.
-
-	New looks of Appearance tab in the Options dialog.
-	
-2004-04-18, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added conference/irc type to the list of known disco identities.
-	Now the disco dialog should display IRC gate icon just ok.
-	
-2004-04-05, Michail Pishchagin <mblsha@users.sourceforge.net>
-	The bug-reporting patch by SkaZi.
-	(http://psi.affinix.com/flyspray/index.php?do=details&id=238)
-	
-2004-04-04, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Update the (C) year in About dialog to 2004.
-	
-2004-04-01, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added the Transfer Manager action to the main window.
-	
-2004-03-30, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now chat and event dialogs do not linkify the status tooltips of the 
-	contact.
-
-	Now service discovery dialog should be able to search JUD on jabber.org
-	(since it started to support Service Discovery) when protocol is set 
-	to A (Auto) or D (Disco).
-
-	Now Psi shouldn't crash on exit with the ~PsiTextView as the cause.
-	
-2004-03-25, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed the slotScroll() slot in GroupChat dialog, and scrolling to bottom
-	should actually work now.
-	
-2004-03-18, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now type ahead in contact view will reset after 3 seconds of inactivity.
-	
-2004-03-16, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Bug: Groupchat dialog was not always scrolled to bottom. Fixed now.
-	
-2004-03-15, Justin Karneges <justin@affinix.com>
-        New history features: erase all and export to friendly text.
-
-2004-03-15, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Delete old settings in HKLM on Windows systems.
-	
-2004-03-12, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Updated default icons (they're now made smaller in size, all thanks to
-	Piotr Iwo Skrodzewicz).
-
-	Added --nocrash command-line option.
-	
-2004-03-10, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed silly bug when loading sort style for contacts in roster.
-
-	Added ArchLinux to the list of detectable Linux distrox (thanks to IceRAM).
-	
-2004-03-08, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now 'crash' support will not be built-in by default.
-
-	Fixed bug in disco dialog, when doing Refresh Item on parent item, its
-	child loses all features and identities.
-	
-2004-03-03, Justin Karneges <justin@affinix.com>
-        ContactView shortcuts were broken, fixed.
-	'configure' updated to not bundle qxml unless necessary.
-
-2004-03-03, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Small code cleanup by SkaZi
-
-2004-03-02, Justin Karneges <justin@affinix.com>
-	Data transfer settings
-	
-2004-02-29, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added vertical splitter to the groupchat dialog (thanks to IceRAM for the 
-	hint)
-
-	Now Psi should compile with Qt 3.1.x on Windows again
-	
-2004-02-28, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now only one trackbar exists at a time in groupchat dialog (patch by
-	Bastian Hoyer)
-	
-2004-02-27, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Reverted the hide/show roster code to the old one, which was used in 0.8.7
-	
-2004-02-26, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed replying to replied plain messages. In 0.9.1 subject became empty
-	in that case.
-	
-2004-02-25, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Real fix for now: Now in nick-completion the space is not added when 
-	completion is not at the start of the string (thanks to IceRAM for the 
-	hint)
-	
-2004-02-23, Kevin Smith <psi-changelog@kismith.co.uk>
-	Added an xml option to have the xml console visible and enabled at login.
-	Some people wanted this for debugging.
-
-2004-02-23, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed the emoticonify function: now it will correctly handle this case:
-	";-)
-	:-P(blah-blah-blah)"
-
-	Now MainWin's position will not be saved, if the X or Y coordinate is 
-	fever than -30000 (I think that it should work, but it needs testing).
-
-	Now IconSelect can take up to 3/4 of the screen's 
-	MIN(screen.width, screen.height).
-	
-2004-02-21, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Now in nick-completion the space is not added when copletion is not at
-	the start of the string (thanks to IceRAM for the hint)
-
-	Now Psi should be able to load attachments from messages that it saved
-	to the event queue on the disk (thanks to SkaZi for the patch)
-
-2004-02-16, Kevin Smith <psi-changelog@kismith.co.uk>
-	Added a trackbar to the groupchat dialog
-
-2004-02-16, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fix for nick completion bug in groupchat dialog, which showed only
-	when there were people with identical-starting nicks, but in other
-	cases (ex: IceRAM vs. infiniti)
-
-	"Crash" patch by Juan F. Codagnone.
-	
-2004-02-13, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fix for type ahead by Juan F. Codagnone.
-	
-2004-02-11, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fix for crash on startup if iconset could not be loaded. (thx to SkaZi)
-	
-	Fix for multiline descriptions in url attachments by SkaZi.
-
-	Fix for text color in groupchat dialog by SkaZi.
-	
-2004-01-27, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Event queue sorting patch by SkaZi.
-	
-2004-01-26, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Received messages are now queued to disk 
-	(to PsiDataDir/profiles/profilename/events-accountname.xml)
-	
-2004-01-25, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Hidden group patch by SkaZi.
-	
-2004-01-25, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Updated EventQueue saving/loading code (but it's still not perfect, 
-	though).
-	
-2004-01-23, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed a bug in PsiIconset::Private::loadIconset(): If original icon have
-	Anim, and new icon doesn't have Anim, old Anim was not deleted, which
-	caused incorrect animations to appear (example: psi/chat icon in 
-	LightBulb iconset).
-	
-2004-01-21, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Small fix to the resource search path under Windows.
-	
-2004-01-21, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Patch by Juan F. Codagnone:
-	This patch was called originaly "miranda like type-ahead patch"  after the 
-	Mozilla's and Miranda IM's feature. It lets you go to any contact in your 
-	roster, typing his name. (at the moment, in psi, when you want to search for 
-	some one, you need to type the first character of the nickname you are 
-	searching for).
-	
-2004-01-19, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Moved Configure Toolbars out of main Psi menu, to the toolbars' own
-	context menus.
-	
-2004-01-17, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Tip of the Day is back! Please contribute your useful tips and tricks,
-	so they will be there in 0.9.2 ;)
-		
-2004-01-17, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Fixed grammar, spelling, and other errors/typos in translatable	
-	strings (in psi/src/options).
-
-2004-01-16, Michail Pishchagin <mblsha@users.sourceforge.net>
-	now Sound Player option is separated to tokens by the ' ' (space) char.
-	it is possible to use complex sound player commands now.
-	Patch by "wwp <subscript@free.fr>"
-	
-2004-01-11, Kevin Smith <psi-changelog@kismith.co.uk>
-	XML option to turn off the numbers in group headers.
-
-2004-01-10, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Added nick-completion in Groupchat dialog. Press Tab key to complete and
-	to iterate through the nicks
-	
-2004-01-06, Kevin Smith <psi-changelog@kismith.co.uk>
-	Accounts can now be enabled and disabled in account settings (Skazi's
-	patch)
-
-2004-01-05, Kevin Smith <psi-changelog@kismith.co.uk>
-	Emoticonified text now also shows *text* as bold, /text/ as italic,
-	and _text_ as underlined.
-
-2004-01-05, Kevin Smith <psi-changelog@kismith.co.uk>
-	Support for multiple contact adds from the services dialog (Mike
-	Fawcett (deviant))
-
-2004-01-04, Kevin Smith <psi-changelog@kismith.co.uk>
-	Started this ChangeLog.
-	
-	Presets in status dialog are now sorted alphabetically. (Skazi's patch)	
-	Status Dialog has a tickbox to save the status message as a preset (Remko's Patch)	
-	Seperated headlines from messages for sound and popups.
-
-2003-01-03, Kevin Smith <psi-changelog@kismith.co.uk>
-	Small chat support, there's a global default in the config (no option yet) and
-	right click per-dialog
-	
-2004-01-02, Michail Pishchagin <mblsha@users.sourceforge.net>
-	Service registration dialog corrections by SkaZi:
-	  - 'register' is the default button
-	  - first line in form is focused
-	
----- Psi 0.9.1 Release ----
Index: i/trunk/Changes.txt
===================================================================
--- /psi/trunk/Changes.txt	(revision 189)
+++ 	(revision )
@@ -1,134 +1,0 @@
-List of Changes
----------------
-
-Note 1: Items marked as [<plarform>] are specific to the given platform only.
-Note 2: Items marked as [Qt ...] are applied to the Qt Toolkit, not to Psi.
-
-
-Version 0.10.1 (2006-09-26)
----------------------------
-
-Improvements:
-
-    - Important: the application name has been changed to Psi/2 in order to
-      clearly distinguish it from the original Psi application (see Readme.txt).
-      Hence, the 'os2' suffix has been removed from the version number.
-
-    - [OS/2] Built using Qt 3.3.1-RC7 SVN build r131.
-
-    - [OS/2] Implemented the OS/2 version of the QCA SSL plugin (qca-tls.dll)
-      that brings the SSL connection support to Psi. When using the
-      WarpIn package, the plugin installation is optional.
-
-    - [OS/2] Added support for the Innotek Font Engine. If it is installed,
-      Psi will start using it automatically (i.e. will anti-alias all vector
-      fonts).
-      
-    - [OS/2] Added recognition of the "PM Default Browser/Mail" setting for
-      opening links. See "Manual Installation" for more info.
-
-    - [OS/2] If the "Raise chat window on receiving new messages" option is
-      selected, but the chat window is on an invisible XPager page, it will be
-      moved to the current (visible) one.
-
-    - Pressing ESC in a chat or a group chat window minimizes it instead of
-      closing. You can close the window using Ctrl-W or Alt-F4, as before.
-
-    - Changed the !beep sound functionality (recognized when assigning
-      sound files to events): the new format is !beep[:freq[,dur]]... that
-      allows to assign different "beep" sound sequences (simple melodies)
-      to events instead of Wave files [OS/2 & Win32 only].
-  
-Fixed Bugs:
-
-    - [OS/2] Psi could trap with SY3184 (divide-by-zero) on systems with
-      DBCS codepages (e.g. Japanese OS/2) [Qt bug].
-
-    - [OS/2] Added a workaround for single-streamed sound cards (e.g. ESS688)
-      with badly written drivers: playing too many sounds simultaneously
-      on such a card in the shared mode can cause 100% CPU load followed by a UI
-      hang. Set the QT_PM_NO_SOUND_SHARE environment variable to a non-empty
-      value (e.g. YES) in order to tell Qt open sound devices in the exclusive
-      mode [Qt enancement].
-
-    - [OS/2] Running Psi for a long time could waste PM timer resources and
-      cause other applications to behave badly (e.g. stopped icon/image
-      animation in PMMail/EFCommander, frozen UI in PMDownloader, etc.)
-      [Qt regression].
-    
-    - [OS/2] Psi would silently crash if the HOME environment variable was not
-      set or pointed to a wrong (non-existing) location [Qt bug].
-
-    - When the "Raise chat window on receiving new messages" (or the "Raise
-      Roster Window On New Event") option was set, the chat (or the roster)
-      window also took the keyboard focus instead of just bringing itself to
-      front.
-      
-    - When the "Open chats in tabbed mode" option was in action, the
-      confirnation dialog appearing when the chat window is to be closed
-      rapidly after receiving a new event, was ignored.
-      
-    - [Win32] The "Raise window..." function didn't actually put the
-      relevant window on top of the currently active window.      
-
-
-Version 0.10-os2-b1 (2006-08-18)
---------------------------------
-
-Improvements:
-
-    - [OS/2] Built using Qt 3.3.1-RC7 SVN build r118.
-
-    - Chat tabs can be switched using Ctrl+Tab and Ctrl+Shift+Tab
-      combinations (together with cross-platform Ctrl+PgUp/Ctrl+PgDn).
-
-    - Pressing the Esc key in the Roster window minimizes it if the Docklet
-      widget (tray icon) is disabled (which is always true on OS/2 since there
-      is no xCenter/SysTray integration yet).
-
-    - [OS/2] Removed the Options->Sound->Player entry field (not used in OS/2).
-
-Fixed Bugs:
-
-    - [OS/2] Unpainted vertical strip in QToolBar (seen to the left from the
-      Clear chat window button) [Qt bug].
-
-    - [OS/2] Pressing AltGr+key could produce valid characters in some
-      keyboard layouts (i.e. the German one) which were ignored in the chat
-      window [Qt bug].
-
-    - [OS/2] In the roster: pressing the Status button right after pressing
-      the Psi button didn't unpress the latter (and vice versa) [Qt bug].
-
-    - [OS/2] Notification popups didn't take the desktop work area size into
-      account (appeared over the xCenter widget) [Qt enhancement].
-
-    - [OS/2] Playing too many sounds simultaneously could screw up a
-      single-streamed audio driver and cause the application hang during
-      termination or even a crash [Qt improvement].
-
-    - [OS/2] All network activity (including file transfer) was suspended
-      during moving or resizing Psi windows using the mouse [Qt improvement].
-
-    - [OS/2] Selecting 'Rerequest authorization from' in the context menu
-      of ICQ and Transport contacts in the Roster would crash Psi.
-
-    - [OS/2] Opening the chat window could sometimes crash Psi (SIGFPE)
-      [Qt bug].
-
-    - When both "Open chats in tabbed mode" and "Raise chat window on receiving
-      new messages" were set, receiving a new message would bring the chat
-      window to front but would not change the active tab to the one
-      corresponding to the chat window.
-
-    - [OS/2] Closing Psi trying to connect (resolve the server name) when
-      there was no Internet connection hid all Psi windows but didn't exit
-      the process until the request timed out (that could take quite a
-      long and didn't allow to start another Psi instance).
-
-
-Version 0.10-os2-a1 (2006-07-25)
---------------------------------
-    
-    The first public alpha version (built using Qt 3.3.1-RC7 SVN build r102).
-
Index: i/trunk/INSTALL.original
===================================================================
--- /psi/trunk/INSTALL.original	(revision 189)
+++ 	(revision )
@@ -1,43 +1,0 @@
-Installation
-------------
-
--=[ Linux / Unix ]=-
-
-  $ ./configure
-  $ make
-  # make install
-
-  Once installed, launch the program by running "psi".
-
-  For more details about compiling, refer to the "Compiling" section below. 
-
--=[ Windows ]=-
-
-  No installation required for Windows.  You can simply just
-  run the Psi executable.  You might want to move everything into
-  C:\Program Files\Psi
-
--=[ eComStation / OS/2 ]=-
-
-  For automatic installation, just use the provided WarpIn archive.
-  For manual installation instructions, refer to the Readme-OS2.txt file.
-
--=[ MacOS X ]=-
-
-  Just run the Psi "executable package" thing.  No installation required.
-
-
-Compiling
----------
-
-Requirements:
-  - Qt 3.1.0 *mulithreaded*, nothing less!
-  - QCA 1.0 or compatible
-  - zlib 1.1.4 or compatible
-
-You can obtain Qt at http://www.trolltech.com/
-You can obtain QCA at http://delta.affinix.com/qca/
-
-Note: For information about building Psi on Mac or Windows, see
-build-mac.txt or build-win.txt
-
Index: i/trunk/README.original
===================================================================
--- /psi/trunk/README.original	(revision 189)
+++ 	(revision )
@@ -1,217 +1,0 @@
-Psi 0.10
----------
-Date: January 11th, 2006
-
-Project Lead/Maintainer (2004-current):
-  Kevin Smith
-  kismith@psi-im.org
-  http://www.kismith.co.uk/
-
-Original Author (2001-2004):
-  Justin Karneges
-  justin@affinix.com
-  http://psi-im.org/
-
-
-  For installation or compiling instructions, see the INSTALL file.
-  (On Windows, see install.txt)
-
-  This program is licensed under the GNU General Public License.  See
-  the COPYING file for more information.
-
-
-Notes
------
-  - You need the QCA-TLS plugin to utilize SSL connectivity.
-    See http://delta.affinix.com/qca/
-
-  - Upgrading to 0.10 --
-    * Users upgrading will not benefit from the new colour scheme. If they
-      want the new colours, they should quit Psi and edit their config.xml file
-      by hand. For details, please see the User Guide in the Help menu.
-    * Due to the increased bandwidth used by auto-version checks, they
-      have been disabled since 0.9 by default.  There is an option to
-      enable it.
-    * The self-contact is now only shown if there is more than one
-      resource logged in at once.  If you'd rather it always show, like
-      in 0.8.7, then there is a way to enable it.
-    * An XML format is now used for storing SSL certificates.  In the
-      future, Psi will support importing of PEM files.  For now, you
-      will have to create the XML by hand.  See certs/README.
-    * You must use the QCA-TLS plugin to utilize SSL.  The older 'QSSL' plugin
-      will not work.
-
-  - GnuPG tips --
-    * Always use the latest version of GnuPG.
-    * On Windows, use a native build instead of one based on cygwin, and make
-      sure it is properly installed in the registry.
-    * Ensure 'gpg' actually works, by testing it from the command-line.
-    * You must have a public and secret keyring.  Psi cannot operate
-      without them, and they must be there when you start it.
-    * If you experience fatal GnuPG incompatibilities, you can pass
-      the --no-gpg option to Psi and gpg will not be used.
-    * If you have gpg-agent set up, but you don't want Psi to use it, then
-      you can pass --no-gpg-agent to force the use of Psi's built-in prompt.
-
-
-Changes
--------
-  New in 0.10
-  - Psi will now sign out before Windows or Mac OS X machines go to 'sleep'
-  - The default text input line in the chat dialogs starts at one line tall, and grows as necessary.
-  - The Roster can now be automatically resized to fit all contacts.
-  - The Roster now has a menu bar available on Windows and Linux
-  - Chat windows can be collected together using tabs
-  - On Windows and Mac OS X, selected text may be automatically copied to the clipboard.
-  - Mac OS X builds now enjoy Growl(.info) support
-  - Photos are now available in the VCard dialog
-  - New default colour scheme
-  - New default iconsets
-  - Roster and chat dialog opacity is now configurable on Windows and Mac OS X
-  - The colour scheme is now slightly more configurable
-  - Assorted minor feature additions and bug fixes
-
-  New in 0.9.3
-  - Notification when a user is typing
-  - Advanced Data Forms capability (x:data)
-  - Mac version uses the menu bar and also has a new color scheme
-  - Slightly improved new user dialog
-  - Drag and drop File Transfer
-  - Ability to specify a status messages when going offline
-  - The tray icon under X11 should now be more beautiful
-  - Show self-contact is now a toolbar button instead of a normal option
-  - There is now an option for all chat windows to be compact by default
-  - Bugfix: file transfer sometimes wouldn't send the whole file
-  - Fixed many other small bugs
-
-  New in 0.9.2
-  - File transfer
-  - Event queue is saved to disk at all times for fault protection
-  - Enable/disable accounts
-  - Groupchat nickname tab-completion
-  - Groupchat trackbar to mark last read text when unfocused
-  - *bold*, /italic/, _underline_
-  - Fixed bug where the roster window could get lost on Windows
-  - 'Compact' mode for chat window
-  - Tip of the day
-  - Hidden roster group
-  - Ability to export history as readable text
-  - Event queue sorting by type
-  - Type-ahead search in the roster
-  - External programs can now have parameters
-  - Toolbar configuration is now accessed from the right-click menu
-  - Show dates in local format
-  - Use the gnome-open utility for opening URLs with GNOME2
-  - Fixed "broken pipe" crash when receiving GnuPG errors
-
-  New in 0.9.1
-  - Service Discovery browser (JEP-0030)
-  - Popup notifications
-  - Redesigned Iconset & Emoticons system, based on JEP-0038
-  - Now possible to use service/transport icons for individual contacts
-  - Ability to use custom roster icons for contacts via RegExps
-  - Emoticon popup menu in chat window, for quick access
-  - Reorganized Options window
-  - Toolbar Editor
-  - GnuPG 1.2.3 compatibility
-  - New XMPP/Jabber engine (partially complete, XMPP 1.0 support deferred)
-  - SOCKS5 proxy support
-  - HTTP polling proxy support (JEP-0025)
-  - Roster groups open/closed state saved
-  - 'Free for Chat' status
-  - Character counter
-  - Selectable colors for roster 'blink' animation
-  - Copy Location in URL attachment context menu
-  - X11: WindowMaker docklet
-  - Windows: fixed idle detection on Windows 9x
-  - Mac: ability to hide/restore main window
-  - Option: ignore messages from addresses not in your roster
-  - Option: enter key sends chat messages
-  - Option: raise chat window on receiving new messages
-  - Option: auto-authorize contacts
-  - Option: 'small' group headings
-  - Option: treat incoming chats as messages unless chatting
-  - Option: show/hide subject line
-  - Option: enable/disable vCard check during login
-  - Account dialogs ensure the JID is a valid user-JID before accepting
-  - Bugfix: crash after using the Jabber browser
-  - Bugfix: crash when resolving DNS
-  - Bugfix: busy indicator sometimes stopped when it should still be running
-  - Fixed many other bugs
-
-
-Description
------------
-
-  Psi is a capable Jabber client aimed at experienced users.  Its design
-  goals are simplicity and stability.  Psi is highly portable and runs on
-  Windows, Unix/X11, and MacOS X.
-
-  The interface is very ICQ-like.  Alerts appear in the contact list when
-  events are received, and things like subscriptions requests appear as
-  "system messages" (ICQ users know these well).  Even "Chats" are
-  queued in the contact list.  Also, chats are "remembered" by default,
-  so that you don't have to keep a bunch of windows open for each person.
-  Just close the chat window.  If you open it again it will all be there.
-
-  Psi is minimal but powerful.  There are keybindings for just about
-  everything, Unicode is supported throughout, and contacts are cached
-  offline.  Security is also a major consideration, and Psi provides it for
-  both client-to-server (SSL) and client-to-client (GnuPG).
-
-  Plans for v1.0:
-   - Multi-User Chat (JEP-0045)
-   - Plugin system
-   - Other misc stuff
-   - Bugfixes
-
-
-How you can help
-----------------
-
-  Comments
-  --------
-  I like comments, even if they are a simple thanks.
-
-  Bug reports
-  -----------
-  If you want to help me out, email me a bug report.  Be as descriptive
-  as possible and tell me what exactly you were doing at the time
-  something went wrong.  If possible, send me a stack backtrace.
-
-  Wishes
-  ------
-  I can't possibly know what everyone wants, so I appreciate all feature
-  requests.
-
-  Porting
-  -------
-  Psi should be very portable.  Please e-mail me first if you want to
-  port Psi to another platform.
-
-  Graphics
-  --------
-  I am no artist.  If you think you can do a better job with any of the
-  Psi graphics, then go right ahead!
-
-  Sound
-  -----
-  Same goes for sound.  Start mixing!
-
-  Programming
-  -----------
-  Patches are welcome.  External tools would be useful as well, like Licq
-  conversion utilities (iconsets, message history, etc).  Get to work!
-
-  Packaging
-  ---------
-  Want to make an RPM or something?
-
-  Financial
-  ---------
-  You can send a paypal gift if you'd like, to justin@affinix.com
-
-
-Have fun,
--Justin
-
Index: i/trunk/Readme-OS2.txt
===================================================================
--- /psi/trunk/Readme-OS2.txt	(revision 189)
+++ 	(revision )
@@ -1,133 +1,0 @@
-Psi/2 for OS/2
---------------
-
-This file contains information specific to the OS/2 version of Psi.
-Before reading it, please refer to the Readme.txt file that contains
-general information about Psi.
-
-For a list of changes, see the Changes.txt file.
-
-
-Requirements
-------------
-
-1.  Make sure kLIBC 0.6.1 library (libc061.dll) is installed on your system.
-    If not, download it from ftp://ftp.netlabs.org/pub/gcc/libc-0.6.1-csd1.zip
-    and unzip the archive to a directory you plan to install Psi to or to one
-    of the directories listed in your LIBPATH environment variable.
-    
-2.  (Optional) If you want to use anti-aliased fonts in Psi, download and
-    install the InnoTek Font Engine for OS/2.  The direct download link is
-    http://download.innotek.de/ft2lib/InnoTek_FT2LIB_260_Beta1.exe
-
-
-Manual Installation
--------------------
-
-1.  Unzip the Psi archive containing this file to a directory of your
-    choice and run the Psi executable (psi.exe).
-    
-2.  Additionally, you can download a Language Pack for your language using
-    the following link: http://psi-im.org/download.  Follow the on-site
-    instructions in order to install it.
-
-3.  If you want to use the "PM Default Browser/Mail" setting to open links
-    within chat windows, make sure that you have the default PM broser and
-    mail client applications set up correctly.  The easiest way to do this is
-    to use the "Configure Internet Applications" tool from Hobbes
-    (http://hobbes.nmsu.edu/pub/os2/apps/misc/configapps1_1_1.zip).
-
-Please refer to the Trobuleshooting section below for additional information
-on how to resolve problems you may encounter when running Psi for OS/2.
-
-
-Upgrading to a New Vesion
--------------------------
-
-If you are upgrading your installation from a previous version of Psi, please
-always use a clean directory to install the new version to avoid possible file
-conflicts.
-
-Please note that installing a new version to a clean directory will not affect
-your existing personal configuration data (Psi profiles, account settings,
-message history) because it is stored in a separate directory and therefore
-will be preserved.  It is however recommended to make a backup copy of all
-configuration data before starting a new version of Psi for the first time
-(to protect from accidential data loss due to possible changes in formats of
-configuration files).  Refer to the section called "Configuration Data" for
-more details about where this data is stored.
-
-Note that if you want to run two different versions of Psi simultaneously
-(in general, there is no such a need, but just to let you know), you will have
-to create and use a .CMD script that sets the following environment variables
-prior to starting the Psi executable:
-
-    set BEGINLIBPATH=<path_to_Psi_exe>
-    set LIBPATHSTRICT=T
-
-
-Configuration Data
-------------------
-
-Psi stores all configuration files (such as Psi profiles, account settings,
-message history, etc.) in the subdirectory /PsiData of your home directory
-(pointed to by the HOME environment variable).  Note that if the HOME variable
-is invalid or points to a non-existing location, the /PsiData subdirectory
-will be created in the root directory of the boot drive.
-
-The name of the last used Psi profile is stored in the Open32 Registry
-under the key HKEY_CURRENT_USER\Software\Affinix\psi.
-
-The paths and parameters to the default PM browser and mail client applications
-are taken from the HINI_USER_PROFILE\WPURLDEFAULTSETTINGS registry key (stored
-in the X:\OS2\OS2.INI file).
-
-
-Troubleshooting
----------------
-
-This section describes known problems you may encounter when running
-Psi for OS/2, together with possible solutions.
-
-1.  If you have a single-streamed sound card (a card that cannot play
-    more than one sound at a time) and experience problems with sound
-    in Psi (such as 100% CPU load when playing too many sounds
-    simultaneously), try to add the following line to CONFIG.SYS
-    (or to the .CMD script that starts Psi):
-
-        SET QT_PM_NO_SOUND_SHARE=YES
-
-    This will tell the Qt library to open sound devices in the
-    exclusive mode.
-
-
-Current Limitations and Known Bugs
-----------------------------------
-
-1.  PGP encryption is completely untested and probably will not work.
-
-2.  The global hot keys are not available.
-
-3.  Idle (i.e. Auto-Away) detection is only sensitive to mouse movements,
-    meaning that Psi will go away if the mouse is not moved durng the specified
-    amount of time, regardless of whether one presses something on the keyboard
-    or not.  Likewise, using the keyboard will not cancel the Auto-Away state.
-
-4.  The directory watcher service is not available (affects PGP encryption
-    support).
-
-5.  There is no "tray icon" (xCenter widget) for Psi. It will be available
-    later.
-    
-6.  Power management events such as "sleep" or "wakeup" are not detected by Psi.
-
-7.  Drag and Drop support in Qt/OS2 is not yet finished, so there are few
-    known issues (for example, text in entry fields may be corrupted when the
-    drag object is moved over them).
-
-8.  The "Roster window always on top" option is temporarily removed from the
-    options dialog because this functionality is not yet available in Qt/OS2.
-
-9.  DBCS characters can neither be entered nor displayed correctly
-    (current Qt limitation).
-
Index: i/trunk/Readme.txt
===================================================================
--- /psi/trunk/Readme.txt	(revision 189)
+++ 	(revision )
@@ -1,137 +1,0 @@
-Psi/2 0.10.1
---------------------------
-Date: September 26th, 2006
-
-
-What is Psi
------------
-
-Psi is a capable Jabber client aimed at experienced users.  Its design
-goals are simplicity and stability.  Psi is highly portable and runs on
-Windows, OS/2, Unix/X11, and MacOS X.
-
-The interface is very ICQ-like.  Alerts appear in the contact list when
-events are received, and things like subscriptions requests appear as
-"system messages" (ICQ users know these well).  Even "Chats" are
-queued in the contact list.  Also, chats are "remembered" by default,
-so that you don't have to keep a bunch of windows open for each person.
-Just close the chat window.  If you open it again it will all be there.
-
-Psi is minimal but powerful.  There are keybindings for just about
-everything, Unicode is supported throughout, and contacts are cached
-offline.  Security is also a major consideration, and Psi provides it for
-both client-to-server (SSL) and client-to-client (GnuPG).
-
-This program is licensed under the GNU General Public License.  See
-the COPYING file inlcuded in this package for more information.
-
-You can find more information about Psi on the official Psi home page
-at http://psi-im.org.  
-
-
-What is Psi/2
--------------
-
-Psi/2 is a separate development branch of Psi initially created to work on
-a version of Psi for OS/2 and eComStation operating systems.  Why a separate
-branch?  In ealy 2006, original Psi authors decided to discontinue the support
-of the Qt Toolkit Version 3 and ported Psi sources to Qt Version 4.  Psi 0.10
-was the last release based on Qt Version 3.  However, Qt Version 4 is not (yet)
-available for the OS/2 platform, therefore the sources of Psi 0.10 have been
-taken and ported to OS/2.
-
-In the process of porting, several minor Psi bugs were fixed and some few
-bits of new functionality were added.  These changes are unlikely to be applied
-to the current official Psi sources because of the differences in Qt Toolkits
-and because original authors are not interested in supporting the Qt 3 branch.
-
-There are some more improvements planned to the Psi/2 branch.  This branch will
-exist until at least Qt Version 4 for OS/2 becomes available.  Please note that
-Psi/2 is NOT supported by original Psi developers, so don't send them bug
-reports and feature requests.  See below for information about reporting bugs.
-
-In order to clearly distinguish the original Psi application from Psi/2,
-the latter is used as the application name for the Psi/2 branch (including
-the 'Jabber client name and version' string reported to Jabber servers).
-In situations where using the slash character makes problems or even imposible
-(such as file names of distribution archives), 'psios2' is used instead.
-
-Currently, binary Psi/2 packages are distributed only for OS/2 and eComStation
-(a Windows package based on Qt 3 is planned soon).  If you need a version of Psi
-for a different platform, please visit the official Psi home hage mentioned
-above.  There you will find the most recent version of Psi based on the Qt
-Toolkit Version 4.
-
-The Psi/2 home page is located at http://svn.netlabs.org/qtapps/wiki/Psi.
-
-Binary Psi/2 packages can be found at ftp://ftp.netlabs.org/pub/qtapps/psi.
-
-
-Installation
-------------
-
-For installation instructions and other platform-specific details, see the
-Readme-OS2.txt file included in this package.
-
-For a list of changes, see the included Changes.txt file.
-
-
-Bug Reports
------------
-
-To submit a bug report, please visit the Psi/2 home page at
-http://svn.netlabs.org/qtapps/wiki/Psi and create a ticket describing the
-problem.
-
-Note that in order to create tickets or add comments to existing ones, you will
-need to login to the Trac system using a special name and a password specified
-on the start page (http://svn.netlabs.org/qtapps/).
-
-
-Original Psi Authors
---------------------
-
-Thanks to these people for creating one of the best Jabber clients:
-
-Project Lead/Maintainer (2004-current):
-    Kevin Smith
-    kismith@psi-im.org
-    http://www.kismith.co.uk/
-
-Original Author (2001-2004):
-    Justin Karneges
-    justin@affinix.com
-    http://psi-im.org/
-
-
-Credits
--------
-
-Thanks to the following people for contributing to the Psi/2 project:
-
-Ivan Smirnoff
-    www.sampo.ru/~bigvic 
-    OS/2 icon
-
-Juergen Ulbts
-    http://www.juergen-ulbts.de
-    Initial WarpIn scripts
-
-
-Psi/2 Authors
--------------
-
-Project Maintainer:
-    Dmitry A. Kuminov
-    E-Mail: user 'dmik-qt' at domain 'hugaida.com'
-
-
-Copyrights
-----------
-    
-Qt Toolkit Version 3 for OS/2:
-    Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
-    Copyright (C) 2004 Norman ASA.  Initial OS/2 Port.
-    Copyright (C) 2005-2006 netlabs.org.  Further OS/2 Development.
-    http://svn.netlabs.org/qt3
-
Index: i/trunk/TODO
===================================================================
--- /psi/trunk/TODO	(revision 189)
+++ 	(revision )
@@ -1,201 +1,0 @@
-Required
-  File Transfer
-  XML Encryption
-  add status message presets from the statussetdlg
-  Ability to prompt for status message when choosing "Offline" (signoff status)
-  ability to flag accounts as enabled/disabled.  disabled means they are not usable and won't show in roster.
-  groupchat should log presence changes
-  gcuserview: proper sorting of contacts based on status / alphabetical (like ContactView)
-  message events (composing, delivery, etc)
-  misha: JEP-0038: emoticon sets
-  server info:
-    show server version in tooltip
-    ssl information dialog (show cert and maybe connection info)
-  separate message history / info for each account
-  eventQueue: toXml, fromXml (for saving unread messages)
-  local contact settings:
-    checkboxes for accepting various things: messages; files; URLs; chats \
-      [each has a checkbox option: only from my contact list, or... only from this GROUP on my contact list]
-    be alerted when the contact changes status or comes online (etc)
-    option: ignore headline messages (die MSN)
-    annotations (notes about the user)
-    log history or not
-  activity log window
-    high level logging of connection status, presence changes, messages
-    timestamps
-    "find" feature
-  Richtext messages
-  revamp history system: ability to restore entire chats, show in normal order, not reverse
-  "properties" dialog (could be last entry in cvlist context) for setting groups and subscription, etc. \
-    it could also show client time / version
-  file downloading
-    nice dialog
-    after file received, there should be the options: "Open" and "Open folder"
-    put each received file into a folder for the contact (optional)
-    if a specific directory is chosen, the dialog should have a history of the most recent download \
-      folders (10 maybe?)
-  Advanced Alerts (sound, popups, etc)
-  Ignore list
-  plugin system
-
-Important
-  clicking on a chatdlg when bringing focus should always set focus to the input widget (eat the click)
-  'find' feature for chatdlg
-  checkbox to keep eventdlg open (both send and recv).  for send, it should reset the content after sending.
-  statussetdlg should automatically click ok in 10 seconds (unless you press a key)
-  ability to flag which accounts are affected by the mass status change button (should be in account context menu)
-  cv: remember the open/closed state of groups
-  cv: group headings should have a better design than just a rectangle (gradient?)
-  add "Go to Website" and x:oob in presence
-  use arts for sound on unix (or custom, for things like "play")
-  ability to do various iq requests to arbitrary jids:  version, time, info
-  multi-monitor support: windows should pop up on the same display as the main window?
-  "last seen" time for contacts
-  emoticon menu button
-  merge all contacts into one column, rather than dividing by account
-  consolidated contacts
-  send contacts
-  save/load contacts (hint: use QCheckListItem for dialogs)
-    exporting
-      dialog for selecting contacts to export to file
-      write to file
-    importing
-      import a list from file
-      dialog for selecting contacts to import
-      tell the server about the new contacts
-      check for dups
-  offline animation (door slam)
-  chathistorydlg
-    a nice window to display chat history
-    maybe a menubar with some features like "save to file" ?
-    show/hide times
-    show/hide/rename other person (for privacy)
-  WM dock
-  floating contacts (controlled by cvlist?)
-  full message archive dialog (tree/explorer view for choosing contacts on left, display area on the right).
-  Update all (mass user info check)
-  Detecting network connection status.  option to auto-connect when network is available.
-  startup argument to select profile
-  ability to execute a shell command on event
-  option to display (in realtime) the cvlist as 'flat', ie without groups
-  voice chat
-  option to launch on startup (platform dependent, good luck)
-  different color choices for different group types
-  transport-specific roster icons
-  deal with presence errors when subscribing
-  command line args?  psi.exe --psi-data dir
-  have separate status presets depending on the status type
-
-Extra
-  there should be a way to copy a url to clipboard from the eventdlg attachment
-  ability to flag a contact or group to always be shown even if they would not be (due to visibility toggles)
-  how about adding "Add Contact", "New Blank Message", "Manage services" and "Join Groupchat" to the cv \
-    rightclick menu for each of the servers?
-  allow eventdlg and chatdlg inputs to drag / drop URLs (in both directions)
-  chatdlg separator:  "snap" to font height?
-  transport iconsets (misha?)
-  translation packs for the Qt library itself??
-  check to see if app is already running when launched.  if it is, then:
-    ask if they really want to open it again
-    if they say yes, then disable auto-open for profiles
-  save presence changes to history?
-  win32: docking (all optional)
-    grapple to edge of screen, like ICQ for windows
-    auto hide: after a certain period of inactivity, "slide" the window off the screen
-    auto hide delay: time to wait before sliding off
-  right-click in chat/eventdlg should have options to paste your current URL or IP address
-  Avatars (Buddy Icons)
-  KDE-enhanced mode
-  "previous" button in the eventdlg?
-  Autoresponses?  (with general and customized texts)
-  auto close chat windows that are not in focus after so many minutes of inactivity
-  The Main Window's Icon should change when new messages arrive, just like the dock icon does.
-  Ability to filter messages based on words (maybe even shell command filters)
-  Ability to compose messages and send at a later specific date (or when you or the recipient go online)
-  option to autohide main roster window after a set period of time
-  supporting BOLD and ITALIC in jabber msges by using * and / like you do in newsgroups ..
-  Licq supports replacing some %<letter>s with information on the sender of the
-    message and other things. (There's a list below) IT supports these in
-    OnEvent, auto responses (check status), and utilities
-    For example: sound player "~/scripts/say", on message "%a has just sent you an I.C.Q. message"
-      %a - user alias
-      %e - email
-      %f - first name
-      %h - phone number
-      %i - user ip
-      %l - last name
-      %m - # pending messages
-      %n - full name
-      %o - last seen online
-      %O - online since
-      %p - user port
-      %s - full status
-      %S - abbreviated status
-      %u - uin
-      %w - webpage
-  Ability to specify an arbitrary time for chatdlgs to stay active (x minutes/hours/days)
-  "small mode" - put mainwin buttons (and toolbuttons) into the cvlist right-click
-  option to have sounds not play when XA (but still play when Away)
-  option to have mainwin/dock status follow a specific account rather than "best choice"
-  option to show status message in parenthesis to the right of the contact (like yahoo)
-  ability to "auto-reconnect" to a transport?
-  cv: let the user choose how the list is sorted
-  Spell check
-  pictures for users
-  group ideas:
-    option: sort or not
-    choose order of groups and contacts with drag and drop
-    save order on the server
-    support empty groups that get removed on signoff
-  Have a way of marking some people as 'important' contacts, so they will always trigger sound
-  psuedo-chat support like Mirabilis ICQ / Licq (ie, split window, but still used like normal messages)
-  friendlier infodlg.  get rid of those lame tabs
-  maybe an XML-based skins support (not only colors, sounds, images, key \
-    bindings, but also window positions, shapes, etc) \
-    Microsoft Windows Media Player supports XML-based skinning.  Basically \
-    this consists of a file which has a bunch of JavaScript glueing the \
-    entire skin together with code, and several images for hilite graphics, \
-    background graphics, alpha-map graphics, etc.  Very flexible. \
-    Justin's opinion:  if you want to fork Psi to do this, be my guest..
-  cvlist sorting options
-    sort by group, online/offline split
-    sort by group, online/offline together
-    sort by group and by status
-    sort by group and alphanumerically
-    sort by status without groups
-    sort alphanumerically without groups
-      sort by online/offline
-      straight alphanumerical sort
-  chatdlg: optionally tabbed like GAIM?
-  cvlist select multiple?
-  right-clicking on status button should bring up a list of accounts, each with submenus that would set \
-    the status of the chosen account.
-  option to have psi remember your password for the running session
-  Remember last status when psi quits (even if improperly shut down).  restore this status when psi is run again?
-  if you get a msg from someone in a closed group, it should not expand the whole group
-  "diskless" mode
-
-Bugs
-  connection timeouts are reported as "connection refused" (qt)
-  slowdown when receiving a chat message?  or a problem with QTextEdit debug messages?
-
-Miscellaneous
-  change PsiIconSet::type2anim() to be const (and return const)
-  properly sort cvlist accounts if one of them gets renamed
-  class Options: cpp'ify (reset, toXml, fromXml)
-  convert some of the preferences into their own classes (or lists), like fonts, colors, sounds, etc
-  field for author/license information in lang packs (display in About box)
-  'find' function in historydlg should show the found result in the center of 50 results, rather than the top
-  Check for libqssl without needing a restart?
-  finish jidlink and formalize the linktest process (<linktest xmlns="adsfasd"/>)
-  replies should only close a window that it is associated with (use QGuardedPtr?)
-  custombrowser, mailer, and sound player should be called as a shell command, not arg0
-  don't allow send/recv of blank messages (all content is whitespace or empty)
-  allow blank password entry
-  don't prompt for password until actually connected.  reprompt if wrong??
-  iconset: universal anim support (so eventdlg / mainwin / contactview can share) (misha?)
-  proper dialog button order depending on platform
-  when entering a text string into "Server to browse", any whitespace before or after is not trimmed.  lots of \
-    fields like this should have some sort of auto-trim.
-  when opening a new chat window of a contact with pending events, the presence is logged to the chat window \
-    before the messages are, which have an earlier timestamp (looks weird)
Index: i/trunk/build-mac.txt
===================================================================
--- /psi/trunk/build-mac.txt	(revision 189)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Building Psi on Mac OS X
-------------------------
-
-To simply compile Psi, the same instructions apply as for other *nix 
-platforms:
-1. First, configure the build using the 'configure' script, optionally
-   adding parameters to specify where to find certain dependencies:
-	./configure
-2. Build the binary:
-	make
-After this, the built binary 'psi.app' will be available in src/.
-
-To make a distributable copy of your binary, do the following:
-1. As above, use configure to configure the build
-2. Alter the first lines of 'mac/Makefile' to reflect your setting
-3. Run 'make -C mac/'. 
-   This will create a distributable binary 'Psi.app' in 'mac/disk/'.
-4. (OPTIONAL) Create a DMG image by running 'make -C mac/ dmg'. 
-   This will create a 'Psi-<VERSION>.dmg' file in 'mac/'.
-   You can create your own DMG template to make the resulting DMG
-   look different. For more instructions on this, see 'mac/Makefile'.
Index: i/trunk/build-win.txt
===================================================================
--- /psi/trunk/build-win.txt	(revision 189)
+++ 	(revision )
@@ -1,13 +1,0 @@
-Building Psi on Windows
------------------------
-
-With MSVC++ 6.0:
-
-* Go to a command prompt where Psi is unpacked, and type:
-
-  makewin
-
-  The result will be placed in the 'psiwin' folder.
-
-* Zip and enjoy.
-
Index: i/trunk/conf_os2.pri
===================================================================
--- /psi/trunk/conf_os2.pri	(revision 189)
+++ 	(revision )
@@ -1,8 +1,0 @@
-# OS/2 build parameters
-# Change these variables to reflect your environment
-
-# QCA
-QCA_PATH = ../../qca
-DEPENDPATH += $$QCA_PATH/src
-INCLUDEPATH += $$QCA_PATH/src
-LIBS += $$QCA_PATH/qca$$OS/qca.lib
Index: i/trunk/conf_win32.pri
===================================================================
--- /psi/trunk/conf_win32.pri	(revision 189)
+++ 	(revision )
@@ -1,8 +1,0 @@
-# Win32 build parameters
-# Change these variables to reflect your environment
-
-# QCA
-QCA_PATH = ../../qca
-DEPENDPATH += $$QCA_PATH/src
-INCLUDEPATH += $$QCA_PATH/src
-LIBS += $$QCA_PATH/qca$$OS/qca.lib
Index: i/trunk/configure
===================================================================
--- /psi/trunk/configure	(revision 189)
+++ 	(revision )
@@ -1,1301 +1,0 @@
-#!/bin/sh
-#
-# Generated by qconf 1.2-CVS ( http://delta.affinix.com/qconf/ )
-#
-
-show_usage() {
-cat <<EOT
-Usage: $0 [OPTION]...
-
-This script creates necessary configuration files to build/install.
-
-Main options:
-  --prefix=[path]     Base path for build/install.  Default: /usr/local
-  --bindir=[path]     Directory for binaries.  Default: PREFIX/bin
-  --datadir=[path]    Directory for data.  Default: PREFIX/share
-  --qtdir=[path]      Directory where Qt is installed.
-  --debug             Enable debug output.
-  --help              This help text.
-
-Dependency options:
-  --with-qca-inc=[path]     Path to QCA include files
-  --with-qca-lib=[path]     Path to QCA library files
-  --with-zlib-inc=[path]    Path to zlib include files
-  --with-zlib-lib=[path]    Path to zlib library files
-  --disable-growl           Disable use of Growl
-  --with-growl=[path]       Path to the Growl framework
-  --disable-xss             Disable use of the XScreenSaver extension
-  --disable-dnotify         Disable use of Linux Directory Notification
-  --disable-ghbnr           Disable use of gethostbyname_r()
-
-EOT
-}
-
-# which/make detection adapted from Qt
-which_command() {
-	OLD_HOME=$HOME
-	HOME=/dev/null
-	export HOME
-
-	WHICH=`which which 2>/dev/null`
-	if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
-		WHICH=which
-	elif [ -z "$WHICH" ]; then
-		if which which >/dev/null 2>&1; then
-			WHICH=which
-		else
-			for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
-				if [ -x $a/which ]; then
-					WHICH=$a/which
-					break;
-				fi
-			done
-		fi
-	fi
-
-	if [ -z "$WHICH" ]; then
-		OLD_IFS=$IFS
-		IFS=:
-		for a in $PATH; do
-			if [ -x $a/$1 ]; then
-				echo "$a/$1"
-				IFS=$OLD_IFS
-				export IFS
-				HOME=$OLD_HOME
-				export HOME
-				return 0
-			fi
-		done
-		IFS=$OLD_IFS
-		export IFS
-	else
-		a=`"$WHICH" "$1" 2>/dev/null`
-		if [ ! -z "$a" -a -x "$a" ]; then
-			echo "$a"
-			HOME=$OLD_HOME
-			export HOME
-			return 0
-		fi
-	fi
-	HOME=$OLD_HOME
-	export HOME
-	return 1
-}
-WHICH=which_command
-
-# find a make command
-if [ -z "$MAKE" ]; then
-	MAKE=
-	for mk in gmake make; do
-		if $WHICH $mk >/dev/null 2>&1; then
-			MAKE=`$WHICH $mk`
-			break
-		fi
-	done
-	if [ -z "$MAKE" ]; then
-		echo "You don't seem to have 'make' or 'gmake' in your PATH."
-		echo "Cannot proceed."
-		exit 1
-	fi
-fi
-
-show_qt_info() {
-	printf "Be sure you have a proper Qt 4.0 build environment set up.  This means not\n"
-	printf "just Qt, but also a C++ compiler, a make tool, and any other packages\n"
-	printf "necessary for compiling C++ programs.\n"
-	printf "\n"
-	printf "If you are certain everything is installed, then it could be that Qt 4 is not\n"
-	printf "being recognized or that a different version of Qt is being detected by\n"
-	printf "mistake (for example, this could happen if \$QTDIR is pointing to a Qt 3\n"
-	printf "installation).  At least one of the following conditions must be satisfied:\n"
-	printf "\n"
-	printf " 1) --qtdir is set to the location of Qt\n"
-	printf " 2) \$QTDIR is set to the location of Qt\n"
-	printf " 3) QtCore is in the pkg-config database\n"
-	printf " 4) qmake is in the \$PATH\n"
-	printf "\n"
-	printf "This script will use the first one it finds to be true, checked in the above\n"
-	printf "order.  #3 and #4 are the recommended options.  #1 and #2 are mainly for\n"
-	printf "overriding the system configuration.\n"
-	printf "\n"
-}
-
-while [ $# -gt 0 ]; do
-	case "$1" in
-		--prefix=*)
-			PREFIX="${1#--prefix=}"
-			shift
-			;;
-
-		--bindir=*)
-			BINDIR="${1#--bindir=}"
-			shift
-			;;
-
-		--datadir=*)
-			DATADIR="${1#--datadir=}"
-			shift
-			;;
-
-		--qtdir=*)
-			EX_QTDIR="${1#--qtdir=}"
-			shift
-			;;
-
-		--with-qca-inc=*)
-			QC_WITH_QCA_INC="${1#--with-qca-inc=}"
-			shift
-			;;
-
-		--with-qca-lib=*)
-			QC_WITH_QCA_LIB="${1#--with-qca-lib=}"
-			shift
-			;;
-
-		--with-zlib-inc=*)
-			QC_WITH_ZLIB_INC="${1#--with-zlib-inc=}"
-			shift
-			;;
-
-		--with-zlib-lib=*)
-			QC_WITH_ZLIB_LIB="${1#--with-zlib-lib=}"
-			shift
-			;;
-
-		--disable-growl)
-			QC_DISABLE_growl="Y"
-			shift
-			;;
-
-		--with-growl=*)
-			QC_WITH_GROWL="${1#--with-growl=}"
-			shift
-			;;
-
-		--disable-xss)
-			QC_DISABLE_xss="Y"
-			shift
-			;;
-
-		--disable-dnotify)
-			QC_DISABLE_dnotify="Y"
-			shift
-			;;
-
-		--disable-ghbnr)
-			QC_DISABLE_ghbnr="Y"
-			shift
-			;;
-
-		--debug)
-			QC_DEBUG="Y"
-			shift
-			;;
-		--help) show_usage; exit ;;
-		*) show_usage; exit ;;
-	esac
-done
-
-PREFIX=${PREFIX:-/usr/local}
-BINDIR=${BINDIR:-$PREFIX/bin}
-DATADIR=${DATADIR:-$PREFIX/share}
-
-echo "Configuring Psi ..."
-
-if [ "$QC_DEBUG" = "Y" ]; then
-echo
-echo PREFIX=$PREFIX
-echo BINDIR=$BINDIR
-echo DATADIR=$DATADIR
-echo EX_QTDIR=$EX_QTDIR
-echo QC_WITH_QCA_INC=$QC_WITH_QCA_INC
-echo QC_WITH_QCA_LIB=$QC_WITH_QCA_LIB
-echo QC_WITH_ZLIB_INC=$QC_WITH_ZLIB_INC
-echo QC_WITH_ZLIB_LIB=$QC_WITH_ZLIB_LIB
-echo QC_DISABLE_growl=$QC_DISABLE_growl
-echo QC_WITH_GROWL=$QC_WITH_GROWL
-echo QC_DISABLE_xss=$QC_DISABLE_xss
-echo QC_DISABLE_dnotify=$QC_DISABLE_dnotify
-echo QC_DISABLE_ghbnr=$QC_DISABLE_ghbnr
-echo
-fi
-
-printf "Verifying Qt 3.x Multithreaded (MT) build environment ... "
-
-if [ -z "$QTDIR" ]; then
-	if [ "$QC_DEBUG" = "Y" ]; then
-		echo \$QTDIR not set... trying to find Qt manually
-	fi
-	for p in /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
-		if [ -d "$p/mkspecs" ]; then
-			QTDIR=$p
-			break;
-		fi;
-	done
-	if [ -z "$QTDIR" ]; then
-		echo fail
-		echo
-		echo "Unable to find Qt 'mkspecs'.  Perhaps you need to"
-		echo "install the Qt 3 development utilities.  You may download"
-		echo "them either from the vendor of your operating system"
-		echo "or from http://www.trolltech.com/"
-		echo
-		echo "If you're sure you have the Qt development utilities"
-		echo "installed, you might try using the --qtdir option."
-		echo
-		exit 1;
-	fi
-	if [ ! -x "$QTDIR/bin/moc" ]; then
-		m=`which moc 2>/dev/null`
-		if [ ! -x "$m" ]; then
-			echo fail
-			echo
-			echo "We found Qt in $QTDIR, but we were unable to locate"
-			echo "the moc utility.  It was not found in $QTDIR/bin"
-			echo "nor in PATH.  This seems to be a very unusual setup."
-			echo "You might try using the --qtdir option."
-			echo
-			exit 1;
-		fi
-		qtpre=`echo $m | awk '{ n = index($0, "/bin/moc"); if (!n) { exit 1; } print substr($0, 0, n-1); exit 0; }' 2>/dev/null`
-		ret="$?"
-		if [ "$ret" != "0" ]; then
-			echo fail
-			echo
-			echo "We found Qt in $QTDIR, but the location of moc"
-			echo "($m) is not suitable for use with this build system."
-			echo "This is a VERY unusual and likely-broken setup.  You"
-			echo "should contact the maintainer of your Qt package."
-			echo
-			exit 1;
-		fi
-		QTDIR=$qtpre
-	fi
-fi
-
-if [ ! -x "$QTDIR/bin/qmake" ]; then
-	if [ "$QC_DEBUG" = "Y" ]; then
-		echo Warning: qmake not in \$QTDIR/bin/qmake
-		echo trying to find it in \$PATH
-	fi
-	qm=`which qmake 2>/dev/null`
-	if [ -x "$qm" ]; then
-		if [ "$QC_DEBUG" = "Y" ]; then
-			echo qmake found in $qm
-		fi
-	else
-		echo fail
-		echo
-		echo Sorry, you seem to have a very unusual setup,
-		echo or I missdetected \$QTDIR=$QTDIR
-		echo
-		echo Please set \$QTDIR manually and make sure that
-		echo \$QTDIR/bin/qmake exists.
-		echo
-		exit 1;
-	fi
-else
-	qm=$QTDIR/bin/qmake
-fi
-
-gen_files() {
-cat >$1/modules.cpp <<EOT
-#line 1 "qt31.qcm"
-/*
------BEGIN QCMOD-----
-name: Qt >= 3.1
------END QCMOD-----
-*/
-class qc_qt31 : public ConfObj
-{
-public:
-	qc_qt31(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 3.1"; }
-	QString shortname() const { return "qt31"; }
-	bool exec()
-	{
-		if(QT_VERSION >= 0x030100) {
-			if(QT_VERSION < 0x030300)
-				conf->addExtra("QXML_STATIC = Y");
-			return true;
-		}
-		else
-			return false;
-	}
-};
-#line 1 "qca.qcm"
-/*
------BEGIN QCMOD-----
-name: QCA 1.0
-arg: with-qca-inc=[path],Path to QCA include files
-arg: with-qca-lib=[path],Path to QCA library files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_qca
-//----------------------------------------------------------------------------
-class qc_qca : public ConfObj
-{
-public:
-	qc_qca(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QCA 1.0"; }
-	QString shortname() const { return "qca"; }
-	bool exec()
-	{
-		QString inc, lib;
-		QString s;
-
-		s = conf->getenv("QC_WITH_QCA_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "qca.h"))
-				return false;
-			inc = s;
-		}
-		else {
-			if(!conf->findHeader("qca.h", QStringList(), &s))
-				return false;
-			inc = s;
-		}
-
-		s = conf->getenv("QC_WITH_QCA_LIB");
-		if(!s.isEmpty()) {
-			if(!conf->checkLibrary(s, "qca"))
-				return false;
-			lib = s;
-		}
-		else {
-			if(!conf->findLibrary("qca", &s))
-				return false;
-			lib = s;
-		}
-
-		if(!inc.isEmpty())
-			conf->addIncludePath(inc);
-		if(!lib.isEmpty())
-			conf->addLib(QString("-L") + s);
-		conf->addLib("-lqca");
-
-		return true;
-	}
-};
-#line 1 "zlib.qcm"
-/*
------BEGIN QCMOD-----
-name: zlib
-arg: with-zlib-inc=[path],Path to zlib include files
-arg: with-zlib-lib=[path],Path to zlib library files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_zlib
-//----------------------------------------------------------------------------
-class qc_zlib : public ConfObj
-{
-public:
-	qc_zlib(Conf *c) : ConfObj(c) {}
-	QString name() const { return "zlib"; }
-	QString shortname() const { return "zlib"; }
-	bool exec()
-	{
-		QString inc, lib;
-		QString s;
-
-		s = conf->getenv("QC_WITH_ZLIB_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "zlib.h"))
-				return false;
-			inc = s;
-		}
-		else {
-			if(!conf->findHeader("zlib.h", QStringList(), &s))
-				return false;
-			inc = s;
-		}
-
-		s = conf->getenv("QC_WITH_ZLIB_LIB");
-		if(!s.isEmpty()) {
-			if(!conf->checkLibrary(s, "z"))
-				return false;
-			lib = s;
-		}
-		else {
-			if(!conf->findLibrary("z", &s))
-				return false;
-			lib = s;
-		}
-
-		if(!inc.isEmpty())
-			conf->addIncludePath(inc);
-		if(!lib.isEmpty())
-			conf->addLib(QString("-L") + s);
-		conf->addLib("-lz");
-
-		return true;
-	}
-};
-#line 1 "growl.qcm"
-/*
------BEGIN QCMOD-----
-name: Growl
-arg: with-growl=[path],Path to the Growl framework
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_growl
-//----------------------------------------------------------------------------
-class qc_growl : public ConfObj
-{
-public:
-	qc_growl(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Growl"; }
-	QString shortname() const { return "growl"; }
-
-	// TODO: This should go into ConfObj
-    bool checkFramework(const QString &path, const QString &name)
-    {
-        QString str =
-            "int main()\n"
-            "{\n"
-            "    return 0;\n"
-            "}\n";
-
-        QString extra;
-        if(!path.isEmpty())
-            extra += QString("-F") + path + ' ';
-        extra += QString("-framework ") + name;
-        if(!conf->doCompileAndLink(str, extra))
-            return false;
-        return true;
-    }
-	
-	// TODO: This should go into ConfObj
-	void addFrameworkPath(const QString& str)
-	{
-		conf->addExtra("QMAKE_CXXFLAGS += -F" + str);
-		conf->addLib("-F" + str);
-	}
-
-	bool exec()
-	{
-#ifdef Q_WS_MAC
-		QString growl_path = conf->getenv("QC_WITH_GROWL");
-		if(!checkFramework(growl_path, "Growl"))
-			return false;
-
-		if(!growl_path.isEmpty()) 
-			addFrameworkPath(growl_path);
-		conf->addLib("-framework Growl");
-		conf->addDefine("HAVE_GROWL");
-
-		return true;
-#else
-		return false;
-#endif
-	}
-};
-#line 1 "xss.qcm"
-/*
------BEGIN QCMOD-----
-name: the XScreenSaver extension
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_xss
-//----------------------------------------------------------------------------
-class qc_xss : public ConfObj
-{
-public:
-	enum { OK, NEEDLIB, FAIL };
-	qc_xss(Conf *c) : ConfObj(c)
-	{
-	}
-
-	~qc_xss()
-	{
-		remove("xssprobe_test.c");
-		remove("xssprobe_test.o");
-		remove("xssprobe_test");
-	}
-
-	QString name() const
-	{
-		return "the XScreenSaver extension";
-	}
-
-	QString shortname() const { return "xss"; }
-
-	int do_write()
-	{
-		char *xsstest =
-			"#include<X11/Xlib.h>\n"
-			"#include<X11/Xutil.h>\n"
-			"#include<X11/extensions/scrnsaver.h>\n"
-			"\n"
-			"int main()\n"
-			"{\n"
-			"    XScreenSaverQueryExtension(NULL, NULL, NULL);\n"
-			"    return 0;\n"
-			"}\n";
-
-		FILE *f;
-		f = fopen("xssprobe_test.c", "w");
-		if(!f)
-			return 0;
-		fwrite(xsstest, strlen(xsstest), 1, f);
-		fclose(f);
-
-		return 1;
-	}
-
-	int do_compile()
-	{
-		QString inc = conf->expandIncludes(conf->qvar("QMAKE_INCDIR_X11"));
-		QString str = conf->qvar("QMAKE_CC") + " -c " + inc + " xssprobe_test.c -o xssprobe_test.o";
-		int r = conf->doCommand(str);
-		if(r == 0)
-			return 1;
-		else
-			return 0;
-	}
-
-	int do_link()
-	{
-		QString lib = conf->expandLibs(conf->qvar("QMAKE_LIBDIR_X11"));
-		QString inc = conf->expandIncludes(conf->qvar("QMAKE_INCDIR_X11"));
-		QString str = conf->qvar("QMAKE_CC") + " xssprobe_test.o -o xssprobe_test " + lib + ' ' + conf->qvar("QMAKE_LIBS_X11");
-		int r = conf->doCommand(str);
-		if(r == 0)
-			return 1;
-		else
-			return 0;
-	}
-
-	int do_linkLib()
-	{
-		QString lib = conf->expandLibs(conf->qvar("QMAKE_LIBDIR_X11"));
-		QString inc = conf->expandIncludes(conf->qvar("QMAKE_INCDIR_X11"));
-		QString str = conf->qvar("QMAKE_CC") + " xssprobe_test.o -o xssprobe_test " + lib + ' ' + conf->qvar("QMAKE_LIBS_X11") + " -lXss";
-		int r = conf->doCommand(str);
-		if(r == 0)
-			return 1;
-		else
-			return 0;
-	}
-
-	int do_all()
-	{
-		if(!do_write())
-			return FAIL;
-		if(!do_compile())
-			return FAIL;
-		if(do_link())
-			return OK;
-		if(do_linkLib())
-			return NEEDLIB;
-		return FAIL;
-	}
-
-	bool exec()
-	{
-		int r = do_all();
-		if(r == OK) {
-			conf->addDefine("HAVE_XSS");
-			return true;
-		}
-		else if(r == NEEDLIB) {
-			conf->addDefine("HAVE_XSS");
-			conf->addLib("-lXss");
-			return true;
-		}
-	}
-};
-#line 1 "dnotify.qcm"
-/*
------BEGIN QCMOD-----
-name: Linux Directory Notification
------END QCMOD-----
-*/
-
-#include<unistd.h>
-#include<fcntl.h>
-#include<signal.h>
-#include<sys/utsname.h>
-
-//----------------------------------------------------------------------------
-// qc_dnotify
-//----------------------------------------------------------------------------
-class qc_dnotify : public ConfObj
-{
-public:
-	qc_dnotify(Conf *c) : ConfObj(c)
-	{
-	}
-
-	~qc_dnotify()
-	{
-		remove("ftest.c");
-		remove("ftest.o");
-	}
-
-	QString name() const { return "Linux Directory Notification"; }
-	QString shortname() const { return "dnotify"; }
-
-	bool do_write()
-	{
-		char *fdata =
-			"#define _GNU_SOURCE\n"
-			"#include<unistd.h>\n"
-			"#include<fcntl.h>\n"
-			"#include<signal.h>\n"
-			"#include<sys/utsname.h>\n"
-			"\n"
-			"int main()\n"
-			"{\n"
-			"    DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT|DN_MODIFY|DN_ATTRIB;\n"
-			"    return 0;\n"
-			"}\n";
-
-		FILE *f;
-		f = fopen("ftest.c", "w");
-		if(!f)
-			return false;
-		fwrite(fdata, strlen(fdata), 1, f);
-		fclose(f);
-
-		return true;
-	}
-
-	bool do_compile()
-	{
-		QString str = conf->qvar("QMAKE_CC") + " -c ftest.c -o ftest.o";
-		int r = conf->doCommand(str);
-		if(r == 0)
-			return true;
-		else
-			return false;
-	}
-
-	bool exec()
-	{
-		// taken from KDE
-		bool supports_dnotify = true; // not guilty until proven guilty
-		struct utsname uts;
-		int major, minor, patch;
-		if(uname(&uts) < 0)
-			supports_dnotify = false; // *shrug*
-		else if(sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3)
-			supports_dnotify = false; // *shrug*
-		else if( major * 1000000 + minor * 1000 + patch < 2004019 ) // <2.4.19
-			supports_dnotify = false;
-		if(!supports_dnotify)
-			return false;
-
-		if(!do_write())
-			return false;
-		if(!do_compile())
-			return false;
-
-		conf->addDefine("HAVE_DNOTIFY");
-		return true;
-	}
-};
-#line 1 "ghbnr.qcm"
-/*
------BEGIN QCMOD-----
-name: gethostbyname_r()
------END QCMOD-----
-*/
-class qc_ghbnr : public ConfObj
-{
-public:
-	qc_ghbnr(Conf *c) : ConfObj(c)
-	{
-	}
-
-	~qc_ghbnr()
-	{
-		remove("ftest.c");
-		remove("ftest");
-	}
-
-	QString name() const { return "gethostbyname_r()"; }
-	QString shortname() const { return "ghbnr"; }
-
-	bool exec()
-	{
-		char *fdata =
-			"#include<netdb.h>\n"
-			"\n"
-			"int main()\n"
-			"{\n"
-			"    gethostbyname_r(\"\", 0, 0, 0, 0, 0);\n"
-			"    return 0;\n"
-			"}\n";
-
-		FILE *f;
-		f = fopen("ftest.c", "w");	
-		if(!f)
-			return false;
-		fwrite(fdata, strlen(fdata), 1, f);
-		fclose(f);
-
-		QString str = conf->qvar("QMAKE_CC") + " ftest.c -o ftest";
-		int r = conf->doCommand(str);
-		if(r == 0) {
-			conf->addDefine("HAVE_GETHOSTBYNAME_R");
-			return true;
-		}
-		else
-			return false;
-	}
-};
-#line 1 "conf.qcm"
-/*
------BEGIN QCMOD-----
-name: Psi Configuration
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_conf
-//----------------------------------------------------------------------------
-class qc_conf : public ConfObj
-{
-public:
-	qc_conf(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Psi Configuration"; }
-	QString shortname() const { return "conf"; }
-	QString checkString() const { return "Writing configuration ..."; }
-	bool exec()
-	{
-		conf->addExtra(QString("PREFIX=%1").arg(conf->getenv("PREFIX")));
-		conf->addExtra(QString("DATADIR=%1/psi").arg(conf->getenv("DATADIR")));
-
-		QFile file("src/config.h");
-		if ( file.open( IO_WriteOnly ) ) {
-			QTextStream stream( &file );
-			stream << "#define PSI_DATADIR \"" << conf->getenv("DATADIR") << "/psi\"" << endl;
-		}
-		
-		conf->addDefine("HAVE_CONFIG");
-		
-		return true;
-	}
-};
-
-EOT
-cat >$1/modules_new.cpp <<EOT
-    o = new qc_qt31(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_qca(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_zlib(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_growl(conf);
-    o->required = false;
-    o->disabled = false;
-    o = new qc_xss(conf);
-    o->required = false;
-    o->disabled = false;
-    o = new qc_dnotify(conf);
-    o->required = false;
-    o->disabled = false;
-    o = new qc_ghbnr(conf);
-    o->required = false;
-    o->disabled = false;
-    o = new qc_conf(conf);
-    o->required = true;
-    o->disabled = false;
-
-EOT
-cat >$1/conf.h <<EOT
-
-EOT
-cat >$1/conf.cpp <<EOT
-#include<stdio.h>
-#include<stdlib.h>
-#include<qstring.h>
-#include<qdict.h>
-#include<qptrlist.h>
-#include<qfileinfo.h>
-#include<qfile.h>
-#include<qdir.h>
-#include<qstringlist.h>
-#include<qobject.h>
-
-class MocTestObject : public QObject
-{
-	Q_OBJECT
-public:
-	MocTestObject() {}
-};
-
-class Conf;
-
-class ConfObj
-{
-public:
-	ConfObj(Conf *c);
-	virtual ~ConfObj();
-
-	virtual QString name() const=0;
-	virtual QString shortname() const=0;
-	virtual QString checkString() const;
-	virtual QString resultString() const;
-	virtual bool exec()=0;
-
-	Conf *conf;
-	bool required;
-	bool disabled;
-};
-
-typedef QPtrList<ConfObj> ConfObjList;
-typedef QPtrListIterator<ConfObj> ConfObjListIt;
-
-class Conf
-{
-public:
-	Conf() : vars(17)
-	{
-		list.setAutoDelete(true);
-		vars.setAutoDelete(true);
-
-		vars.insert("QMAKE_INCDIR_X11", new QString(X11_INC));
-		vars.insert("QMAKE_LIBDIR_X11", new QString(X11_LIBDIR));
-		vars.insert("QMAKE_LIBS_X11",   new QString(X11_LIB));
-		vars.insert("QMAKE_CC",         new QString(CC));
-		vars.insert("QMAKE_CXX",        new QString(CXX));
-
-		do_debug = false;
-		done_debug = false;
-	}
-
-	~Conf()
-	{
-	}
-
-	void added(ConfObj *o)
-	{
-		list.append(o);
-	}
-
-	QString getenv(const QString &var)
-	{
-		char *p = ::getenv(var.latin1());
-		if(!p)
-			return QString::null;
-		return QString(p);
-	}
-
-	void debug(const QString &s)
-	{
-		if(do_debug) {
-			if(!done_debug)
-				printf("\n");
-			done_debug = true;
-			printf(" * %s\n", s.latin1());
-		}
-	}
-
-	bool exec()
-	{
-		if(getenv("QC_DEBUG") == "Y")
-			do_debug = true;
-
-		ConfObjListIt it(list);
-		for(ConfObj *o; (o = it.current()); ++it) {
-			// if this was a disabled-by-default option, check if it was enabled
-			if(o->disabled) {
-				QString v = QString("QC_ENABLE_") + o->shortname();
-				if(getenv(v) != "Y")
-					continue;
-			}
-			// and the opposite?
-			else {
-				QString v = QString("QC_DISABLE_") + o->shortname();
-				if(getenv(v) == "Y")
-					continue;
-			}
-
-			QString check = o->checkString();
-			if(check.isEmpty())
-				check = QString("Checking for %1 ...").arg(o->name());
-			printf("%s", check.latin1());
-			fflush(stdout);
-
-			done_debug = false;
-			bool ok = o->exec();
-
-			QString result = o->resultString();
-			if(result.isEmpty()) {
-				if(ok)
-					result = "yes";
-				else
-					result = "no";
-			}
-			if(done_debug)
-				printf(" -> %s\n", result.latin1());
-			else
-				printf(" %s\n", result.latin1());
-
-			if(!ok && o->required) {
-				printf("\nError: need %s!\n", o->name().latin1());
-				return false;
-			}
-		}
-		return true;
-	}
-
-	const QString & qvar(const QString &s)
-	{
-		QString *p = vars.find(s);
-		if(p)
-			return *p;
-		else
-			return blank;
-	}
-
-	QString expandIncludes(const QString &inc)
-	{
-		return QString("-I") + inc;
-	}
-
-	QString expandLibs(const QString &lib)
-	{
-		return QString("-L") + lib;
-	}
-
-	int doCommand(const QString &s)
-	{
-		debug(QString("[%1]").arg(s));
-		QString fullcmd;
-		if(do_debug)
-			fullcmd = s;
-		else
-			fullcmd = s + " 1>/dev/null 2>/dev/null";
-		int r = system(fullcmd.latin1());
-		debug(QString("returned: %1").arg(r));
-		return r;
-	}
-
-	bool doCompileAndLink(const QString &filedata, const QString &flags, int *retcode=0)
-	{
-		QDir dir(".");
-		QString fname = "atest.c";
-		QString out = "atest";
-		QFile f(fname);
-		QCString cs = filedata.latin1();
-		if(!f.open(IO_WriteOnly | IO_Truncate)) {
-			debug("unable to open atest.c for writing");
-			return false;
-		}
-		if(f.writeBlock(cs.data(), cs.length()) == -1) {
-			debug("error writing to atest.c");
-			return false;
-		}
-		f.close();
-
-		debug(QString("Wrote atest.c:\n%1").arg(filedata));
-
-		QString str = qvar("QMAKE_CXX") + ' ' + fname + " -o " + out;
-		if(!flags.isEmpty()) {
-			str += ' ';
-			str += flags;
-		}
-
-		int r = doCommand(str);
-		if(r == 0 && retcode)
-			*retcode = doCommand(QString("./") + out);
-		dir.remove(fname);
-		dir.remove(out);
-		if(r != 0)
-			return false;
-		return true;
-	}
-
-	bool checkHeader(const QString &path, const QString &h)
-	{
-		QFileInfo fi(path + '/' + h);
-		if(fi.exists())
-			return true;
-		return false;
-	}
-
-	bool findHeader(const QString &h, const QStringList &ext, QString *inc)
-	{
-		if(checkHeader("/usr/include", h)) {
-			*inc = "";
-			return true;
-		}
-		QStringList dirs;
-		dirs += "/usr/local/include";
-		dirs += ext;
-		for(QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) {
-			if(checkHeader(*it, h)) {
-				*inc = *it;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	bool checkLibrary(const QString &path, const QString &name)
-	{
-		QString str =
-			"int main()\n"
-			"{\n"
-			"    return 0;\n"
-			"}\n";
-
-		QString extra;
-		if(!path.isEmpty())
-			extra += QString("-L") + path + ' ';
-		extra += QString("-l") + name;
-		if(!doCompileAndLink(str, extra))
-			return false;
-		return true;
-	}
-
-	bool findLibrary(const QString &name, QString *lib)
-	{
-		if(checkLibrary("", name)) {
-			*lib = "";
-			return true;
-		}
-		if(checkLibrary("/usr/local/lib", name)) {
-			*lib = "/usr/local/lib";
-			return true;
-		}
-		return false;
-	}
-
-	void addDefine(const QString &str)
-	{
-		if(DEFINES.isEmpty())
-			DEFINES = str;
-		else
-			DEFINES += QString(" ") + str;
-		debug(QString("DEFINES += %1").arg(str));
-	}
-
-	void addLib(const QString &str)
-	{
-		if(LIBS.isEmpty())
-			LIBS = str;
-		else
-			LIBS += QString(" ") + str;
-		debug(QString("LIBS += %1").arg(str));
-	}
-
-	void addIncludePath(const QString &str)
-	{
-		if(INCLUDEPATH.isEmpty())
-			INCLUDEPATH = str;
-		else
-			INCLUDEPATH += QString(" ") + str;
-		debug(QString("INCLUDEPATH += %1").arg(str));
-	}
-
-	void addExtra(const QString &str)
-	{
-		extra += str + '\n';
-		debug(QString("extra += %1").arg(str));
-	}
-
-	QString DEFINES;
-	QString INCLUDEPATH;
-	QString LIBS;
-	QString extra;
-
-private:
-	ConfObjList list;
-	QDict<QString> vars;
-	QString blank;
-	bool do_debug, done_debug;
-};
-
-ConfObj::ConfObj(Conf *c)
-{
-	conf = c;
-	conf->added(this);
-	required = false;
-	disabled = false;
-}
-
-ConfObj::~ConfObj()
-{
-}
-
-QString ConfObj::checkString() const
-{
-	return QString();
-}
-
-QString ConfObj::resultString() const
-{
-	return QString();
-}
-
-#include"modules.cpp"
-
-//----------------------------------------------------------------------------
-// main
-//----------------------------------------------------------------------------
-int main()
-{
-	Conf *conf = new Conf;
-	ConfObj *o;
-	o = 0;
-#include"modules_new.cpp"
-
-	printf("ok\n");
-	bool success = false;
-	if(conf->exec()) {
-		QFile f("conf.pri");
-		if(!f.open(IO_WriteOnly | IO_Truncate)) {
-			printf("Error writing %s\n", f.name().latin1());
-			return 1;
-		}
-
-		QString str;
-		str += "# qconf\n";
-		str += "QT_PATH_PLUGINS = " + QString(qInstallPathPlugins()) + '\n';
-		if(!conf->DEFINES.isEmpty())
-			str += "DEFINES += " + conf->DEFINES + '\n';
-		if(!conf->INCLUDEPATH.isEmpty())
-			str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
-		if(!conf->LIBS.isEmpty())
-			str += "LIBS += " + conf->LIBS + '\n';
-		if(!conf->extra.isEmpty())
-			str += conf->extra;
-		str += '\n';
-
-		char *p = getenv("BINDIR");
-		if(p) {
-			str += QString("target.path = ") + p + '\n';
-			str += "INSTALLS += target\n";
-		}
-
-		QCString cs = str.latin1();
-		f.writeBlock(cs.data(), cs.length());
-		f.close();
-		success = true;
-	}
-	delete conf;
-
-	if(success)
-		return 0;
-	else
-		return 1;
-}
-
-#include"conf.moc"
-
-
-EOT
-cat >$1/conf.pro <<EOT
-TEMPLATE = app
-CONFIG += qt x11 thread console
-TARGET = conf
-
-DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
-DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
-DEFINES += X11_LIB='"\$\$QMAKE_LIBS_X11"'
-DEFINES += CC='"\$\$QMAKE_CC"'
-DEFINES += CXX='"\$\$QMAKE_CXX"'
-
-SOURCES += conf.cpp
-
-DEFINES += HAVE_MODULES
-
-EOT
-}
-
-export PREFIX
-export BINDIR
-export DATADIR
-export EX_QTDIR
-export QC_WITH_QCA_INC
-export QC_WITH_QCA_LIB
-export QC_WITH_ZLIB_INC
-export QC_WITH_ZLIB_LIB
-export QC_DISABLE_growl
-export QC_WITH_GROWL
-export QC_DISABLE_xss
-export QC_DISABLE_dnotify
-export QC_DISABLE_ghbnr
-export QC_DEBUG
-rm -rf .qconftemp
-(
-	mkdir .qconftemp
-	gen_files .qconftemp
-	cd .qconftemp
-	$qm conf.pro >/dev/null
-	QTDIR=$QTDIR make clean >/dev/null 2>&1
-	QTDIR=$QTDIR make >../conf.log 2>&1
-)
-
-if [ "$?" != "0" ]; then
-	rm -rf .qconftemp
-	echo fail
-	echo
-	echo "There was an error compiling 'conf'.  Be sure you have a proper"
-	echo "Qt 3.x Multithreaded (MT) build environment set up.  This"
-	echo "means not just Qt, but also a C++ compiler, the 'make' command,"
-	echo "and any other packages necessary to compile C++ programs."
-	echo "See conf.log for details."
-	if [ ! -f "$QTDIR/lib/libqt-mt.so.3" ]; then
-		echo
-		echo "One possible reason is that you don't have"
-		echo "libqt-mt.so.3 installed in $QTDIR/lib/."
-	fi
-	echo
-	exit 1;
-fi
-
-.qconftemp/conf
-ret="$?"
-if [ "$ret" = "1" ]; then
-	rm -rf .qconftemp
-	echo
-	exit 1;
-else
-	if [ "$ret" != "0" ]; then
-		rm -rf .qconftemp
-		echo fail
-		echo
-		echo "Unexpected error launching 'conf'"
-		echo
-		exit 1;
-	fi
-fi
-rm -rf .qconftemp
-
-if [ -x "./qcextra" ]; then
-	./qcextra
-fi
-# run qmake
-$qm psi.pro
-if [ "$?" != "0" ]; then
-	echo
-	exit 1;
-fi
-cat >Makefile.tmp <<EOT
-export QTDIR = $QTDIR
-export PATH = $QTDIR/bin:$PATH
-EOT
-cat Makefile >> Makefile.tmp
-rm -f Makefile
-cp -f Makefile.tmp Makefile
-rm -f Makefile.tmp
-
-echo
-echo "Good, your configure finished.  Now run 'make'."
-echo
Index: i/trunk/iris.pri
===================================================================
--- /psi/trunk/iris.pri	(revision 189)
+++ 	(revision )
@@ -1,64 +1,0 @@
-# libidn
-LIBIDN_BASE = $$IRIS_BASE/libidn
-CONFIG += libidn
-include($$IRIS_BASE/libidn.pri)
-
-# qca
-#unix:{
-#	INCLUDEPATH += /usr/local/include
-#	LIBS += -L/usr/local/lib -lqca
-#}
-#win32:{
-#	INCLUDEPATH += c:\local\include
-#	LIBS += c:\local\lib\qca.lib
-#}
-
-#!exists(qcaprovider.h) {
-#	Q_PREFIX = $$IRIS_BASE/../qca/src
-#	INCLUDEPATH += $$Q_PREFIX
-#}
-#HEADERS += ($$Q_PREFIX)qcaprovider.h
-
-DEFINES += XMPP_TEST
-
-INCLUDEPATH += $$IRIS_BASE/include $$IRIS_BASE/xmpp-core $$IRIS_BASE/xmpp-im $$IRIS_BASE/jabber
-
-HEADERS += \
-	$$IRIS_BASE/xmpp-core/hash.h \
-	$$IRIS_BASE/xmpp-core/simplesasl.h \
-	$$IRIS_BASE/xmpp-core/securestream.h \
-	$$IRIS_BASE/xmpp-core/parser.h \
-	$$IRIS_BASE/xmpp-core/xmlprotocol.h \
-	$$IRIS_BASE/xmpp-core/protocol.h \
-	$$IRIS_BASE/xmpp-core/td.h \
-	$$IRIS_BASE/xmpp-im/xmpp_tasks.h \
-	$$IRIS_BASE/xmpp-im/xmpp_xmlcommon.h \
-	$$IRIS_BASE/xmpp-im/xmpp_vcard.h \
-	$$IRIS_BASE/jabber/s5b.h \
-	$$IRIS_BASE/jabber/xmpp_ibb.h \
-	$$IRIS_BASE/jabber/xmpp_jidlink.h \
-	$$IRIS_BASE/jabber/filetransfer.h \
-	$$IRIS_BASE/include/xmpp.h \
-	$$IRIS_BASE/include/im.h
-
-SOURCES += \
-	$$IRIS_BASE/xmpp-core/connector.cpp \
-	$$IRIS_BASE/xmpp-core/tlshandler.cpp \
-	$$IRIS_BASE/xmpp-core/jid.cpp \
-	$$IRIS_BASE/xmpp-core/hash.cpp \
-	$$IRIS_BASE/xmpp-core/simplesasl.cpp \
-	$$IRIS_BASE/xmpp-core/securestream.cpp \
-	$$IRIS_BASE/xmpp-core/parser.cpp \
-	$$IRIS_BASE/xmpp-core/xmlprotocol.cpp \
-	$$IRIS_BASE/xmpp-core/protocol.cpp \
-	$$IRIS_BASE/xmpp-core/stream.cpp \
-	$$IRIS_BASE/xmpp-im/types.cpp \
-	$$IRIS_BASE/xmpp-im/client.cpp \
-	$$IRIS_BASE/xmpp-im/xmpp_tasks.cpp \
-	$$IRIS_BASE/xmpp-im/xmpp_xmlcommon.cpp \
-	$$IRIS_BASE/xmpp-im/xmpp_vcard.cpp \
-	$$IRIS_BASE/jabber/s5b.cpp \
-	$$IRIS_BASE/jabber/xmpp_ibb.cpp \
-	$$IRIS_BASE/jabber/xmpp_jidlink.cpp \
-	$$IRIS_BASE/jabber/filetransfer.cpp
-
Index: i/trunk/libpsi.pri
===================================================================
--- /psi/trunk/libpsi.pri	(revision 189)
+++ 	(revision )
@@ -1,17 +1,0 @@
-libpsi {
-	# iconset
-	CONFIG += iconset
-	ICONSET_CPP = $$LIBPSI_CPP/iconset
-	include($$ICONSET_CPP/iconset.pri)
-
-	# psiwidgets
-	CONFIG += psiwidgets
-	WIDGETS_CPP = $$LIBPSI_CPP/psiwidgets
-	include($$WIDGETS_CPP/psiwidgets.pri)
-
-	# psipng
-	CONFIG += psipng
-	#CONFIG += psimng # uncomment this if you're really brave, and you have libmng installed
-	PSIPNG_CPP = $$LIBPSI_CPP/psipng
-	include($$PSIPNG_CPP/psipng.pri)
-}
Index: i/trunk/makewin.bat
===================================================================
--- /psi/trunk/makewin.bat	(revision 189)
+++ 	(revision )
@@ -1,34 +1,0 @@
-@echo off
-
-echo Running qmake ...
-qmake psi.pro
-if errorlevel 1 goto ERROR1
-echo Compiling ...
-nmake
-if errorlevel 1 goto ERROR2
-
-mkdir psiwin
-copy src\psi.exe psiwin\Psi.exe
-copy %QTDIR%\bin\qt-mt*.dll psiwin
-copy ..\qca\qca*.dll psiwin
-copy src\tools\idle\win32\idleui.dll psiwin
-xcopy /e certs psiwin\certs\
-xcopy /e iconsets psiwin\iconsets\
-xcopy /e sound psiwin\sound\
-copy COPYING psiwin
-win32\tod README psiwin\Readme.txt
-win32\tod INSTALL psiwin\Install.txt
-
-echo 'psiwin' created successfully
-goto END
-
-:ERROR1
-echo Error running qmake..  Are you sure you have Qt set up?
-goto END
-
-:ERROR2
-echo Compile failed, stopping.
-goto END
-
-:END
-
Index: i/trunk/mk.cmd
===================================================================
--- /psi/trunk/mk.cmd	(revision 189)
+++ 	(revision )
@@ -1,21 +1,0 @@
-@echo off
-rem ----------------------------------------------
-rem a simple make launcher for both OS/2 and Win32
-rem ----------------------------------------------
-
-if .%OS%.==.Windows_NT. goto Win
-
-set MAKEFILE=Makefile.os2
-set MAKE=make
-goto Common
-
-:Win
-set MAKEFILE=Makefile.win
-set MAKE=nmake
-
-:Common
-if exist %MAKEFILE% goto :Make
-call qmake -o %MAKEFILE%
-
-:Make
-%MAKE% -f %MAKEFILE% %1 %2 %3 %4 %5 %6 %7 %8 %9
Index: i/trunk/mk.sh
===================================================================
--- /psi/trunk/mk.sh	(revision 189)
+++ 	(revision )
@@ -1,14 +1,0 @@
-#!/bin/sh
-
-## @todo (r=dmik) someone needs to add code to test
-## for mac and to set MAKEFILE accordingly. Don't forget
-## to uncomment the mac:MAKEFILE line in psi.pro!
-
-MAKEFILE=Makefile.unix
-MAKE=make
-
-if !(test -f $MAKEFILE); then
-    qmake -o $MAKEFILE;
-fi
-
-$MAKE -f $MAKEFILE "$@"
Index: i/trunk/psi.desktop
===================================================================
--- /psi/trunk/psi.desktop	(revision 189)
+++ 	(revision )
@@ -1,28 +1,0 @@
-[Desktop Entry]
-Type=Application
-Version=0.9.4
-Encoding=UTF-8
-Name=Psi
-GenericName=Jabber Client
-Comment=Communicate over the Jabber network
-Icon=psi
-Exec=psi
-Terminal=false
-Categories=Qt;Network;InstantMessaging;
-StartupNotify=true
-
-# Translations
-GenericName[nl]=Jabber Client
-Comment[nl]=Communiceer over het Jabber netwerk
-GenericName[sl]=Odjemalec za Jabber
-Comment[sl]=Komuniciranje prek omreÅŸja Jabber
-GenericName[mk]=ÐÐ»ÐžÐµÐœÑ Ð·Ð° Jabber
-Comment[mk]=ÐÐŸÐŒÑÐœÐžÑÐžÑÐ°ÑÑÐµ Ð¿ÑÐµÐºÑ Jabber ÐŒÑÐµÐ¶Ð°ÑÐ°
-GenericName[ca]=Client Jabber
-Comment[ca]=Comuniqui's a travÃ©s de la xarxa Jabber
-GenericName[eo]=ÄŽabbera Klientilo
-Comment[eo]=KomunikiÄu per la Äµabbera reto
-GenericName[pl]=Klient Jabber
-Comment[pl]=Komunikacja poprzez sieÄ Jabber
-GenericName[pt_BR]=Cliente Jabber
-Comment[pt_BR]=Comunique-se atravÃ©s da rede Jabber
Index: i/trunk/psi.pro
===================================================================
--- /psi/trunk/psi.pro	(revision 189)
+++ 	(revision )
@@ -1,16 +1,0 @@
-TEMPLATE = subdirs
-
-os2:MAKEFILE 	= Makefile.os2
-win32:MAKEFILE 	= Makefile.win
-unix:MAKEFILE 	= Makefile.x11
-#mac:MAKEFILE 	= Makefile.mac
-
-LIBPSI_CPP = ../libpsi
-exists(libpsi) {
-	LIBPSI_CPP = libpsi
-}
-
-SUBDIRS += \
-	$$LIBPSI_CPP/psiwidgets \
-	src
-
Index: i/trunk/psi.qc
===================================================================
--- /psi/trunk/psi.qc	(revision 189)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<qconf>
-  <name>Psi</name>
-  <profile>psi.pro</profile>
-  <sharename>psi</sharename>
-  <moddir>qcm</moddir>
-  <qt3/>
-  <dep type='qt31'>
-    <required/>
-  </dep>
-  <dep type='qca'>
-    <required/>
-  </dep>
-  <dep type='zlib'>
-    <required/>
-  </dep>
-  <dep type='growl'/>
-  <dep type='xss'/>
-  <dep type='dnotify'/>
-  <dep type='ghbnr'/>
-  <dep type='conf'>
-	<required/>
-  </dep>
-</qconf>
Index: i/trunk/psics.pri
===================================================================
--- /psi/trunk/psics.pri	(revision 189)
+++ 	(revision )
@@ -1,102 +1,0 @@
-psics {
-	# iris
-	INCLUDEPATH += \
-		$$IRISCS_CPP/util \
-		$$IRISCS_CPP/network
-
-	HEADERS += \
-		$$IRISCS_CPP/util/base64.h \
-		$$IRISCS_CPP/util/bytestream.h \
-		$$IRISCS_CPP/util/safedelete.h \
-		$$IRISCS_CPP/network/ndns.h \
-		$$IRISCS_CPP/network/srvresolver.h \
-		$$IRISCS_CPP/network/bsocket.h \
-		$$IRISCS_CPP/network/httpconnect.h \
-		$$IRISCS_CPP/network/httppoll.h \
-		$$IRISCS_CPP/network/servsock.h \
-		$$IRISCS_CPP/network/socks.h
-
-	SOURCES += \
-		$$IRISCS_CPP/util/base64.cpp \
-		$$IRISCS_CPP/util/bytestream.cpp \
-		$$IRISCS_CPP/util/safedelete.cpp \
-		$$IRISCS_CPP/network/ndns.cpp \
-		$$IRISCS_CPP/network/srvresolver.cpp \
-		$$IRISCS_CPP/network/bsocket.cpp \
-		$$IRISCS_CPP/network/httpconnect.cpp \
-		$$IRISCS_CPP/network/httppoll.cpp \
-		$$IRISCS_CPP/network/servsock.cpp \
-		$$IRISCS_CPP/network/socks.cpp
-
-	# trayicon
-	CONFIG += trayicon
-	TRAYICON_CPP = $$PSICS_CPP/trayicon
-	INCLUDEPATH += $$TRAYICON_CPP
-	include($$TRAYICON_CPP/trayicon.pri)
-
-	# idle
-	CONFIG += idle
-	IDLE_CPP = $$PSICS_CPP/idle
-	INCLUDEPATH += $$IDLE_CPP
-	include($$IDLE_CPP/idle.pri)
-
-	# systemwatch
-	CONFIG += systemwatch
-	SYSTEMWATCH_CPP = $$PSICS_CPP/systemwatch
-	INCLUDEPATH += $$SYSTEMWATCH_CPP
-	include($$SYSTEMWATCH_CPP/systemwatch.pri)
-
-	# growlnotifier
-	mac {
-		contains(DEFINES, HAVE_GROWL) {
-			CONFIG += growlnotifier
-			GROWLNOTIFIER_CPP = $$PSICS_CPP/growlnotifier
-			INCLUDEPATH += $$GROWLNOTIFIER_CPP
-			include($$GROWLNOTIFIER_CPP/growlnotifier.pri)
-		}
-	}
-
-	# mac dock
-	CONFIG += mac_dock
-	MACDOCK_CPP = $$PSICS_CPP/mac_dock
-	INCLUDEPATH += $$MACDOCK_CPP
-	include($$MACDOCK_CPP/mac_dock.pri)	
-
-	# zip
-	CONFIG += zip
-	ZIP_CPP = $$PSICS_CPP/zip
-	INCLUDEPATH += $$ZIP_CPP
-	include($$ZIP_CPP/zip.pri)
-
-	# dirwatch
-	CONFIG += dirwatch
-	DIRWATCH_CPP = $$PSICS_CPP/dirwatch
-	INCLUDEPATH += $$DIRWATCH_CPP
-	include($$DIRWATCH_CPP/dirwatch.pri)
-
-	# openpgp
-	CONFIG += openpgp
-	OPENPGP_CPP = $$PSICS_CPP/openpgp
-	INCLUDEPATH += $$OPENPGP_CPP
-	include($$OPENPGP_CPP/openpgp.pri)
-
-	# globalaccel
-	CONFIG += globalaccel
-	GLOBALACCEL_CPP = $$PSICS_CPP/globalaccel
-	INCLUDEPATH += $$GLOBALACCEL_CPP
-	include($$GLOBALACCEL_CPP/globalaccel.pri)
-
-	# advanced widget
-	CONFIG += advwidget
-	ADVWIDGET_CPP = $$PSICS_CPP/advwidget
-	INCLUDEPATH += $$ADVWIDGET_CPP
-	include($$ADVWIDGET_CPP/advwidget.pri)
-
-	use_crash {
-		# crash
-		CONFIG += crash
-		DEFINES += USE_CRASH
-		CRASH_CPP = $$PSICS_CPP/crash
-		include($$CRASH_CPP/crash.pri)
-	}
-}
