merge default branch to jingle

.hgignore

@@ -0,0 +1,27 @@
+syntax: glob
+*.gmo
+*.in
+*.la
+*.lo
+*.m4
+*.pyc
+*.pyo
+*.o
+*.Plo
+*~
+autom4te.cache
+data/defs.py
+data/gajim.desktop
+libtool
+po/.intltool-merge-cache
+po/POTFILES
+po/stamp-it
+stamp-h1
+Makefile
+
+syntax: regexp
+^config\.*
+^config\/
+^src\/\.libs
+^src\/trayicon.c
+^scripts\/gajim.*

AUTHORS

@@ -1,12 +1,16 @@
 CURRENT DEVELOPERS:
 
-Yann Le Boulanger (asterix AT lagaule.org)
 Nikos Kouremenos (kourem AT gmail.com)
+Yann Leboulanger (asterix AT lagaule.org)
+Julien Pivotto (roidelapluie AT gmail.com)
+Jonathan Schleifer (js-gajim AT webkeks.org)
 Travis Shirk (travis AT pobox.com)
+Brendan Taylor (whateley AT gmail.com)
+Jean-Marie Traissard (jim AT lapin.org)
 
 PAST DEVELOPERS:
 
-Jean-Marie Traissard (jim AT lapin.org)
 Stefan Bethge (stefan AT lanpartei.de)
-Dimitur Kirov (dkirov AT gmail.com)
+Stephan Erb (steve-e AT h3c.de)
 Vincent Hanquez (tab AT snarc.org)
+Dimitur Kirov (dkirov AT gmail.com)

COPYING

@@ -1,285 +1,626 @@
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
-  The licenses for most software are designed to take away your
+  The GNU General Public License is a free, copyleft license for
-freedom to share and change it.  By contrast, the GNU General Public
+software and other kinds of works.
-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
+  The licenses for most software and other practical works are designed
-General Public License applies to most of the Free Software
+to take away your freedom to share and change the works.  By contrast,
-Foundation's software and to any other program whose authors commit to
+the GNU General Public License is intended to guarantee your freedom to
-using it.  (Some other Free Software Foundation software is covered by
+share and change all versions of a program--to make sure it remains free
-the GNU Library General Public License instead.)  You can apply it to
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them if you wish), that you receive source code or can get it if you
-if you want it, that you can change the software or use pieces of it
+want it, that you can change the software or use pieces of it in new
-in new free programs; and that you know you can do these things.
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
+  To protect your rights, we need to prevent others from denying you
-anyone to deny you these rights or to ask you to surrender the rights.
+these rights or asking you to surrender the rights.  Therefore, you have
-These restrictions translate to certain responsibilities for you if you
+certain responsibilities if you distribute copies of the software, or if
-distribute copies of the software, or if you modify it.
+you modify it: responsibilities to respect the freedom of others.
 
   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
+gratis or for a fee, you must pass on to the recipients the same
-you have.  You must make sure that they, too, receive or can get the
+freedoms that you received.  You must make sure that they, too, receive
-source code.  And you must show them these terms so they know their
+or can get the source code.  And you must show them these terms so they
-rights.
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
+  Developers that use the GNU GPL protect your rights with two steps:
-(2) offer you this license which gives you legal permission to copy,
+(1) assert copyright on the software, and (2) offer you this License
-distribute and/or modify the software.
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
+  For the developers' and authors' protection, the GPL clearly explains
-that everyone understands that there is no warranty for this free
+that there is no warranty for this free software.  For both users' and
-software.  If the software is modified by someone else and passed on, we
+authors' sake, the GPL requires that modified versions be marked as
-want its recipients to know that what they have is not the original, so
+changed, so that their problems will not be attributed erroneously to
-that any problems introduced by others will not reflect on the original
+authors of previous versions.
-authors' reputations.
 
-  Finally, any free program is threatened constantly by software
+  Some devices are designed to deny users access to install or run
-patents.  We wish to avoid the danger that redistributors of a free
+modified versions of the software inside them, although the manufacturer
-program will individually obtain patent licenses, in effect making the
+can do so.  This is fundamentally incompatible with the aim of
-program proprietary.  To prevent this, we have made it clear that any
+protecting users' freedom to change the software.  The systematic
-patent must be licensed for everyone's free use or not licensed at all.
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                       TERMS AND CONDITIONS
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. Definitions.
-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
+  "This License" refers to version 3 of the GNU General Public License.
-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
+  "Copyright" also means copyright-like laws that apply to other kinds of
-source code as you receive it, in any medium, provided that you
+works, such as semiconductor masks.
-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
+  "The Program" refers to any copyrightable work licensed under this
-you may at your option offer warranty protection in exchange for a fee.
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-  2. You may modify your copy or copies of the Program or any portion
+  To "modify" a work means to copy from or adapt all or part of the work
-of it, thus forming a work based on the Program, and copy and
+in a fashion requiring copyright permission, other than the making of an
-distribute such modifications or work under the terms of Section 1
+exact copy.  The resulting work is called a "modified version" of the
-above, provided that you also meet all of these conditions:
+earlier work or a work "based on" the earlier work.
 
-    a) You must cause the modified files to carry prominent notices
+  A "covered work" means either the unmodified Program or a work based
-    stating that you changed the files and the date of any change.
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
+  To "propagate" a work means to do anything with it that, without
-    whole or in part contains or is derived from the Program or any
+permission, would make you directly or secondarily liable for
-    part thereof, to be licensed as a whole at no charge to all third
+infringement under applicable copyright law, except executing it on a
-    parties under the terms of this License.
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-    c) If the modified program normally reads commands interactively
+  To "convey" a work means any kind of propagation that enables other
-    when run, you must cause it, when started running for such
+parties to make or receive copies.  Mere interaction with a user through
-    interactive use in the most ordinary way, to print or display an
+a computer network, with no transfer of a copy, is not conveying.
-    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
+  An interactive user interface displays "Appropriate Legal Notices"
-identifiable sections of that work are not derived from the Program,
+to the extent that it includes a convenient and prominently visible
-and can be reasonably considered independent and separate works in
+feature that (1) displays an appropriate copyright notice, and (2)
-themselves, then this License, and its terms, do not apply to those
+tells the user that there is no warranty for the work (except to the
-sections when you distribute them as separate works.  But when you
+extent that warranties are provided), that licensees may convey the
-distribute the same sections as part of a whole which is a work based
+work under this License, and how to view a copy of this License.  If
-on the Program, the distribution of the whole must be on the terms of
+the interface presents a list of user commands or options, such as a
-this License, whose permissions for other licensees extend to the
+menu, a prominent item in the list meets this criterion.
-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
+  1. Source Code.
-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
+  The "source code" for a work means the preferred form of the work
-with the Program (or with a work based on the Program) on a volume of
+for making modifications to it.  "Object code" means any non-source
-a storage or distribution medium does not bring the other work under
+form of a work.
-the scope of this License.
 
-  3. You may copy and distribute the Program (or a work based on it,
+  A "Standard Interface" means an interface that either is an official
-under Section 2) in object code or executable form under the terms of
+standard defined by a recognized standards body, or, in the case of
-Sections 1 and 2 above provided that you also do one of the following:
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    a) Accompany it with the complete corresponding machine-readable
+  The "System Libraries" of an executable work include anything, other
-    source code, which must be distributed under the terms of Sections
+than the work as a whole, that (a) is included in the normal form of
-    1 and 2 above on a medium customarily used for software interchange; or,
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-    b) Accompany it with a written offer, valid for at least three
+  The "Corresponding Source" for a work in object code form means all
-    years, to give any third party, for a charge no more than your
+the source code needed to generate, install, and (for an executable
-    cost of physically performing source distribution, a complete
+work) run the object code and to modify the work, including scripts to
-    machine-readable copy of the corresponding source code, to be
+control those activities.  However, it does not include the work's
-    distributed under the terms of Sections 1 and 2 above on a medium
+System Libraries, or general-purpose tools or generally available free
-    customarily used for software interchange; or,
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-    c) Accompany it with the information you received as to the offer
+  The Corresponding Source need not include anything that users
-    to distribute corresponding source code.  (This alternative is
+can regenerate automatically from other parts of the Corresponding
-    allowed only for noncommercial distribution and only if you
+Source.
-    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
+  The Corresponding Source for a work in source code form is that
-making modifications to it.  For an executable work, complete source
+same work.
-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
+  2. Basic Permissions.
-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
+  All rights granted under this License are granted for the term of
-except as expressly provided under this License.  Any attempt
+copyright on the Program, and are irrevocable provided the stated
-otherwise to copy, modify, sublicense or distribute the Program is
+conditions are met.  This License explicitly affirms your unlimited
-void, and will automatically terminate your rights under this License.
+permission to run the unmodified Program.  The output from running a
-However, parties who have received copies, or rights, from you under
+covered work is covered by this License only if the output, given its
-this License will not have their licenses terminated so long as such
+content, constitutes a covered work.  This License acknowledges your
-parties remain in full compliance.
+rights of fair use or other equivalent, as provided by copyright law.
 
-  5. You are not required to accept this License, since you have not
+  You may make, run and propagate covered works that you do not
-signed it.  However, nothing else grants you permission to modify or
+convey, without conditions so long as your license otherwise remains
-distribute the Program or its derivative works.  These actions are
+in force.  You may convey covered works to others for the sole purpose
-prohibited by law if you do not accept this License.  Therefore, by
+of having them make modifications exclusively for you, or provide you
-modifying or distributing the Program (or any work based on the
+with facilities for running those works, provided that you comply with
-Program), you indicate your acceptance of this License to do so, and
+the terms of this License in conveying all material for which you do
-all its terms and conditions for copying, distributing or modifying
+not control copyright.  Those thus making or running the covered works
-the Program or works based on it.
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-  6. Each time you redistribute the Program (or any work based on the
+  Conveying under any other circumstances is permitted solely under
-Program), the recipient automatically receives a license from the
+the conditions stated below.  Sublicensing is not allowed; section 10
-original licensor to copy, distribute or modify the Program subject to
+makes it unnecessary.
-these terms and conditions.  You may not impose any further
+
-restrictions on the recipients' exercise of the rights granted herein.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-You are not responsible for enforcing compliance by third parties to
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
-infringement or for any other reason (not limited to patent issues),
+patent license under the contributor's essential patent claims, to
-conditions are imposed on you (whether by court order, agreement or
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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
+excuse you from the conditions of this License.  If you cannot convey a
-distribute so as to satisfy simultaneously your obligations under this
+covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
+License and any other pertinent obligations, then as a consequence you may
-may not distribute the Program at all.  For example, if a patent
+not convey it at all.  For example, if you agree to terms that obligate you
-license would not permit royalty-free redistribution of the Program by
+to collect a royalty for further conveying from those to whom you convey
-all those who receive copies directly or indirectly through you, then
+the Program, the only way you could satisfy both those terms and this
-the only way you could satisfy both it and this License would be to
+License would be to refrain entirely from conveying the Program.
-refrain entirely from distribution of the Program.
 
-If any portion of this section is held invalid or unenforceable under
+  13. Use with the GNU Affero General Public License.
-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
+  Notwithstanding any other provision of this License, you have
-patents or other property right claims or to contest validity of any
+permission to link or combine any covered work with a work licensed
-such claims; this section has the sole purpose of protecting the
+under version 3 of the GNU Affero General Public License into a single
-integrity of the free software distribution system, which is
+combined work, and to convey the resulting work.  The terms of this
-implemented by public license practices.  Many people have made
+License will continue to apply to the part which is the covered work,
-generous contributions to the wide range of software distributed
+but the special requirements of the GNU Affero General Public License,
-through that system in reliance on consistent application of that
+section 13, concerning interaction through a network will apply to the
-system; it is up to the author/donor to decide if he or she is willing
+combination as such.
-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
+  14. Revised Versions of this License.
-be a consequence of the rest of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
+  The Free Software Foundation may publish revised and/or new versions of
-certain countries either by patents or by copyrighted interfaces, the
+the GNU General Public License from time to time.  Such new versions will
-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
+  Each version is given a distinguishing version number.  If the
-specifies a version number of this License which applies to it and "any
+Program specifies that a certain numbered version of the GNU General
-later version", you have the option of following the terms and conditions
+Public License "or any later version" applies to it, you have the
-either of that version or of any later version published by the Free
+option of following the terms and conditions either of that numbered
-Software Foundation.  If the Program does not specify a version number of
+version or of any later version published by the Free Software
-this License, you may choose any version ever published by the Free Software
+Foundation.  If the Program does not specify a version number of the
-Foundation.
+GNU General Public 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
+  If the Program specifies that a proxy can decide which future
-programs whose distribution conditions are different, write to the author
+versions of the GNU General Public License can be used, that proxy's
-to ask for permission.  For software which is copyrighted by the Free
+public statement of acceptance of a version permanently authorizes you
-Software Foundation, write to the Free Software Foundation; we sometimes
+to choose that version for the Program.
-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
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+  15. Disclaimer of 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
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+  16. Limitation of Liability.
 
-	    How to Apply These Terms to Your New Programs
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
+  If the program does terminal interaction, make it output a short
-when it starts in an interactive mode:
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    <program>  Copyright (C) <year>  <name of author>
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
+parts of the General Public License.  Of course, your program's commands
-be called something other than `show w' and `show c'; they could even be
+might be different; for a GUI interface, you would use an "about box".
-mouse-clicks or menu items--whatever suits your program.
 
-You should also get your employer (if you work as a programmer) or your
+  You should also get your employer (if you work as a programmer) or school,
-school, if any, to sign a "copyright disclaimer" for the program, if
+if any, to sign a "copyright disclaimer" for the program, if necessary.
-necessary.  Here is a sample; alter the names:
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  The GNU General Public License does not permit incorporating your program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+into proprietary programs.  If your program is a subroutine library, you
-
+may consider it more useful to permit linking proprietary applications with
-  <signature of Ty Coon>, 1 April 1989
+the library.  If this is what you want to do, use the GNU Lesser General
-  Ty Coon, President of Vice
+Public License instead of this License.  But first, please read
-
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

ChangeLog

@@ -1,3 +1,131 @@
+Gajim 0.12.1 (21 December 2008)
+
+  * Fix filetransfer
+  * Updated german translation
+  * Fix click on notifications when text string is empty
+  * Improve systray popup menu
+
+Gajim 0.12 (17 December 2008)
+
+  * Fix text rendering in notifications
+  * Fix forward unread messages under Windows
+  * Better sessions support
+  * Better auto-away support
+  * Fix banshee support
+  * Quodlibet support
+  * Fix GSSAPI authentification 
+  * Fix IPV4 filetransfer on Windows Vista when IPV6 is used too
+  * Fix caps usage
+  * Fix end to end encryption autonegotiation
+
+Gajim 0.12-beta1 (11 November 2008)
+
+  * SECURITY
+  * Implement Kerberos (GSSAPI) SASL Authentication mechanism
+  * Prevent affiliation spoofing in groupchats
+  * Improve GPG and E2E support
+
+  * GUI
+  * Highlight all valid IANA schemes
+  * Improved E2E, Mood and Activity dialogs
+  * Show number of participants in groupchats
+
+  * Connection
+  * Correctly parse IDNA names in SRV records
+  * Disable proxy resolution (#4299)
+  * Fix handling of namespace invalid XML
+  * Do not freeze on connection failures (#4366, #4107)
+
+  * OTHERS
+  * Do not crash on fluxbox restarts
+  * Update several hotkeys and make them work on non-latin keyboards
+  * Prevent a user from sending invalid XML chars
+  * Do not try to save a file with a too long filename when a nick is long
+  * Implement XEP-0203 (Delayed Delivery)
+  * Improved windows installer
+  * Latex support for windows
+
+Gajim 0.12-alpha1 (12 August 2008)
+
+  * Change licence from GPLv2 to GPLv3
+
+  * SECURITY
+  * Support for End-To-End encryption (XEP-0116)
+  * SSL certificate verification
+  * Improve GPG support (#2390, #2783)
+  * Ability to disable message previews in notify popups
+
+  * GROUP CHATS
+  * Support for sending files over group chats
+  * List of bookmarked rooms is now sorted alphabetically
+  * Support for transforming a one-to-one chat into a groupchat
+  * Send invitation by drag-and-dropping a contact from roster
+  * Send messages to conference using gajim-remote
+  * Ability to destroy a room when we are owner, give a reason and alternative room jid
+  * Ability to minimize group chats in roster
+  
+  * USABILITY
+  * Files transfers using drag and drop
+  * Ability to select and interact with status messages in chat windows (using libsexy)
+  * Ability to set a custom avatar for a contact
+  * Better handling of resource collisions
+  * Option to Sign On as a Certain Status (#3314)
+  * Block/Unblock contact directly from roster using privacy lists
+  
+  * GUI
+  * Single window mode
+  * Close change status windows after 15 seconds of inactivity
+  * Simplified "Accounts" dialog
+  * Preferences window redesign
+  * New GUI for chat window
+  * Roster treeview now uses modelfilter (way way much faster)
+
+  * OTHER
+  * Support of PEP (Personal Eventing Protocol) (XEP-0163)
+    * User Mood (XEP-0107)
+    * User Activity (XEP-0108)
+    * User Tune (XEP-0118)
+    * User Nickname (XEP-0172)
+  * Support for Google Talk accounts with non gmail.com domain (+ GMail notifications)
+  * Modified the format of emoticons list file, so we can choose the default code (#3696)
+  * New Remote Controlling Option (XEP-0146): forward unread messages
+  * Support for User Search (XEP-0055)
+  * Support for jabber:x:data in message elements (Part of XEP-0004)
+  * Added a «supported features» window
+  * Latex support (#2796)
+  * Link-local messaging with Windows (#2883)
+  * Ability to send a custom status to a group, a contact or a transport
+  * Support of Message Receipts (XEP-0184)
+
+Gajim 0.11.4 (06 December 2007)
+
+  * Fix /nick command in groupchats
+  * Better Metacontacts sorting
+  * Fix Ctrl + PageUP/Down behaviour
+  * Fix saving files from filetransfer under windows
+
+Gajim 0.11.3 (17 November 2007)
+
+  * Fix bookmarks support detection
+  * Improve file transfer on windows
+  * Fix some zeroconf bugs
+  * Fix focus bug in chat window
+  * Fix nickname changement behaviour in groupchats
+
+Gajim 0.11.2 (22 September 2007)
+
+  * Improve idle, transports support
+  * Enable ellipsization in roster and chatwindow
+  * Fixed some metacontacts problems (#2156, #2761)
+  * Beter support of XEP-0070 (Verifying HTTP Requests via XMPP)
+  * Make the same height of a banner for all chat tabs
+  * Fix a bug with french translation and invitations (#3043)
+  * Fix a bug with UTF-8 and emoticons
+  * Corrected many bugs with passwords and gnome-keyring
+  * Improve xhtml-im and pictures support
+  * Improve Ad-Hoc support
+  * And many other bufixes
+
 Gajim 0.11.1 (18 February 2007)
   * Fixes in gajim-remote and the way XMPP URI are handled
   * Fix Idle under Windows

Makefile.am

@@ -2,14 +2,7 @@ SUBDIRS = src data po
 
 ACLOCAL_AMFLAGS = -I m4
 
-if BUILD_REMOTE_CONTROL
+bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
-OPTIONAL_BIN = scripts/gajim-remote
-else
-OPTIONAL_BIN =
-endif
-
-bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
-
 
 docfilesdir = $(docdir)
 docfiles_DATA = README \
@@ -17,6 +10,7 @@ docfiles_DATA = README \
 				ChangeLog \
 				COPYING \
 				THANKS \
+				THANKS.artists \
 				AUTHORS 
 
 EXTRA_DIST = \
@@ -25,15 +19,17 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in 	\
 	intltool-update.in	\
-	scripts/gajim.in	\
+	gajim.nsi \
-	scripts/gajim-remote.in
+	setup_win32.py \
+	scripts/gajim.in
 	
 DISTCLEANFILES = 		\
 	intltool-extract 	\
 	intltool-merge 		\
 	intltool-update		\
 	scripts/gajim		\
-	scripts/gajim-remote
+	scripts/gajim-remote	\
+	scripts/gajim-histrory-manager
 
 MAINTAINERCLEANFILES = \
 	configure \
@@ -48,6 +44,16 @@ MAINTAINERCLEANFILES = \
 	compile \
 	depcomp \
 	config.guess \
+	config.log \
 	config.sub \
+	config.status \
 	aclocal.m4 \
-	libtool
+	libtool \
+	po/POTFILES.in \
+	src/trayicon_la-eggtrayicon.loT \
+	m4/intltool.m4
+
+MAINTAINERCLEANDIRS = \
+	autom4te.cache \
+	build \
+	dist

README.html

@@ -15,8 +15,8 @@ Welcome to Gajim and thank you for trying out our client.
 
 <h2>Runtime Requirements</h2>
 <ul>
-<li>python2.4 or higher</li>
+<li>python2.5 or higher</li>
-<li>pygtk2.6 or higher</li>
+<li>pygtk2.12 or higher</li>
 <li>python-libglade</li>
 <li>pysqlite2 (if you have python 2.5, you already have this)</li>
 </ul>
@@ -29,14 +29,18 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
 <h2>Optional Runtime Requirements</h2>
 <ul>
 <li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
+<li>python-crypto to enable End to end encryption</li>
+<li>For idle module, libxss library</li>
 <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
-<li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</li>
+<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
 <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
 <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
 <li>gnome-python-desktop (for GnomeKeyring support)</li>
 <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
-<li>D-Bus running to have gajim-remote working</li>
+<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li>
 <li>python-dbus bindings</li>
+<li>python-sexy to have clickable URLs in chat windows</li>
+<li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li>
 </ul>
 
 <p>
@@ -50,9 +54,8 @@ the xml lib that *comes* with python and not pyxml or whatever.
 <li>python-dev</li>
 <li>python-gtk2-dev</li>
 <li>libgtk2.0-dev aka. gtk2-devel</li>
-<li>libxss-dev (for idle detection module; some distributions such as Debian split xscreensaver)</li>
 <li>libgtkspell-dev	(for the gtkspell module)</li>
-<li>intltool</li>
+<li>intltool (>= 0.40.1)</li>
 </ul>
 
 <p>
@@ -92,7 +95,7 @@ You will need GNU autotools in order to install Gajim from svn. This includes:
 <li>automake &gt;= 1.8 </li>
 <li>autoconf &gt;= 2.59 </li>
 <li>libtool</li>
-<li>intltool-0.35.0 </li>
+<li>intltool-0.40.1 </li>
 <li>pkgconfig &gt;= 0.19</li>
 </ul>
 </p>
@@ -139,7 +142,7 @@ That is all, <strong>enjoy!</strong>
 <br/>
 <br/>
 <br/>
-(C) 2003-2006<br/>
+(C) 2003-200888888888<br/>
 The Gajim Team<br/>
 http://gajim.org<br/>
 <br/>

THANKS

@@ -2,6 +2,7 @@ Alexander Futász
 Alexander V. Butenko
 Alexey Nezhdanov
 Alfredo Junix
+Anaël Verrier
 Anders Ström
 Andrew Sayman
 Anton Shmigirilov
@@ -20,8 +21,8 @@ Guillaume Morin
 Gustavo J. A. M. Carneiro
 Ivo Anjo
 Josef Vybíral
-Julien Pivotto
 Juraj Michalek
+Kjell Braden
 Luis Peralta
 Michael Scherer
 Michele Campeotto

THANKS.artists

@@ -0,0 +1,8 @@
+Anders Ström
+Christophe Got
+Dennis Craven
+Guillaume Morin
+Josef Vybíral
+Membris Khan
+Rederick Asher
+Jakub Szypulka

autogen.sh

@@ -1,18 +1,30 @@
 #!/usr/bin/env bash
+  AM_ARGS="--add-missing --gnu --copy"
+  CONF_ARGS=""
+  if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then
+    . /Library/Frameworks/GTK+.framework/Versions/Current/env
+    AM_ARGS="${AM_ARGS} --ignore-deps"
+    CONF_ARGS="${CONF_ARGS} --disable-idle --without-x"
+  fi
+
   echo "[encoding: UTF-8]" > po/POTFILES.in \
-  && ls -1 -U data/gajim.desktop.in.in data/glade/*.glade \
+  && ls -1 data/gajim.desktop.in.in data/glade/*.glade \
-  src/*py src/common/*py src/common/zeroconf/*.py >> \
+  src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \
   po/POTFILES.in || exit 1
   if test -z `which pkg-config 2>/dev/null`;then
     echo "***Error: pkg-config not found***"
 	echo "See README.html for build requirements."
 	exit 1
   fi
-  set -x
+
+  which glibtoolize >/dev/null 2>&1 && LIBTOOLIZE="glibtoolize" || LIBTOOLIZE="libtoolize"
+
+  mkdir -p config
+
   intltoolize --force --automake \
   && aclocal -I ./m4 \
-  && libtoolize --copy --force --automake \
+  && $LIBTOOLIZE --copy --force --automake \
   && autoheader \
   && autoconf  \
-  && automake --add-missing --gnu --copy \
+  && automake ${AM_ARGS} \
-  && ./configure $@
+  && ./configure ${CONF_ARGS} $@

autopackage/default.apspec

@@ -9,7 +9,7 @@ Packager: Filippos Papadopoulos <psybases@gmail.com>
 Summary: Gajim is a Jabber client written in Python.
 URL: http://www.gajim.org/
 License: GNU General Public License, Version 2
-SoftwareVersion: 0.11.1
+SoftwareVersion: 0.12-alpha1
 AutopackageTarget: 1.0
 PackageVersion: 1
 

config.h.in

@@ -1,91 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* always defined to indicate that i18n is enabled */
-#undef ENABLE_NLS
-
-/* Gettext package */
-#undef GETTEXT_PACKAGE
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Define to 1 if you have the `dcgettext' function. */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the <libintl.h> header file. */
-#undef HAVE_LIBINTL_H
-
-/* Define to 1 if you have the `X11' library (-lX11). */
-#undef HAVE_LIBX11
-
-/* Define to 1 if you have the `Xext' library (-lXext). */
-#undef HAVE_LIBXEXT
-
-/* Define to 1 if you have the `Xss' library (-lXss). */
-#undef HAVE_LIBXSS
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const

configure.ac

@@ -1,11 +1,17 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.11.1.5],[http://trac.gajim.org/],[gajim])
+		[0.12.5.1-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
-AM_INIT_AUTOMAKE([1.8])
+
 AC_CONFIG_HEADER(config.h)
+AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.8])
 AM_MAINTAINER_MODE
 
+dnl Make Objective-C work with automake
+AM_CONDITIONAL([am__fastdepOBJC], false)
+
 IT_PROG_INTLTOOL([0.35.0])
 PKG_PROG_PKG_CONFIG([0.19])
 
@@ -29,96 +35,17 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package])
 AM_GLIB_GNU_GETTEXT
 AM_NLS
 
-FARSIGHT_LIBS=`$PKG_CONFIG --libs farsight-0.1`
-AC_SUBST(FARSIGHT_LIBS)
-FARSIGHT_CFLAGS=`$PKG_CONFIG --cflags farsight-0.1`
-AC_SUBST(FARSIGHT_CFLAGS)
 
 dnl ****
 dnl pygtk and gtk+
 dnl ****
-PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.6.0 pygtk-2.0 >= 2.6.0])
+PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0])
 AC_SUBST(PYGTK_CFLAGS)
 AC_SUBST(PYGTK_LIBS)
 PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFS)
 
-dnl *****
+AM_PATH_PYTHON([2.5])
-dnl dbus
-dnl *****
-AC_ARG_ENABLE([remote], 
-  [  --disable-remote        enable remote control via DBus [default auto]],
-  enable_remote=$enableval, enable_remote=auto)
-
-if test "x$enable_remote" = "xauto"; then
-	 PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no)
-fi
-
-if test "x$enable_remote" = "xyes";then
-	PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60])
-	AC_SUBST(DBUS_CFLAGS)
-	AC_SUBST(DBUS_LIBS)
-	have_remote=true
-else
-	have_remote=false
-fi
-AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote)
-
-dnl ****
-dnl gtkspell
-dnl ****
-AC_ARG_ENABLE(gtkspell, 
-  [  --disable-gtkspell      build spell checking support [default auto]],
-  enable_gtkspell=$enableval, enable_gtkspell=auto)
-
-if test "x$enable_gtkspell" = "xauto";then
-	PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no])
-fi
-if test "x$enable_gtkspell" = "xyes";then
-	PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0])
-	AC_SUBST(GTKSPELL_CFLAGS)
-	AC_SUBST(GTKSPELL_LIBS)
-	have_gtkspell=true
-else
-	have_gtkspell=false
-fi
-AM_CONDITIONAL(BUILD_GTKSPELL, $have_gtkspell)
-
-
-dnl ****
-dnl xscreensaver
-dnl ****
-AC_ARG_ENABLE([idle],
-  [  --disable-idle          build idle module [default auto]],
-  enable_idle=$enableval, enable_idle=yes)
-
-if test "x$enable_idle" = "xyes";then 
-	PKG_CHECK_EXISTS([xscrnsaver], [have_xscrnsaver=yes], [have_xscrnsaver=no])
-
-	if test "x$have_xscrnsaver" = "xyes";then
-		PKG_CHECK_MODULES([XSCRNSAVER], xscrnsaver)
-		AC_SUBST(XSCRNSAVER_LIBS)
-		have_idle=true
-	else
-		# Checks for libraries.
-		LIBS=-L$x_libraries
-		AC_CHECK_LIB([X11], [XOpenDisplay])
-		AC_CHECK_LIB([Xext], [XMissingExtension])
-		AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo])
-		XSCRNSAVER_LIBS="$LIBS"
-		AC_SUBST([XSCRNSAVER_LIBS])
-		if test "x$XSCRNSAVER_LIBS" = "x-L";then 
-			have_idle=false
-		else
-			have_idle=true
-		fi
-	fi
-else
-	have_idle=false
-fi
-AM_CONDITIONAL(BUILD_IDLE, $have_idle)
-
-AM_PATH_PYTHON([2.4])
 if test "x$PYTHON" = "x:"; then
 	AC_MSG_ERROR([Python not found])
 fi
@@ -127,7 +54,7 @@ dnl ****
 dnl tray icon
 dnl ****
 AC_ARG_ENABLE(trayicon,
-  [  --disable-trayicon      build trayicon module [default yes]],
+  [  --disable-trayicon      do not build trayicon module [default yes]],
   enable_trayicon=$enableval, enable_trayicon=yes)
 test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false
 AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon)
@@ -139,18 +66,12 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 AC_SUBST([PYTHON_INCLUDES])
 
 AS_AC_EXPAND(DATADIR, "${datadir}")
-
+AS_AC_EXPAND(LIBDIR, "${libdir}")
-AS_AC_EXPAND(LIBDIR, ${libdir})
-
 AS_AC_EXPAND(DOCDIR, "${docdir}")
+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
 
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
-AC_SUBST(DATADIR)
-AC_SUBST(LIBDIR)
-AS_AC_EXPAND(DATADIR, "${DATADIR}")
-AC_SUBST(DOCDIR)
-AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
 
 AC_CONFIG_FILES([ 
 	Makefile
@@ -159,21 +80,19 @@ AC_CONFIG_FILES([
 	data/emoticons/Makefile
 	data/pixmaps/Makefile
 	data/iconsets/Makefile
+	data/moods/Makefile
+	data/activities/Makefile
 	data/gajim.desktop.in
 	data/defs.py
 	src/Makefile
-	src/common/Makefile
-	src/common/farsight/Makefile
 	scripts/gajim
-	scripts/gajim-remote
+	scripts/gajim-remote:scripts/gajim.in
+	scripts/gajim-history-manager:scripts/gajim.in
 	po/Makefile.in
 ])
 AC_OUTPUT
 echo " 
 ***************************** 
   Build features:
-    spell check ...... ${have_gtkspell}
-    idle module ...... ${have_idle}
-    remote control ... ${have_remote}
     trayicon ......... ${have_trayicon}
 *****************************"

data/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = glade emoticons pixmaps iconsets 
+SUBDIRS = glade emoticons pixmaps iconsets moods activities
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
@@ -12,7 +12,7 @@ soundsdir = $(pkgdatadir)/data/sounds
 sounds_DATA = $(srcdir)/sounds/*.wav
 
 otherdir = $(pkgdatadir)/data/other
-other_DATA = other/servers.xml
+other_DATA = other/servers.xml other/cacerts.pem
 
 man_MANS = gajim.1 gajim-remote.1
 

data/activities/Makefile.am

@@ -0,0 +1,38 @@
+activitiesdir = $(pkgdatadir)/data/activities
+
+activities_DATA = 
+
+ACTIVITIES_DIRS = **/**
+
+ACTIVITIES_FILES = **/**/{*.png,*.gif}
+
+
+install-data-local:
+	@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
+			echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d"; \
+			$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d || exit 1; \
+		fi; \
+	done; \
+	for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
+		if test -f $(srcdir)/$$f; then \
+			echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f"; \
+			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f || exit 1; \
+		fi; \
+	done; 
+
+dist-hook:
+	@for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \
+		if test -d $(srcdir)/$$d;then \
+			echo " $(mkdir_p) $(distdir)/$$d"; \
+			$(mkdir_p) $(distdir)/$$d || exit 1; \
+		fi; \
+	done; \
+	for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \
+		if test -f $(srcdir)/$$f; then \
+			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
+			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
+		fi; \
+	done;
+
+MAINTAINERCLEANFILES = Makefile.in

data/defs.py.in

@@ -5,3 +5,5 @@ docdir = "@DOCDIR@"
 datadir = "@DATADIR@"
 
 version = "@VERSION@"
+
+localedir = "@LOCALEDIR@"

data/emoticons/animated/emoticons.py

@@ -1,75 +1,52 @@
+# coding=utf-8
 emoticons = {
-	':-[': 'bat.gif',
+	'smile.png': [':-)', ':)'],
-	':[': 'bat.gif',
+	'coolglasses.png': ['B-)', '(H)'],
-	'(ci)': 'cigarette.gif',
+	'wink.gif': [';-)', ';)'],
-	'(^)': 'cake.gif',
+	'biggrin.png': [':-D', ':D'],
-	":'(": 'cry.gif',
+	'unhappy.png': [':-(', ':('],
-	';(': 'cry.gif',
+	'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	':^)': 'dontknow.gif',
+	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'8-)': 'eyeroll.gif',
+	'blush.png': [':-$', ':$'],
-	'(li)': 'lightning.gif',
+	'angry.png': [':-@', ':@'],
-	'<:o)': 'party.gif',
+	'bat.gif': [':-[', ':['],
-	'|-)': 'sleepy.gif',
+	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'*-)': 'think.gif',
+	'stare.png': [':-|', ':|'],
-	';)': 'wink.gif',
+	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	';-)': 'wink.gif',
+	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	# now static (only those that don't have animated)
+	'oh.png': ['=-O', ':-O', ':O'],
-	':-)': 'smile.png',
+	'heart.png': ['<3', '(L)', '*IN LOVE*'],
-	'(@)': 'pussy.png',
+	'pussy.png': ['(@)'],
-	'8)': 'coolglasses.png',
+	'cuffs.png': ['(%)'],
-	':(': 'unhappy.png',
+	'moon.png': ['(S)'],
-	':)': 'smile.png',
+	'lamp.png': ['(I)'],
-	':/': 'frowning.png',
+	'music.png': ['(8)'],
-	':-/': 'frowning.png',
+	'beer.png': ['(B)', '*DRINK*'],
-	'(})': 'hugleft.png',
+	'brflower.png': ['(W)'],
-	':$': 'blush.png',
+	'boy.png': ['(Z)'],
-	'(Y)': 'thumbup.png',
+	'girl.png': ['(X)'],
-	':-@': 'angry.png',
+	'mail.png': ['(E)'],
-	':-D': 'biggrin.png',
+	'thumbdown.png': ['(N)'],
-	'(U)': 'brheart.png',
+	'photo.png': ['(P)'],
-	'(F)': 'flower.png',
+	'thumbup.png': ['(Y)', '*THUMBS UP*'],
-	':>': 'biggrin.png',
+	'hugleft.png': ['(})'],
-	'(T)': 'phone.png',
+	'brheart.png': ['</3', '(U)'],
-	':-S': 'frowning.png',
+	'flower.png': ['@}->--', '(F)'],
-	':-P': 'tongue.png',
+	'drink.png': ['(D)'],
-	'(H)': 'coolglasses.png',
+	'phone.png': ['(T)'],
-	'(D)': 'drink.png',
+	'coffee.png': ['(C)'],
-	':-O': 'oh.png',
+	'hugright.png': ['({)'],
-	'(C)': 'coffee.png',
+	'star.png': ['(*)'],
-	'({)': 'hugright.png',
+	'rainbow.png': ['(R)'],
-	'(*)': 'star.png',
+	'cigarette.gif': ['(ci)'],
-	'B-)': 'coolglasses.png',
+	'cake.gif': ['(^)'],
-	'(Z)': 'boy.png',
+	'dontknow.gif': [':^)'],
-	'(X)': 'girl.png',
+	'eyeroll.gif': ['8-)'],
-	'(E)': 'mail.png',
+	'lightning.gif': ['(li)'],
-	'(N)': 'thumbdown.png',
+	'party.gif': ['<:o)'],
-	'(P)': 'photo.png',
+	'sleepy.gif': ['|-)'],
-	'(K)': 'kiss.png',
+	'think.gif': ['*-)'],
-	':-*': 'kiss.png',
+	'puke.gif': [':-!'],
-	':*': 'kiss.png',
-	'(R)': 'rainbow.png',
-	':-|': 'stare.png',
-	'(6)': 'devil.png',
-	'>:)': 'devil.png',
-	'>:-)': 'devil.png',
-	'(L)': 'heart.png',
-	'<3': 'heart.png',
-	'(W)': 'brflower.png',
-	':|': 'stare.png',
-	':O': 'oh.png',
-	':S': 'frowning.png',
-	':-(': 'unhappy.png',
-	'8-)': 'coolglasses.png',
-	'(B)': 'beer.png',
-	':D': 'biggrin.png',
-	'(8)': 'music.png',
-	':@': 'angry.png',
-	'B)': 'coolglasses.png',
-	':-$': 'blush.png',
-	':->': 'biggrin.png',
-	'(I)': 'lamp.png',
-	':P': 'tongue.png',
-	'(%)': 'cuffs.png',
-	'(S)': 'moon.png',
 }
 
+# vim: se ts=3:

data/emoticons/static-big/emoticons.py

@@ -1,85 +1,45 @@
+# coding=utf-8
 emoticons = {
-	':-)': 'smile.png',
+	'smile.png': [':-)', ':)'],
-	':)': 'smile.png',
+	'coolglasses.png': ['8-)', 'B-)', '(H)'],
-#
+	'wink.png': [';-)', ';)'],
-	'B-)': 'coolglasses.png',
+	'biggrin.png': [':-D', ':D'],
-	'8-)': 'coolglasses.png',
+	'unhappy.png': [':-(', ':('],
-#
+	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	';-)': 'wink.png',
+	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	';)': 'wink.png',
+	'blush.png': [':-$', ':$'],
-#	
+	'angry.png': [':-@', ':@'],
-	':-D': 'biggrin.png',
+	'bat.png': [':-[', ':['],
-	':->': 'biggrin.png',
+	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	':D': 'biggrin.png',
+	'stare.png': [':-|', ':|'],
-	':>': 'biggrin.png',
+	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'xD': 'biggrin.png',	
+	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-#	
+	'oh.png': ['=-O', ':-O', ':O'],
-	':-(': 'unhappy.png',
+	'heart.png': ['<3', '(L)', '*IN LOVE*'],
-	':(': 'unhappy.png',
+	'lion.png': [':3', '>:3'],
-#
+	'pussy.png': ['(@)', '=^.^='],
-	":'(": 'cry.png',
+	'cuffs.png': ['(%)'],
-	';-(': 'cry.png',
+	'moon.png': ['(S)'],
-	';(': 'cry.png',
+	'lamp.png': ['(I)'],
-	";'-(": 'cry.png',
+	'music.png': ['(8)'],
-#			
+	'beer.png': ['(B)', '*DRINK*'],
-	':-/': 'frowning.png',
+	'brflower.png': ['(W)'],
-	':/': 'frowning.png',
+	'boy.png': ['(Z)'],
-	':-S': 'frowning.png',
+	'girl.png': ['(X)'],
-	':S': 'frowning.png',
+	'mail.png': ['(E)'],
-#	
+	'thumbdown.png': ['(N)'],
-	':-$': 'blush.png',
+	'photo.png': ['(P)'],
-	':$': 'blush.png',
+	'thumbup.png': ['(Y)', '*THUMBS UP*'],
-#	
+	'hugleft.png': ['(})'],
-	':-@': 'angry.png',
+	'brheart.png': ['</3', '(U)'],
-	':@': 'angry.png',
+	'flower.png': ['@}->--', '(F)'],
-#	
+	'drink.png': ['(D)'],
-	':-[': 'bat.png',
+	'phone.png': ['(T)'],
-#
+	'coffee.png': ['(C)'],
-	':-*': 'kiss.png',
+	'hugright.png': ['({)'],
-	':*': 'kiss.png',
+	'star.png': ['(*)'],
-#	
+	'rainbow.png': ['(R)'],
-	':-|': 'stare.png',
+	'puke.png': [':-!'],
-	':|': 'stare.png',
-#
-	'>:-)': 'devil.png',
-	'>:)': 'devil.png',
-#
-	':-P': 'tongue.png',
-	':P': 'tongue.png',
-#	
-	':-O': 'oh.png',
-	':O': 'oh.png',
-#
-	'<3': 'heart.png',
-#		
-	':-[': 'bat.png',
-	':[': 'bat.png',
-#
-	#MSN ones
-	'(@)': 'pussy.png',
-	'(%)': 'cuffs.png',
-	'(S)': 'moon.png',
-	'(I)': 'lamp.png',
-	'(8)': 'music.png',
-	'(B)': 'beer.png',
-	'(L)': 'heart.png',
-	'(6)': 'devil.png',
-	'(W)': 'brflower.png',
-	'(Z)': 'boy.png',
-	'(X)': 'girl.png',
-	'(E)': 'mail.png',
-	'(N)': 'thumbdown.png',
-	'(P)': 'photo.png',
-	'(K)': 'kiss.png',
-	'(Y)': 'thumbup.png',
-	'(})': 'hugleft.png',
-	'(U)': 'brheart.png',
-	'(F)': 'flower.png',
-	'(H)': 'coolglasses.png',
-	'(D)': 'drink.png',
-	'(T)': 'phone.png',
-	'(C)': 'coffee.png',
-	'({)': 'hugright.png',
-	'(*)': 'star.png',
-	'(R)': 'rainbow.png',
 }
+
+# vim: se ts=3:

data/emoticons/static/emoticons.py

@@ -1,85 +1,45 @@
+# coding=utf-8
 emoticons = {
-	':-)': 'smile.png',
+	'smile.png': [':-)', ':)'],
-	':)': 'smile.png',
+	'coolglasses.png': ['8-)', 'B-)', '(H)'],
-#
+	'wink.png': [';-)', ';)'],
-	'B-)': 'coolglasses.png',
+	'biggrin.png': [':-D', ':D'],
-	'8-)': 'coolglasses.png',
+	'unhappy.png': [':-(', ':('],
-#
+	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	';-)': 'wink.png',
+	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	';)': 'wink.png',
+	'blush.png': [':-$', ':$'],
-#	
+	'angry.png': [':-@', ':@'],
-	':-D': 'biggrin.png',
+	'bat.png': [':-[', ':['],
-	':->': 'biggrin.png',
+	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	':D': 'biggrin.png',
+	'stare.png': [':-|', ':|'],
-	':>': 'biggrin.png',
+	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'xD': 'biggrin.png',	
+	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-#	
+	'oh.png': ['=-O', ':-O', ':O'],
-	':-(': 'unhappy.png',
+	'heart.png': ['<3', '(L)', '*IN LOVE*'],
-	':(': 'unhappy.png',
+	'lion.png': [':3', '>:3'],
-#
+	'pussy.png': ['(@)', '=^.^='],
-	":'(": 'cry.png',
+	'cuffs.png': ['(%)'],
-	';-(': 'cry.png',
+	'moon.png': ['(S)'],
-	';(': 'cry.png',
+	'lamp.png': ['(I)'],
-	";'-(": 'cry.png',
+	'music.png': ['(8)'],
-#			
+	'beer.png': ['(B)', '*DRINK*'],
-	':-/': 'frowning.png',
+	'brflower.png': ['(W)'],
-	':/': 'frowning.png',
+	'boy.png': ['(Z)'],
-	':-S': 'frowning.png',
+	'girl.png': ['(X)'],
-	':S': 'frowning.png',
+	'mail.png': ['(E)'],
-#	
+	'thumbdown.png': ['(N)'],
-	':-$': 'blush.png',
+	'photo.png': ['(P)'],
-	':$': 'blush.png',
+	'thumbup.png': ['(Y)', '*THUMBS UP*'],
-#	
+	'hugleft.png': ['(})'],
-	':-@': 'angry.png',
+	'brheart.png': ['</3', '(U)'],
-	':@': 'angry.png',
+	'flower.png': ['@}->--', '(F)'],
-#	
+	'drink.png': ['(D)'],
-	':-[': 'bat.png',
+	'phone.png': ['(T)'],
-#
+	'coffee.png': ['(C)'],
-	':-*': 'kiss.png',
+	'hugright.png': ['({)'],
-	':*': 'kiss.png',
+	'star.png': ['(*)'],
-#	
+	'rainbow.png': ['(R)'],
-	':-|': 'stare.png',
+	'puke.png': [':-!'],
-	':|': 'stare.png',
-#
-	'>:-)': 'devil.png',
-	'>:)': 'devil.png',
-#
-	':-P': 'tongue.png',
-	':P': 'tongue.png',
-#	
-	':-O': 'oh.png',
-	':O': 'oh.png',
-#
-	'<3': 'heart.png',
-#		
-	':-[': 'bat.png',
-	':[': 'bat.png',
-#
-	#MSN ones
-	'(@)': 'pussy.png',
-	'(%)': 'cuffs.png',
-	'(S)': 'moon.png',
-	'(I)': 'lamp.png',
-	'(8)': 'music.png',
-	'(B)': 'beer.png',
-	'(L)': 'heart.png',
-	'(6)': 'devil.png',
-	'(W)': 'brflower.png',
-	'(Z)': 'boy.png',
-	'(X)': 'girl.png',
-	'(E)': 'mail.png',
-	'(N)': 'thumbdown.png',
-	'(P)': 'photo.png',
-	'(K)': 'kiss.png',
-	'(Y)': 'thumbup.png',
-	'(})': 'hugleft.png',
-	'(U)': 'brheart.png',
-	'(F)': 'flower.png',
-	'(H)': 'coolglasses.png',
-	'(D)': 'drink.png',
-	'(T)': 'phone.png',
-	'(C)': 'coffee.png',
-	'({)': 'hugright.png',
-	'(*)': 'star.png',
-	'(R)': 'rainbow.png',
 }
+
+# vim: se ts=3: