Merge lp:~robru/gwibber/friends into lp:~barry/gwibber/py3

[Robert Bruce Park]

Not sure if this is where you want this merged, but all tests are passing and things are generally awesome. Let me know how you want to proceed with this ;-)

=== modified file '.bzrignore'
--- .bzrignore	2012-08-16 21:13:30 +0000
+++ .bzrignore	2012-10-12 20:27:19 +0000
@@ -1,211 +1,5 @@
-unknown:
-.bzrignore
-gwibber/semantic.cache
-semantic.cache
-*.gmo
-*.lo
-*.mo
-ABOUT-NLS
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-gnome-doc-utils.make
-gtk-doc.make
-install-sh
-intltool-*
-libtool
-ltmain.sh
-m4/
-missing
-stamp-h1
-bindings/Makefile
-bindings/Makefile.in
-bindings/mono/Makefile
-bindings/mono/Makefile.in
-bindings/mono/gwibber/AssemblyInfo.cs
-bindings/mono/gwibber/Makefile
-bindings/mono/gwibber/Makefile.in
-bindings/mono/gwibber/generated/
-bindings/mono/gwibber/generated-stamp
-bindings/mono/gwibber/gwibber-api.middle
-bindings/mono/gwibber/gwibber-api.raw
-bindings/mono/gwibber/gwibber-api.xml
-bindings/mono/gwibber/gwibber-sharp.dll
-bindings/mono/gwibber/gwibber-sharp.dll.config
-bindings/mono/gwibber-gtk/AssemblyInfo.cs
-bindings/mono/gwibber-gtk/Makefile
-bindings/mono/gwibber-gtk/Makefile.in
-bindings/mono/gwibber-gtk/gwibber-gtk-sharp.dll.config
-client/.deps/
-client/.libs/
-client/Makefile
-client/Makefile.in
-client/gwibber-client
-client/gwibber-client.c
-client/gwibber-preferences
-client/gwibber-preferences.c
-client/gwibber_client_vala.stamp
-client/gwibber_preferences_vala.stamp
-client/home-item.c
-client/tab-bar-item.c
-client/tab-bar.c
-client/data/Makefile
-client/data/Makefile.in
-client/data/gwibber.desktop
-client/data/gwibber.desktop.in
-client/data/org.gwibber.gschema.valid
-client/data/org.gwibber.gschema.xml
-client/data/org.gwibber.gschema.xml.in
-data/Makefile
-data/Makefile.in
-docs/Makefile
-docs/Makefile.in
-docs/libgwibber/.libs/
-docs/libgwibber/Makefile
-docs/libgwibber/Makefile.in
-docs/libgwibber/html/
-docs/libgwibber/html-build.stamp
-docs/libgwibber/html.stamp
-docs/libgwibber/libgwibber-decl-list.txt
-docs/libgwibber/libgwibber-decl.txt
-docs/libgwibber/libgwibber-docs.sgml
-docs/libgwibber/libgwibber-overrides.txt
-docs/libgwibber/libgwibber-sections.txt
-docs/libgwibber/libgwibber-undeclared.txt
-docs/libgwibber/libgwibber-undocumented.txt
-docs/libgwibber/libgwibber-unused.txt
-docs/libgwibber/libgwibber.args
-docs/libgwibber/libgwibber.hierarchy
-docs/libgwibber/libgwibber.interfaces
-docs/libgwibber/libgwibber.prerequisites
-docs/libgwibber/libgwibber.signals
-docs/libgwibber/libgwibber.types
-docs/libgwibber/scan-build.stamp
-docs/libgwibber/sgml-build.stamp
-docs/libgwibber/sgml.stamp
-docs/libgwibber/tmpl/
-docs/libgwibber/tmpl-build.stamp
-docs/libgwibber/tmpl.stamp
-docs/libgwibber/version.xml
-docs/libgwibber/xml/
-docs/libgwibber-gtk/.libs/
-docs/libgwibber-gtk/Makefile
-docs/libgwibber-gtk/Makefile.in
-docs/libgwibber-gtk/html/
-docs/libgwibber-gtk/html-build.stamp
-docs/libgwibber-gtk/html.stamp
-docs/libgwibber-gtk/libgwibber-gtk-decl-list.txt
-docs/libgwibber-gtk/libgwibber-gtk-decl-list.txt.bak
-docs/libgwibber-gtk/libgwibber-gtk-decl.txt
-docs/libgwibber-gtk/libgwibber-gtk-decl.txt.bak
-docs/libgwibber-gtk/libgwibber-gtk-docs.sgml
-docs/libgwibber-gtk/libgwibber-gtk-overrides.txt
-docs/libgwibber-gtk/libgwibber-gtk-sections.txt
-docs/libgwibber-gtk/libgwibber-gtk-undeclared.txt
-docs/libgwibber-gtk/libgwibber-gtk-undocumented.txt
-docs/libgwibber-gtk/libgwibber-gtk-unused.txt
-docs/libgwibber-gtk/libgwibber-gtk.args
-docs/libgwibber-gtk/libgwibber-gtk.hierarchy
-docs/libgwibber-gtk/libgwibber-gtk.interfaces
-docs/libgwibber-gtk/libgwibber-gtk.prerequisites
-docs/libgwibber-gtk/libgwibber-gtk.signals
-docs/libgwibber-gtk/libgwibber-gtk.types
-docs/libgwibber-gtk/scan-build.stamp
-docs/libgwibber-gtk/sgml-build.stamp
-docs/libgwibber-gtk/sgml.stamp
-docs/libgwibber-gtk/tmpl/
-docs/libgwibber-gtk/tmpl-build.stamp
-docs/libgwibber-gtk/tmpl.stamp
-docs/libgwibber-gtk/version.xml
-docs/libgwibber-gtk/xml/
-lens/Makefile
-lens/Makefile.in
-lens/data/Makefile
-lens/data/Makefile.in
-lens/data/unity-lens-gwibber.service
-lens/src/.deps/
-lens/src/.libs/
-lens/src/Makefile
-lens/src/Makefile.in
-lens/src/daemon.c
-lens/src/main.c
-lens/src/schemas.c
-lens/src/unity-lens-gwibber
-lens/src/unity_lens_gwibber.vala.stamp
-libgwibber/.deps/
-libgwibber/.libs/
-libgwibber/Makefile
-libgwibber/Makefile.in
-libgwibber/account.c
-libgwibber/accounts.c
-libgwibber/connection.c
-libgwibber/gwibber-0.1.vapi
-libgwibber/gwibber.h
-libgwibber/libgwibber.la
-libgwibber/libgwibber_la-account.lo
-libgwibber/libgwibber_la-accounts.lo
-libgwibber/libgwibber_la-connection.lo
-libgwibber/libgwibber_la-messages.lo
-libgwibber/libgwibber_la-service.lo
-libgwibber/libgwibber_la-stream-model-schema.lo
-libgwibber/libgwibber_la-streams.lo
-libgwibber/libgwibber_la-urlshorten.lo
-libgwibber/libgwibber_la-utils.lo
-libgwibber/libgwibber_la_vala.stamp
-libgwibber/messages.c
-libgwibber/service.c
-libgwibber/stream-model-schema.c
-libgwibber/streams.c
-libgwibber/urlshorten.c
-libgwibber/utils.c
-libgwibber-gtk/.deps/
-libgwibber-gtk/.libs/
-libgwibber-gtk/Makefile
-libgwibber-gtk/Makefile.in
-libgwibber-gtk/entry.c
-libgwibber-gtk/gwibber-gtk-0.1.vapi
-libgwibber-gtk/gwibber-gtk.h
-libgwibber-gtk/libgwibber-gtk.la
-libgwibber-gtk/libgwibber_gtk_la-entry.lo
-libgwibber-gtk/libgwibber_gtk_la-stream-view-tile.lo
-libgwibber-gtk/libgwibber_gtk_la-stream-view.lo
-libgwibber-gtk/libgwibber_gtk_la_vala.stamp
-libgwibber-gtk/stream-view-tile.c
-libgwibber-gtk/stream-view.c
-po/.intltool-merge-cache
-po/Makefile
-po/Makefile.in
-po/Makefile.in.in
-po/Makevars.template
-po/POTFILES
-po/Rules-quot
-po/boldquot.sed
-po/[e-mail]
-po/[e-mail]
-po/insert-header.sin
-po/quot.sed
-po/remove-potcdate.sin
-po/stamp-it
-vapi/Makefile
-vapi/Makefile.in
-client/*.v
-client/private-item.c
-client/replies-item.c
-client/attachments-item.c
-client/tab-bar-widgets.c
 __pycache__
-gwibber/build
-gwibber/dist
-gwibber/gwibber.egg-info
+*.pyc
+*.egg-info
+build
+dist

=== removed file 'AUTHORS'
--- AUTHORS	2011-06-18 02:54:49 +0000
+++ AUTHORS	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Ken VanDine <[e-mail]>

=== modified file 'COPYING'
--- COPYING	2007-06-06 08:18:03 +0000
+++ COPYING	2012-10-12 20:27:19 +0000
@@ -1,339 +1,619 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  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 Lesser General Public License instead.)  You can apply it to
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+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
-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.
+them 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.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+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
-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.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+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 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
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+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.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+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.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+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.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+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.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  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
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+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
-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
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
-
-	    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
-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
-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
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    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 Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-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 Lesser General
-Public License instead of this License.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  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.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  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.

=== removed file 'COPYING.GPL-3'
--- COPYING.GPL-3	2011-06-18 02:54:49 +0000
+++ COPYING.GPL-3	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

=== removed file 'COPYING.LGPL-2.1'
--- COPYING.LGPL-2.1	2011-04-14 03:03:24 +0000
+++ COPYING.LGPL-2.1	1970-01-01 00:00:00 +0000
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-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 and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, 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 library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete 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 distribute a copy of this License along with the
-Library.
-
-  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 Library or any portion
-of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-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 Library, 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 Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you 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.
-
-  If distribution of 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 satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be 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.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library 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.
-
-  9. 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 Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-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 with
-this License.
-

-  11. 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 Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library 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 Library.
-
-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.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library 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.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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 Library
-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 Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-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
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. 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 LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-

-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-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 the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

=== removed file 'ChangeLog'
=== removed file 'HACKING'
--- HACKING	2011-06-18 02:54:49 +0000
+++ HACKING	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== removed file 'INSTALL'
--- INSTALL	2012-02-15 08:08:54 +0000
+++ INSTALL	1970-01-01 00:00:00 +0000
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

=== renamed file 'gwibber/Makefile' => 'Makefile'
--- gwibber/Makefile	2012-09-13 17:23:47 +0000
+++ Makefile	2012-10-12 20:27:19 +0000
@@ -1,8 +1,9 @@
-# Copyright (C) 2012 Canonical Ltd
+# friends-service -- send & receive messages from any social network
+# Copyright (C) 2012  Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +20,8 @@
 	python3 setup.py install
 
 venv:
-	virtualenv --clear --system-site-packages -p python3 /tmp/gwib
-	/tmp/gwib/bin/python3 setup.py install
+	virtualenv --clear --system-site-packages -p python3 /tmp/friends
+	/tmp/friends/bin/python3 setup.py install
 
 check_all: venv
-	/tmp/gwib/bin/python3 -m unittest discover -vv
+	/tmp/friends/bin/python3 -m unittest discover -vv

=== removed file 'Makefile.am'
--- Makefile.am	2012-05-21 20:04:52 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-SUBDIRS = man bin gwibber data libgwibber libgwibber-gtk vapi po client examples
-
-if HAVE_UNITY
-SUBDIRS += lens
-endif
-
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-	gwibber-@GWIBBER_API_VERSION@.pc \
-	gwibber-gtk-@GWIBBER_API_VERSION@.pc
-
-# Test reports
-.PHONY: check-report
-check-report:
-	$(MAKE) -C tests/ $(@)
-
-# Distribute pot file
-update-pot:
-	$(MAKE) -C po "$(GETTEXT_PACKAGE).pot"
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-introspection --enable-maintainer-flags=no --enable-unity
-
-DIST_SUBDIRS = ${SUBDIRS} tests
-
-DISTCLEANFILES = \
-	gwibber-@GWIBBER_API_VERSION@.pc \
-	gwibber-gtk-@GWIBBER_API_VERSION@.pc \
-	intltool-extract \
-	intltool-merge \
-	intltool-update
-EXTRA_DIST = \
-	gwibber-@GWIBBER_API_VERSION@.pc.in \
-	gwibber-gtk-@GWIBBER_API_VERSION@.pc.in \
-	autogen.sh \
-	COPYING.GPL-3 \
-	COPYING.LGPL-2.1 \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in
-
-dist-hook: update-pot
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating ChangeLog && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
-				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-				|| (rm -f ChangeLog.tmp; \
-					echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo Failed to generate ChangeLog: not a branch >&2; \
-	fi

=== removed file 'NEWS'
--- NEWS	2012-09-20 04:56:46 +0000
+++ NEWS	1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-NEW in 3.5.90 (09/20/2012)
-============
-  * Add support for Unity Previews, required libunity >= 6.5.1
-  * Translate gwibber.application (LP: #1052375)
-
-NEW in 3.5.4 (08/27/2012)
-============
-  * Ported from libindicate to libmessaging-menu, thanks to Lars Uebernickel
-
-NEW in 3.5.3 (08/21/2012)
-============
-  * Fixed all the GTK warnings, thanks to Jeff Licquia
-  * Ported to Ubuntu Online Accounts and removed gwibber-accounts
-    - New build dependencies include libsignon-glib and libaccounts-glib and 
-      runtime dependencies include gir1.2-accounts-1.0 and gir1.2-signon-1.0
-      plus the account plugins:
-        * account-plugin-facebook
-        * account-plugin-twitter
-        * account-plugin-identica
-        * account-plugin-flickr
-        * account-plugin-foursquare
-
-NEW in 3.5.2 (06/14/2012)
-============
-  * New twitter icons better matching twitter's guidelines, thanks 
-    Mark Tully (LP: #1012408)
-  * foursquare: Changed to using urls based off Foursquare user ids rather than
-    'canonicalurl' due to 'canonicalurl' being removed from Foursquare's 
-    API (LP: #1012231)
-  * foursquare: Added support for displaying 'likes' (new to Foursquare API)
-
-NEW in 3.5.1 (06/10/2012)
-============
- * facebook: Handle unicode characters everywhere we set the username (LP: #938667)
- * Fixed example-vala.vala send examples
- * Added inline python docs (Mark Tully) (LP: #576817)
- * removed the unused source for the mono bindings
-
-NEW in 3.5.0 (05/22/2012)
-============
-  * removed unused service icons for jaiku and brightkite
-  * removed unsupported service plugins: digg, friendfeed, pingfm, qaiku 
-    and buzz
-  * Convert all mx.DateTime use to built-in datetime module.  mx won't get 
-    ported to python3 (Barry Warsaw) (LP: #990145)
-  * libgwibber-gtk: Fixed up the GwibberGtkEntry widget's alignment and 
-    icon search path
-
-NEW in 3.4.1 (04/25/2012)
-============
-  * Use matching icons for unity lens categories
-  * catch GLib.GError instead of GLib.Error (LP: #940182)
-  * fallback to displaying full sender's name if the nickname is empty, 
-    even if show-fullname is false (LP: #985801)
-  * foursquare: Don't crash on unicode characters in a users fullname, thanks 
-    to Raza Sayed (LP: #975437)
-  * Defer calling unset on the seen HashMap until after we are done iterating 
-    it, it will resize making the iterator invalid.  (LP: #959068)
-    This is fixed in the 0.7 series of libgee
-  * Specify /usr/bin/python in gwibber-accounts instead of relying on 
-    env (LP: #988385)
-
-NEW in 3.4.0 (04/03/2012)
-============
-  * Check shorten-urls setting in the dispatcher before attempting to 
-    shorten, patch thanks to Martin T. (LP: #896639)
-  * Removing unnecessary 'Image' link from entries with images obtained 
-    through imgpreview() (Mark Tully) (LP: #966285)
-  * Replace all instances of a hashtag's occurance in a tweet at once 
-    rather than one at a time (Mark Tully) (LP: #966467)
-  * Replace all instances of a nick's occurance in a tweet at once rather 
-    than one at a time (Mark Tully) (LP: #966467)
-  * Catch errors from creating the pixbuf separately from sending the 
-    notification (LP: #940182)
-  * Encode URLs to UTF8 before using them. (LP: #954374)
-
-NEW in 3.3.93 (03/21/2012)
-============
-  * more fallbacks for dupe detection, try with link_name, image_name, 
-    and video_name (LP: #826323)
-  * Protect against trying to create a pixbuf from an icon that doesn't 
-    exist (LP: #949395)
-
-NEW in 3.3.92 (03/15/2012)
-============
-  * determine if we are DST or not, and set isdst in the time struct.  This 
-    fixes the time delta being off by an hour for DST.
-  * Make sure we don't keep references to Dee.ModelIter that has been 
-    removed (LP: #937607)
-  * Use the SHA1 hash of the avatar URL instead of simply stripping the 
-    slashes, to avoid the resulting filename being too long to be created 
-    on ecryptfs volumes.  (James Tait) (LP: #845374)
-  * improved error handling to UrlLib2Downloader (David Klasinc) (LP: #946049)
-  * facebook: try to handle data from facebook of type=question to 
-    prevent empty posts in the feed
-  * since gtk+ 3.3.18 scroll events are getting blocked in the Gtk.Label 
-    for message, so we need to add the event mask for it.
-
-
-NEW in 3.3.91 (03/08/2012)
-============
- * Fix duplicate detection by falling back to comparing html, 
-   link_description, image_url and video_url (LP: #933694)
- * Fixed account migration path from 2.32 (desktopcouch) to 
-   3.4 (sqlite) (LP: #740494) 
- * gwibber-accounts crashed with TypeError in function(): Item 0: must 
-   be a subtype of gi.Boxed  (LP: #936071)
- * Fixed position tracking so page down and page up move the 
-   appropriate number of tiles (LP: #629420)
- * more escaping of text that pango markup can't support
- * twitter: Use Twitter entities, improves getting hashtags, mentions,
-   links, images, and videos.  Thanks to Mark Tully (LP: #948092)
-
-
-NEW in 3.3.90 (02/23/2012)
-============
-
- * foursquare: display comments on checkins (Mark Tully)
- * Update LINGUAS to use all the provided translations (Robert Ancell)
- * make the messages stream default on startup
- * Updated favorite information to include if you liked a post
- * facebook: fixed dupes and empty posts (LP: #826323)
-
-
-NEW in 3.3.6 (02/16/2012)
-============
-
- * Translation fixes from Gabor Kelemen (LP: #926665)
- * Shutdown the service when using Quit from the menu if the unity lens
-   isn't running. (LP: #923863)
- * Make searching in the lens faster using Dee's TreeIndex (Michal Hruby)
- * New StatusBar widget that will be used for displaying errors and other
-   information in the future, right now it is only wired up to the 
-   LoadingStarted and LoadingComplete signals.
-
-
-NEW in 3.3.5 (02/15/2012)
-============
-
-No more dependency on the static python bindings for webkit-gtk2, 
-gwibber-accounts now uses GIR and webkit-gtk3
-
-Now requires gir1.2-gnomekeyring-1.0 and gir1.2-webkit-3.0
-
-
-NEW in 3.3.4 (02/14/2012)
-============
-
-Completed dropped python multiprocessing and refactored the service threading. 
-Including improving ability to catch individual operation failures.
-
-Bugs fixed:
- - Can't response or write to someone from their user information 
-   page (LP: #926081)
- - "Repeat"ing a status on StatusNet fails silently (Scott Sweeny) (LP: #923144)
-
-
-NEW in 3.3.3 (01/30/2012)
-============
-
-Greatly improved scrolling, but still not smooth scrolling.  Inline comments 
-and image previews are now enclosed in a Gtk.Expander and only load when 
-expanded.  This prevents the tiles resizing while scrolling and 
-greatly improves performance while scrolling.
-
-Cleaned up all the Gtk 3.3 deprecations
-
-Now requires valac-0.16
-
-Bugs fixed:
- - Fixed a memory leak in ActionBoxItem (LP: #909085)
- - Fixed race conditions in async image loading while scrolling (LP: #911619)
- - Hide window while gwibber exits (Michal Hruby) 
- - Improved scrolling by enclosing comments and image previews in a
-   Gtk.Expander, this fixes the tiles resizing while scrolling (LP: #875348)
-
-
-NEW in 3.3.2 (01/13/2012)
-============
-
-Now requires libunity >= 5.0.0 and libdee >= 1.0.0
-
-* The gwibber-service now uses significantly less power by ensuring the 
-  multiprocessing pool is closed when operations are complete.  
-* GtkSpell pkgconfig name has been renamed to gtkspell-3.0
-
-Bugs fixed:
- - Cancel async image loading on tile reset, this actually breaks image 
-   loading but prevents crashing with gtk >= 3.3.6 (LP: #911619)
- - The x people liked this string should use plurals. (LP: #863039)
- - gwibber-service has a child that polls at 10Hz which is causing a lot 
-   of wakeup events Remove (LP: #906916)
- - Fixed disabling of gtkspell in build system (LP: #834780)
- - Renamed gtkspell-3.0 pkgconfig now that upstream has merged gtk3 
-   support (LP: #860648)

=== removed file 'README'
--- README	2012-05-11 06:22:23 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-Installing Gwibber
-==================
-
-  Requirements
-  ------------
-
-	Please note that the version numbers listed below only reflect my test
-	environment. Gwibber is known to work with those specific versions, but
-	will probably work fine on most current desktop distributions that include
-	Python's WebKit GTK+ bindings.
-
-    * python (2.5)
-    * python-dbus (0.80.2)
-    * python-gtk2 (2.10.4)
-    * python-gconf (2.18.0)
-    * python-imaging (1.1.6)
-    * python-notify (0.1.1)
-    * python-webkitgtk (1.0.1)
-    * python-simplejson (1.9.1)
-    * python-distutils-extra
-    * python-feedparser (4.1)
-    * python-xdg (0.15)
-    * python-mako (0.2.2)
-    * python-pycurl
-
-  Installation
-  ------------
-
-	Gwibber uses Python's distutils framework for installation. In order to
-	install Gwibber, you will need root access. To install Gwibber, perform
-	the following command as root:
-
-      $ python setup.py install
-
-  Run Gwibber
-  -----------
-
-	If you installed Gwibber using the setup.py script, you can launch the
-	program by typing "gwibber" at the command line. If you want to run
-	Gwibber without installing it, start "bin/gwibber" from within the
-	Gwibber directory.
-
-  Testing
-  -------
-
-        You can run the dbus isolated tests by cd'ing into the tests directory
-        and running `make check`.
-
-        You can run the Python unittests by cd'ing into tests/python/unittests
-        and running `PYTHONPATH=../../.. python -m unittest discover -v`

=== removed file 'acinclude.m4'
--- acinclude.m4	2012-01-19 05:21:16 +0000
+++ acinclude.m4	1970-01-01 00:00:00 +0000
@@ -1,268 +0,0 @@
-## ------------------------
-## Python file handling
-## From Andrew Dalke
-## Updated by James Henstridge
-## ------------------------
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# 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, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 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
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-
-# Adds support for distributing Python modules and packages.  To
-# install modules, copy them to $(pythondir), using the python_PYTHON
-# automake variable.  To install a package with the same name as the
-# automake package, install to $(pkgpythondir), or use the
-# pkgpython_PYTHON automake variable.
-
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
-# locations to install python extension modules (shared libraries).
-# Another macro is required to find the appropriate flags to compile
-# extension modules.
-
-# If your package is configured with a different prefix to python,
-# users will have to add the install directory to the PYTHONPATH
-# environment variable, or create a .pth file (see the python
-# documentation for details).
-
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
-# cause an error if the version of python installed on the system
-# doesn't meet the requirement.  MINIMUM-VERSION should consist of
-# numbers and dots only.
-
-AC_DEFUN([AM_PATH_PYTHON],
- [
-  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
-  dnl supported because the default installation locations changed from
-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
-  dnl in 1.5.
-  m4_define([_AM_PYTHON_INTERPRETER_LIST],
-            [python python2 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0 python1.6 python1.5])
-
-  m4_if([$1],[],[
-    dnl No version check is needed.
-    # Find any Python interpreter.
-    if test -z "$PYTHON"; then
-      PYTHON=:
-      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
-    fi
-    am_display_PYTHON=python
-  ], [
-    dnl A version check is needed.
-    if test -n "$PYTHON"; then
-      # If the user set $PYTHON, use it and don't search something else.
-      AC_MSG_CHECKING([whether $PYTHON version >= $1])
-      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-			      [AC_MSG_RESULT(yes)],
-			      [AC_MSG_ERROR(too old)])
-      am_display_PYTHON=$PYTHON
-    else
-      # Otherwise, try each interpreter until we find one that satisfies
-      # VERSION.
-      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
-	[am_cv_pathless_PYTHON],[
-	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
-	  test "$am_cv_pathless_PYTHON" = none && break
-	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
-	done])
-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      if test "$am_cv_pathless_PYTHON" = none; then
-	PYTHON=:
-      else
-        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
-      fi
-      am_display_PYTHON=$am_cv_pathless_PYTHON
-    fi
-  ])
-
-  if test "$PYTHON" = :; then
-  dnl Run any user-specified action, or abort.
-    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
-  else
-
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.
-
-  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-    [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
-  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-
-  dnl Use the values of $prefix and $exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
-
-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
-
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
-
-  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
-    [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
-  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
-
-
-  dnl Set up 4 directories:
-
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behavior
-  dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-    [am_cv_python_pythondir],
-    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
-  AC_SUBST([pythondir], [$am_cv_python_pythondir])
-
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
-
-  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
-
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-    [am_cv_python_pyexecdir],
-    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
-  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
-
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-
-  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
-
-  dnl Run any user-specified action.
-  $2
-  fi
-
-])
-
-
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalent (first
-# word of sys.version), in order to cope with versions such as 2.2c1.
-# hexversion has been introduced in Python 1.5.2; it's probably not
-# worth to support older versions (1.5.1 was released on October 31, 1998).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys, string
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]
-minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
-sys.exit(sys.hexversion < minverhex)"
-  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-python.m4
-
-
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
-
-
-# Check whether the Vala compiler exists in `PATH'. If it is found, the
-# variable VALAC is set. Optionally a minimum release number of the
-# compiler can be requested.
-#
-# GWIBBER_PROG_VALAC([MINIMUM-VERSION])
-# --------------------------------
-AC_DEFUN([GWIBBER_PROG_VALAC],
-[AC_PATH_PROGS([VALAC], [valac-0.16 valac], [])
- AS_IF([test -z "$VALAC"],
-   [AC_MSG_WARN([No Vala compiler found.  You will not be able to compile .vala source files.])],
-   [AS_IF([test -n "$1"],
-      [AC_MSG_CHECKING([$VALAC is at least version $1])
-       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       AS_VERSION_COMPARE([$1], ["$am__vala_version"],
-         [AC_MSG_RESULT([yes])],
-         [AC_MSG_RESULT([yes])],
-         [AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Vala $1 not found.])])])])
-])

=== removed file 'autogen.sh'
--- autogen.sh	2011-06-18 02:54:49 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-PKG_NAME="libgwibber"
-
-which gnome-autogen.sh || {
-	echo "You need gnome-common from GNOME SVN"
-	exit 1
-}
-
-USE_GNOME2_MACROS=1 \
-. gnome-autogen.sh

=== removed directory 'bin'
=== removed file 'bin/Makefile.am'
--- bin/Makefile.am	2012-06-27 03:11:35 +0000
+++ bin/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-bin_SCRIPTS = \
-	gwibber-service
-
-EXTRA_DIST = $(bin_SCRIPTS)

=== removed file 'bin/gwibber-service'
--- bin/gwibber-service	2012-08-16 14:44:52 +0000
+++ bin/gwibber-service	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-#!/usr/bin/python3
-
-from gi.repository import Gio, GLib
-import sys, optparse, dbus
-from os.path import join, dirname, exists, realpath, abspath
-from dbus.mainloop.glib import DBusGMainLoop
-
-DBusGMainLoop(set_as_default=True)
-loop = GLib.MainLoop()
-
-LAUNCH_DIR = abspath(sys.path[0])
-SOURCE_DIR = join(LAUNCH_DIR, "..", "gwibber")
-DISPATCHER = join(SOURCE_DIR, "microblog", "dispatcher.py")
-
-gsettings = Gio.Settings.new("org.gwibber.preferences")
-
-######################################################################
-# Options
-from gwibber.utils.options import Options
-
-args = Options().parser.parse_args()
-console = args.console
-debug = args.debug or gsettings.get_boolean('debug')
-
-
-######################################################################
-# Setup path
-if exists(DISPATCHER):
-  sys.path.insert(0, realpath(dirname(SOURCE_DIR)))
-  try:
-    from gwibber.utils.logging import initialize
-    initialize(console=console, debug=debug)
-    import logging
-    logger = logging.getLogger('gwibber.service')
-    logger.info("Service starting")
-    logger.info("Running from the source tree")
-    from gwibber.microblog import dispatcher
-  finally:
-    del sys.path[0]
-
-else:
-  from gwibber.utils.logging import initialize
-  import logging
-  setup_logging(console=console, debug=debuglog)
-  logger = logging.getLogger("Service")
-  logger.info("Service starting")
-  logger.info("Running from the source tree")
-  from gwibber.microblog import dispatcher
-
-# if gwibber-serivce is already running, don't start
-if "com.Gwibber.Connection" in dbus.SessionBus().list_names():
-  logger.info("Found gwibber-service already running, exiting")
-  quit()
-
-"""
-## Check to see if the database needs to be purged
-dispatcher.purge()
-
-account_monitor = dispatcher.AccountMonitor()
-stream_monitor = dispatcher.StreamMonitor()
-message_monitor = dispatcher.MessagesMonitor()
-"""
-
-logger.debug("Setting up monitors")
-connection_monitor = dispatcher.ConnectionMonitor()
-urlshortener = dispatcher.URLShorten()
-translator = dispatcher.Translate()
-uploader = dispatcher.Uploader()
-dispatcher = dispatcher.Dispatcher(loop)
-loop.run()

=== removed directory 'client'
=== removed file 'client/COPYING'
--- client/COPYING	2011-06-18 02:54:49 +0000
+++ client/COPYING	1970-01-01 00:00:00 +0000
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-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 pass on to the recipients the same
-freedoms that you received.  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.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-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.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-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.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-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.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-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.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-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.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  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.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  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.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  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
-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
-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
-    it under the terms of the GNU General Public License as published by
-    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,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU 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 Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== removed file 'client/Makefile.am'
--- client/Makefile.am	2012-06-15 10:56:26 +0000
+++ client/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-GETTEXT_PACKAGE = gwibber
-
-bin_PROGRAMS = \
-	gwibber \
-	gwibber-poster \
-        gwibber-preferences
-
-gwibber_SOURCES = \
-	gwibber-client.vala \
-	attachments-item.vala \
-	searches-item.vala \
-	users-item.vala \
-	home-item.vala \
-	private-item.vala \
-	replies-item.vala \
-	public-item.vala \
-	messages-item.vala \
-	stream-entry.vala \
-	status-bar.vala \
-	tab-bar.vala \
-	tab-bar-item.vala \
-	tab-bar-widgets.vala
-
-gwibber_CFLAGS = \
-        $(BASE_CFLAGS) \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-        -I$(top_srcdir)/libgwibber \
-        -I$(top_srcdir)/libgwibber-gtk
-
-gwibber_VALAFLAGS = \
-        -X -I$(top_srcdir)/libgwibber \
-        -X -L../libgwibber/.libs \
-        -X -I$(top_srcdir)/libgwibber-gtk \
-        -X -L../libgwibber-gtk/.libs \
-        ../libgwibber/gwibber-@GWIBBER_API_VERSION@.vapi \
-        ../libgwibber-gtk/gwibber-gtk-@GWIBBER_API_VERSION@.vapi \
-	--vapidir $(top_srcdir)/vapi \
-	--pkg accounts \
-	--pkg config \
-        --pkg json-glib-1.0 \
-        --pkg gee-1.0 \
-        --pkg gtk+-3.0 \
-	--pkg gdk-3.0 \
-        --pkg atk \
-        --pkg glib-2.0 \
-        --pkg dee-1.0 \
-        --basedir ./ \
-	$(MAINTAINER_VALAFLAGS) \
-	$(NULL)
-
-gwibber_LDADD = \
-  $(BASE_LIBS) \
-  -L../libgwibber/.libs -lgwibber \
-  -L../libgwibber-gtk/.libs -lgwibber-gtk \
-  -lpangocairo-1.0 -ldee-1.0
-
-gwibber_preferences_SOURCES = \
-        gwibber-preferences.vala
-
-gwibber_preferences_CFLAGS = \
-        $(BASE_CFLAGS) \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-        -I$(top_srcdir)/libgwibber \
-        -I$(top_srcdir)/libgwibber-gtk
-
-gwibber_preferences_VALAFLAGS = \
-	--vapidir $(top_srcdir)/vapi \
-	--pkg accounts \
-	--pkg config \
-        --pkg gtk+-3.0 \
-	--pkg gdk-3.0 \
-        --pkg atk \
-        --pkg glib-2.0 \
-        --pkg gmodule-2.0 \
-        --pkg Dbusmenu-0.4 \
-	$(MAINTAINER_VALAFLAGS) \
-	$(NULL)
-
-gwibber_preferences_LDADD = \
-        $(BASE_LIBS) 
-
-gwibber_poster_SOURCES = \
-	stream-entry.vala \
-        gwibber-poster.vala
-
-gwibber_poster_CFLAGS = \
-        $(BASE_CFLAGS) \
-        -I$(top_srcdir)/libgwibber \
-        -I$(top_srcdir)/libgwibber-gtk
-
-gwibber_poster_VALAFLAGS = \
-        -X -I$(top_srcdir)/libgwibber \
-        -X -L../libgwibber/.libs \
-        -X -I$(top_srcdir)/libgwibber-gtk \
-        -X -L../libgwibber-gtk/.libs \
-        ../libgwibber/gwibber-@GWIBBER_API_VERSION@.vapi \
-        ../libgwibber-gtk/gwibber-gtk-@GWIBBER_API_VERSION@.vapi \
-	--vapidir $(top_srcdir)/vapi \
-	--pkg accounts \
-	--pkg config \
-        --pkg json-glib-1.0 \
-        --pkg gtk+-3.0 \
-	--pkg gdk-3.0 \
-        --pkg atk \
-        --pkg glib-2.0 \
-        --pkg gee-1.0 \
-        --pkg dee-1.0 \
-        --pkg pango \
-        --basedir ./ \
-	$(MAINTAINER_VALAFLAGS) \
-	$(NULL)
-
-gwibber_poster_LDADD = \
-        $(BASE_LIBS) \
-        -L../libgwibber/.libs -lgwibber \
-        -L../libgwibber-gtk/.libs -lgwibber-gtk
-
-VALASOURCES = \
-	$(gwibber_SOURCES) \
-	$(gwibber_poster_SOURCES) \
-	$(gwibber_preferences_SOURCES)
-
-CLEANFILES = \
-  *.stamp \
-  $(VALASOURCES:.vala=.c)

=== removed file 'client/attachments-item.vala'
--- client/attachments-item.vala	2012-08-05 19:21:33 +0000
+++ client/attachments-item.vala	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- */
-
-public class AttachmentsItem : TabBarStreamItem
-{
-  private Gtk.Alignment _align;
-  private Gtk.Box box;
-
-  public AttachmentsItem (Gee.HashMap streams_map)
-  {
-    Object (stream:"images", icon_name:"gwibber-stream-attachments", tooltip:_("Attachments"), streams_map:streams_map);
-  }
-
-  construct
-  {
-
-    _align = new Gtk.Alignment (0.5f, 0.5f, 1.0f, 1.0f);
-    
-    box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
-    _align.add (box);
-
-    var images_but = new TabWidgets.RadioButton (_("Images"));
-    images_but.clicked.connect(() => {
-      if (images_but.active)
-      {
-        view.position = 0;
-        view.model = streams_map["images"];
-        view.stream = "images";
-      }
-    });
-    box.pack_start (images_but, false, false, 0);
-
-    var links_but = new TabWidgets.RadioButton (_("Links"));
-    links_but.join_group (images_but);
-    links_but.clicked.connect(() => {
-      if (links_but.active)
-      {
-        view.position = 0;
-        view.model = streams_map["links"];
-        view.stream = "links";
-      }
-    });
-    box.pack_start (links_but, false, false, 0);
-
-    var videos_but = new TabWidgets.RadioButton (_("Videos"));
-    videos_but.join_group (links_but);
-    videos_but.clicked.connect(() => {
-      if (videos_but.active)
-      {
-        view.position = 0;
-        view.model = streams_map["videos"];
-        view.stream = "videos";
-      }
-    });
-    box.pack_start (videos_but, false, false, 0);
-
-    _align.show_all ();
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return _align;
-  }
-  
-  public override Gtk.Widget? get_view ()
-  {
-    return view;
-  }
-}

=== removed file 'client/gwibber-client.vala'
--- client/gwibber-client.vala	2012-06-15 10:56:26 +0000
+++ client/gwibber-client.vala	1970-01-01 00:00:00 +0000
@@ -1,453 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Ken VanDine <[e-mail]>
- */
-
-public class Client : Gtk.Window
-{
-  private Gwibber.Streams streams_service;
-  private Gwibber.Service _service;
-  private GLib.Settings state_settings;
-  public Gee.HashMap <string, Dee.Model?> streams_map;
-  public Gee.HashMap <string, TabBarItem?> items_map;
-  public TabBar tabbar;
-  public GwibberGtk.StreamView view;
-  public Gtk.UIManager manager;
-  private StatusBar _status_bar;
-  private int _sort_order = 1;
-
-  public int sort_order {
-    get { return _sort_order; }
-    set {
-      if (value != _sort_order)
-      {
-        _sort_order = value;
-        foreach (var v in items_map.values)
-        {
-          var _view = v.get_view () as GwibberGtk.StreamView;
-          if (_view.sort_order != _sort_order)
-            _view.sort_order = _sort_order;
-        }
-      }
-    }
-  }
-
-
-  public Client ()
-  {
-    Object ();
-  }
-
-  construct
-  {
-    state_settings = new GLib.Settings ("org.gwibber.state");
-    streams_map = new Gee.HashMap<string?, Dee.Model?> ();
-    items_map = new Gee.HashMap<string?, TabBarItem?> ();
-
-    configure_event.connect (on_configure_event);
-    delete_event.connect (() => {
-      this.hide ();
-      Idle.add (() => { this.destroy (); return false; });
-      return true;
-    });
-
-    set_name(Config.PACKAGE);
-    set_icon_name("gwibber");
-    set_title("Gwibber");
-    set_wmclass("gwibber", "Gwibber");
-
-    set_default_size(400,800);
-
-    // Move to last known location and resize
-    move(state_settings.get_int("position-x"), state_settings.get_int("position-y"));
-    resize(state_settings.get_int("width"), state_settings.get_int("height"));
-
-    // Tab Bar
-    tabbar = new TabBar ();
-
-    var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-
-    _status_bar = new StatusBar ();
-    /* We don't need this yet
-    _status_bar.add_button (Gtk.Stock.OK, Gtk.ResponseType.OK);
-    _status_bar.response.connect((r) => {
-      _status_bar.showing = false;
-    });
-    */
-    main_box.pack_end (_status_bar, false, false, 0);
-    _status_bar.notify["showing"].connect (()=>
-    {
-      debug ("StatusBar showing changed");
-    });
-
-    _service = new Gwibber.Service ();
-    _service.loading_started.connect((source) => {
-      debug ("Loading started");
-      if (!_status_bar.showing)
-      {
-        _status_bar.reset ();
-        _status_bar.set_message_type (Gtk.MessageType.OTHER);
-        _status_bar.message = _("Refreshing");
-        _status_bar.showing = true;
-      }
-    });
-    _service.loading_complete.connect((source) => {
-      debug ("Loading completed");
-      if (_status_bar.showing)
-        _status_bar.showing = false;
-    });
-
-    main_box.pack_end (tabbar, true, true, 0);
-    add (main_box);
-
-    streams_service = new Gwibber.Streams ();
-
-    streams_map["home"] = streams_service.stream_filter_model (streams_service.stream_model, "home");
-
-    var home_item = new HomeItem (streams_map);
-    view = (GwibberGtk.StreamView)home_item.get_view ();
-
-    tabbar.add_item (home_item);
-    items_map["home"] = home_item;
-
-    streams_map["messages"] = streams_service.stream_filter_model (streams_service.stream_model, "messages");
-    streams_map["replies"] = streams_service.stream_filter_model (streams_service.stream_model, "replies");
-    streams_map["private"] = streams_service.stream_filter_model (streams_service.stream_model, "private");
-    streams_map["images"] = streams_service.stream_filter_model (streams_service.stream_model, "images");
-    streams_map["videos"] = streams_service.stream_filter_model (streams_service.stream_model, "videos");
-    streams_map["links"] = streams_service.stream_filter_model (streams_service.stream_model, "links");
-    streams_map["public"] = streams_service.stream_filter_model (streams_service.stream_model, "public");
-
-    var messages_item = new MessagesItem (streams_map);
-    tabbar.add_item (messages_item);
-    items_map["messages"] = messages_item;
-
-    var replies_item = new RepliesItem (streams_map);
-    tabbar.add_item (replies_item);
-    items_map["replies"] = replies_item;
-
-    var private_item = new PrivateItem (streams_map);
-    tabbar.add_item (private_item);
-    items_map["private"] = private_item;
-
-    var public_item = new PublicItem (streams_map);
-    tabbar.add_item (public_item);
-    items_map["public"] = public_item;
-
-    var attach_item = new AttachmentsItem (streams_map);
-    tabbar.add_item (attach_item);
-    items_map["attach"] = attach_item;
-
-    var searches_item = new SearchesItem (streams_service);
-    tabbar.add_item (searches_item as TabBarItem);
-    items_map["searches"] = searches_item;
-
-    searches_item.raise.connect ((item) => {
-      searches_item.clicked ();
-    });
-
-    var users_item = new UsersItem (streams_service);
-    tabbar.add_item (users_item as TabBarItem);
-    items_map["users"] = users_item;
-
-    users_item.raise.connect ((item) => {
-      users_item.clicked ();
-    });
-
-    view.notify["prepared"].connect (() => {
-        sort_order = state_settings.get_int("stream-sort-order");
-      });
-
-    state_settings.changed.connect ((key) => {
-      if (key == "stream-sort-order") {
-         if (sort_order != state_settings.get_int("stream-sort-order"))
-           sort_order = state_settings.get_int("stream-sort-order");
-      }
-    });
-    messages_item.clicked ();
-
-    Idle.add (() => {
-      var menubar = create_menus ();
-      main_box.pack_start(menubar, false, true, 0);
-      return false;
-    });
-
-  }
-
-  public Gtk.MenuBar create_menus ()
-  {
-    /**** Create menus ****/
-
-    Gtk.ActionEntry[] entries = new Gtk.ActionEntry[0];
-
-    Gtk.ActionEntry menu = {"Gwibber", null, _("_Gwibber"), null, null, null};
-    entries += menu;
-    menu = {"View", null, _("_View"), null, null, null};
-    entries += menu;
-    menu = {"Edit", null, _("_Edit"), null, null, null};
-    entries += menu;
-    menu = {"Help", null, _("_Help"), null, null, null};
-    entries += menu;
-    menu = {"refresh", Gtk.Stock.REFRESH, _("_Refresh"), "F5", null, on_refresh};
-    entries += menu;
-    menu = {"quit", Gtk.Stock.QUIT, _("_Quit"), "<ctrl>Q", null, on_quit};
-    entries += menu;
-    menu = {"sort", null, _("_Sort"), null, null, null};
-    entries += menu;
-    menu = {"accounts", null, _("_Accounts"), "<ctrl><shift>A", null,on_accounts};
-    entries += menu;
-    menu = {"preferences", Gtk.Stock.PREFERENCES, _("_Preferences"), "<ctrl>P", null, on_preferences};
-    entries += menu;
-    menu = {"about", Gtk.Stock.ABOUT, _("_About"), null, null, on_about};
-    entries += menu;
-
-    var sort_entries = new Gtk.RadioActionEntry[0];
-    Gtk.RadioActionEntry radio = {"ascending", Gtk.Stock.SORT_ASCENDING, _("_Ascending"), null, null, 0};
-    sort_entries += radio;
-    radio = {"descending", Gtk.Stock.SORT_DESCENDING, _("_Descending"), null, null, 1};
-    sort_entries += radio;
-
-    string ui = """
-    <ui>
-      <menubar name="MenuBar">
-        <menu action="Gwibber">
-          <menuitem action="refresh" />
-          <separator/>
-          <menuitem action="quit" />
-        </menu>
-
-        <menu action="View">
-          <menu action="sort">
-            <menuitem action="ascending" />
-            <menuitem action="descending" />
-          </menu>
-        </menu>
-
-        <menu action="Edit">
-          <menuitem action="accounts" />
-          <menuitem name="preferences" action="preferences" />
-        </menu>
-
-        <menu action="Help">
-          <menuitem action="about" />
-        </menu>
-      </menubar>
-    </ui>
-    """;
-
-    var main_group = new Gtk.ActionGroup("client");
-    main_group.add_actions(entries, this);
-    main_group.add_radio_actions(sort_entries, sort_order, ((a,c) => {
-      Gtk.RadioAction current = (Gtk.RadioAction) c;
-      state_settings.set_int("stream-sort-order", current.get_current_value ());
-      }));
-
-    var manager = new Gtk.UIManager();
-
-    try {
-        manager.add_ui_from_string(ui, -1);
-    } catch (Error e) { error("%s", e.message); }
-
-    manager.insert_action_group(main_group, 0);
-
-    var menubar = manager.get_widget("/MenuBar") as Gtk.MenuBar;
-    add_accel_group(manager.get_accel_group());
-
-    /**** End menu setup ****/
-    
-    return menubar;
-  }
-
-
-  static void on_refresh() {
-    var service = new Gwibber.Service();
-    service.refresh();
-  }
-
-  static void on_preferences() {
-    GLib.Pid pid;
-    try {
-    GLib.Process.spawn_async(null, {"gwibber-preferences"}, null,
-      GLib.SpawnFlags.SEARCH_PATH, null, out pid);
-    } catch {
-    }
-  }
-
-  static void on_accounts() {
-    GLib.Pid pid;
-    try {
-    GLib.Process.spawn_async(null,
-      {"gnome-control-center", "credentials", "application=gwibber"}, null,
-      GLib.SpawnFlags.SEARCH_PATH, null, out pid);
-    } catch {
-
-    }
-  }
-
-  
-  static void on_about() {
-
-    string license = _("Gwibber 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 (at your option) any later version.\n\nGwibber is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Gwibber; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA");
-
-    string[] authors = {"Ken VanDine <[e-mail]>", "Neil Jagdish Patel <[e-mail]>"};
-    var about_dialog = new Gtk.AboutDialog ();
-    about_dialog.set_program_name("Gwibber");
-    about_dialog.set_logo_icon_name("gwibber");
-    about_dialog.set_version(Config.VERSION);
-    about_dialog.set_website("http://www.gwibber.com");
-    about_dialog.set_license(license);
-    about_dialog.set_wrap_license(true);
-    about_dialog.set_authors (authors);
-    about_dialog.run ();
-    about_dialog.destroy ();
-  }
-
-  private void on_quit ()
-  {
-    destroy ();
-    var service = new Gwibber.Service();
-
-    /* Check if the unity lens is running and only shutdown the 
-    *  service if it isn't
-    */
-    bool has_owner = false;
-    try {
-      string name = "com.canonical.Unity.Lens.Gwibber";
-      DBusConnection bus = Bus.get_sync (BusType.SESSION);
-      Variant result = bus.call_sync ("org.freedesktop.DBus",
-                                      "/org/freedesktop/dbus",
-                                      "org.freedesktop.DBus",
-                                      "NameHasOwner",
-                                      new Variant ("(s)", name),
-                                      new VariantType ("(b)"),
-                                      DBusCallFlags.NO_AUTO_START,
-                                      -1);
-      result.get ("(b)", out has_owner);
-    } catch (Error e) {
-      warning ("Unable to decide if '%s' is running: %s", name, e.message);
-    }
-
-    if (!has_owner)
-    {
-      debug ("Lens isn't running");
-      service.quit ();
-    }
-
-  }
-
-  bool on_configure_event (Gdk.EventConfigure event) {
-    int width, height, x, y;
-    get_size(out width, out height);
-    get_position (out x, out y);
-    state_settings.set_int("width", width);
-    state_settings.set_int("height", height);
-    state_settings.set_int("position-x", x);
-    state_settings.set_int("position-y", y);
-    return false;
-  }
-}
-
-public class Main : Gtk.Application
-{
-  static string stream;
-
-  static Client main_window;
-
-  const OptionEntry[] options = {
-    {"stream", 's', 0, OptionArg.STRING, ref stream, N_("Stream"), N_("STREAM")},
-    {null}
-  };
-
-  public Main (string app_id, ApplicationFlags flags)
-  {
-    GLib.Object (application_id: app_id, flags: flags);
-  }
-
-  public void on_activate ()
-  {
-    if (get_windows () != null)
-      main_window.present ();
-    else
-    {
-      main_window = new Client ();
-
-      add_window (main_window);
-
-      Environment.set_application_name (Config.PACKAGE);
-
-      Gtk.IconTheme.get_default ().append_search_path (GLib.Path.build_filename (Config.PKGDATADIR, "ui/icons"));
-
-      main_window.set_application (this);
-      main_window.show_all ();
-
-      var accounts_service = new Gwibber.Accounts();
-      var accounts_list = accounts_service.list ();
-      if (accounts_list.length() == 0)
-      {
-        GLib.Pid pid;
-        try {
-          GLib.Process.spawn_async(null,
-            {"gnome-control-center", "credentials", "application=gwibber"}, null,
-          GLib.SpawnFlags.SEARCH_PATH, null, out pid);
-        } catch {
-        }
-      }
-    }
-  }
-
-  public int on_command_line (ApplicationCommandLine command_line)
-  {
-    var args = command_line.get_arguments ();
-    unowned string[] arguments = args;
-    try {
-      var context = new OptionContext (_("— Gwibber Client"));
-      context.set_help_enabled (false);
-      context.add_main_entries (options, Config.GETTEXT_PACKAGE);
-      context.parse (ref arguments);
-    }
-    catch (OptionError error) {
-      command_line.set_exit_status (1);
-    }
-
-    activate ();
-
-    var items_map = main_window.items_map;
-    if (stream != null)
-    {
-      if ((main_window.tabbar is TabBar) && (items_map[stream] is TabBarItem))
-        main_window.tabbar.on_tab_clicked(items_map[stream]);
-    }
-
-    command_line.set_exit_status (0);
-    return command_line.get_exit_status ();
-  }
-}
-
-public int main (string[] args)
-{
-  Gtk.init (ref args);
-
-  Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALE_DIR);
-  Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
-  Intl.textdomain(Config.GETTEXT_PACKAGE);
-
-  var app = new Main ("org.gwibber.client", GLib.ApplicationFlags.HANDLES_COMMAND_LINE);
-
-  app.activate.connect (app.on_activate);
-  app.command_line.connect (app.on_command_line);
-  int result = app.run (args);
-  return result;
-}

=== removed file 'client/gwibber-poster.vala'
--- client/gwibber-poster.vala	2012-05-22 03:02:46 +0000
+++ client/gwibber-poster.vala	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Ken VanDine <[e-mail]>
- */
-
-private class Poster : Gtk.Window
-{
-  private StreamEntry? _entry = null;
-  public GwibberGtk.InputTextView text_view;
-
-  public Poster ()
-  {
-    set_decorated (false);
-    set_skip_taskbar_hint (true);
-    set_has_resize_grip (false);
-    set_resizable (false);
-    
-    _entry = new StreamEntry ();
-
-    add (_entry);
-    set_position (Gtk.WindowPosition.CENTER);
-
-    text_view = _entry.text_view;
-    _entry.set_size_request (400, 100);
-    _entry.showing = true;
-    _entry.text_view.grab_focus ();
-
-    show_all ();
-
-    _entry.notify["showing"].connect (()=> {
-      if (_entry.showing == false)
-        Idle.add (() => {
-          destroy ();
-          return false;
-        });
-      });
-  }
-}
-
-public static void main (string[] args)
-{
-  Gtk.init (ref args);
-
-  string message = null;
-
-  if (args.length > 1)
-  {
-    switch (args[1]) {
-      case "--message":
-        if (args.length < 3)
-        {
-          stdout.printf("Usage: gwibber-poster --message <message>\n\n");
-          return;
-        }
-        message = args[2];
-        debug ("Message is %s", message);
-        break;
-    }
-  }
-
-  var w = new Poster ();
-  if (message != null)
-  {
-    w.text_view.get_buffer ().set_text(message);
-  }
-  w.destroy.connect(() => {
-    Gtk.main_quit();
-  });
-
-  w.focus_out_event.connect(() => {
-    w.destroy();
-    return false;
-  });
-
-  Gtk.main ();
-}

=== removed file 'client/gwibber-preferences.vala'
--- client/gwibber-preferences.vala	2012-02-11 06:18:27 +0000
+++ client/gwibber-preferences.vala	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 3, as published 
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranties of 
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Ken VanDine <[e-mail]>
- */
-
-public class GwibberPreferences : GLib.Object
-{
-    public Gtk.Builder builder;
-
-    public GwibberPreferences ()
-    {
-        Object ();
-    }
-
-    construct
-    {
-        try {
-            builder = new Gtk.Builder ();
-            builder.add_from_file ("/usr/share/gwibber/ui/gwibber-preferences-dialog.ui");
-            builder.connect_signals (null);
-            var dialog = builder.get_object ("prefs_dialog") as Gtk.Dialog;
-            dialog.set_wmclass("gwibber", "Gwibber");
-            dialog.set_title(_("Broadcast Messaging Preferences"));
-            dialog.show_all ();
-        } catch (Error e) {
-            error ("Could not load UI: %s", e.message);
-        }
-
-        var image_uploader_container = builder.get_object("image_uploader") as Gtk.Box;
-        var urlshortener_container = builder.get_object("urlshorter") as Gtk.Box;
-
-        var image_uploader_frame = builder.get_object("frame5") as Gtk.Widget;
-        image_uploader_frame.hide ();
-
-        var settings = new GLib.Settings ("org.gwibber.preferences");
-
-        var BOOL_SETTINGS = new GLib.List<string> ();
-        var INT_SETTINGS = new GLib.List<string> ();
-        var STRING_SETTINGS = new GLib.List<string> ();
-        STRING_SETTINGS.append("image-uploader");
-        STRING_SETTINGS.append("urlshorter");
-        //foreach (string key in STRING_SETTINGS) {
-        //    settings.bind(key, builder.get_object(key), "value", GLib.SettingsBindFlags.DEFAULT);
-        //}
-
-        var image_uploader = new Gtk.ComboBoxText ();
-        image_uploader.append("yfrog", "yfrog");
-        image_uploader.append("imageshack", "ImageShack");
-        image_uploader_container.add(image_uploader);
-        settings.bind("image-uploader", image_uploader, "active_id", GLib.SettingsBindFlags.DEFAULT);
-        image_uploader_container.show_all ();
-
-        image_uploader.changed.connect(() => {
-          settings.set_string("image-uploader", image_uploader.active_id);
-          });
-
-        var urlshortener = new Gtk.ComboBoxText ();
-        urlshortener.append("is.gd", "is.gd");
-        urlshortener.append("tinyurl.com", "tinyurl.com");
-        urlshortener.append("ur1.ca", "ur1.ca");
-        urlshortener.append("cli.gs", "cli.gs");
-        urlshortener_container.add(urlshortener);
-        settings.bind("urlshorter", urlshortener, "active_id", GLib.SettingsBindFlags.DEFAULT);
-        urlshortener_container.show_all ();
-
-        urlshortener.changed.connect(() => {
-          settings.set_string("urlshorter", urlshortener.active_id);
-          });
-
-        INT_SETTINGS.append("interval");
-        foreach (string key in INT_SETTINGS) {
-            settings.bind(key, builder.get_object(key), "value", GLib.SettingsBindFlags.DEFAULT);
-        }
-
-        BOOL_SETTINGS.append("no-notifications");
-        BOOL_SETTINGS.append("notify-mentions-only");
-        BOOL_SETTINGS.append("show-notifications");
-        //BOOL_SETTINGS.append("presence-check");
-        BOOL_SETTINGS.append("show-fullname");
-        BOOL_SETTINGS.append("reply-append-colon");
-        BOOL_SETTINGS.append("shorten-urls");
-        BOOL_SETTINGS.append("autostart");
-        foreach (string key in BOOL_SETTINGS) {
-            settings.bind(key, builder.get_object(key), "active", GLib.SettingsBindFlags.DEFAULT);
-        }
-    }
-
-    public void on_close_button_clicked() {
-        Gtk.main_quit();
-    }
-
-    public void on_prefs_dialog_destroy_event() {
-        Gtk.main_quit();
-    }
-}
-
-int main (string[] args) {     
-    Gtk.init (ref args);
-
-  Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALE_DIR);
-  Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
-  Intl.textdomain(Config.GETTEXT_PACKAGE);
-
-    var p = new GwibberPreferences ();
-    Gtk.main ();
-    p = null;
-
-    return 0;
-}

=== removed file 'client/home-item.vala'
--- client/home-item.vala	2012-02-13 19:09:42 +0000
+++ client/home-item.vala	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- */
-public class HomeItem : TabBarStreamItem
-{
-  public HomeItem (Gee.HashMap streams_map)
-  {
-    Object (stream:"home", icon_name:"gwibber-stream-home", tooltip:_("Home"), streams_map:streams_map);
-  }
-
-  construct
-  {
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return null;
-  }
-
-  public override Gtk.Widget? get_view ()
-  {
-    return view;
-  }
-}

=== removed file 'client/messages-item.vala'
--- client/messages-item.vala	2012-02-13 19:09:42 +0000
+++ client/messages-item.vala	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- */
-
-public class MessagesItem : TabBarStreamItem
-{
-  public MessagesItem (Gee.HashMap streams_map)
-  {
-    Object (stream:"messages", icon_name:"gwibber-stream-messages", tooltip:_("Messages"), streams_map:streams_map);
-  }
-
-  construct
-  {
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return null;
-  }
-  
-  public override Gtk.Widget? get_view ()
-  {
-    return view;
-  }
-}

=== removed file 'client/private-item.vala'
--- client/private-item.vala	2012-02-13 19:09:42 +0000
+++ client/private-item.vala	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- */
-
-public class PrivateItem : TabBarStreamItem
-{
-  public PrivateItem (Gee.HashMap streams_map)
-  {
-    Object (stream:"private", icon_name:"gwibber-stream-private", tooltip:_("Private Messages"), streams_map:streams_map);
-  }
-
-  construct
-  {
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return null;
-  }
-  
-  public override Gtk.Widget? get_view ()
-  {
-    return view;
-  }
-}

=== removed file 'client/public-item.vala'
--- client/public-item.vala	2012-02-13 19:09:42 +0000
+++ client/public-item.vala	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- */
-
-public class PublicItem : TabBarStreamItem
-{
-  public PublicItem (Gee.HashMap streams_map)
-  {
-    Object (stream:"public", icon_name:"gwibber-stream-public", tooltip:_("Public"), streams_map:streams_map);
-  }
-
-  construct
-  {
-    set_no_show_all (true);
-    view.model.row_added.connect (on_row_added);
-  }
-
-  private void on_row_added ()
-  {
-    set_no_show_all (false);
-    show_all();
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return null;
-  }
-  
-  public override Gtk.Widget? get_view ()
-  {
-    return view;
-  }
-}

=== removed file 'client/replies-item.vala'
--- client/replies-item.vala	2012-02-13 19:09:42 +0000
+++ client/replies-item.vala	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Neil Jagdish Patel <[e-mail]>
- */
-
-public class RepliesItem : TabBarStreamItem
-{
-  public RepliesItem (Gee.HashMap streams_map)
-  {
-    Object (stream:"replies", icon_name:"gwibber-stream-replies", tooltip:_("Replies"), streams_map:streams_map);
-  }
-
-  construct
-  {
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return null;
-  }
-  
-  public override Gtk.Widget? get_view ()
-  {
-    return view;
-  }
-}

=== removed file 'client/searches-item.vala'
--- client/searches-item.vala	2012-02-14 14:12:21 +0000
+++ client/searches-item.vala	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
-
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Ken VanDine <[e-mail]>
- */
-
-public class SearchesItem : TabBarItem
-{
-  private Gtk.Alignment _align;
-  private Gtk.Box box;
-  private Gtk.Box _view;
-  private GwibberGtk.SearchView _search_view;
-  private GwibberGtk.StreamView _stream_view;
-  public Gwibber.Streams streams { get; construct; }
-  private Gtk.Label _title;
-  private ulong active_hander_id;
-  private Gtk.Entry _entry;
-  private Gwibber.Searches _searches;
-
-  public SearchesItem (Gwibber.Streams streams)
-  {
-    Object (stream:"search", icon_name:"gwibber-stream-search", tooltip:_("Searches"), streams:streams);
-  }
-
-  construct
-  {
-    // View
-    _view = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-    _view.set_homogeneous (true);
-    _view.set_no_show_all (true);
-    _view.show ();
-
-    _search_view = new GwibberGtk.SearchView ();
-    _search_view.show_all ();
-    
-    _stream_view = new GwibberGtk.StreamView ();
-    _stream_view.set_no_show_all (true);
-    _stream_view.notify["prepared"].connect (() => {
-      _stream_view.set_no_show_all (false);
-      _stream_view.show_all ();
-    });
-
-    _stream_view.send.connect ((mid, account, sender, action) => {
-        entry.text_view.mid = mid;
-        if (action == "private" || stream == "private")
-        {
-          entry.text_view.action = "private";
-          entry.private.show ();
-        }
-        else
-          entry.text_view.action = "reply";
-        entry.target_bar.selected = account;
-        entry.showing = true;
-        if (entry.text_view.action != "private")
-          entry.text_view.buffer.text = sender + " ";
-        entry.text_view.grab_focus ();
-        });
-
-    _searches = new Gwibber.Searches ();
-
-    _view.pack_start (_search_view, true, true, 0);
-    _view.pack_start (_stream_view, true, true, 0);
-
-
-    // Toolbar
-    _align = new Gtk.Alignment (0.5f, 0.5f, 1.0f, 1.0f);
-
-    box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
-    _align.add (box);
-
-    _entry = new Gtk.Entry ();
-    _entry.set_icon_from_stock (Gtk.EntryIconPosition.SECONDARY, "gtk-clear");
-
-    _entry.icon_press.connect ((pos, event) => {
-      if (pos == Gtk.EntryIconPosition.SECONDARY)
-      _entry.set_text ("");
-    });
-
-    _entry.key_press_event.connect ((t, e)=>
-    {
-      if (e.keyval == 65307) // Escape
-      {
-        _entry.set_text ("");
-        return true;
-      }
-      return false;
-    });
-
-    Gdk.Color fg_color;
-    Gdk.Color.parse ("black", out fg_color);
-
-    _entry.modify_fg (Gtk.StateType.NORMAL, fg_color);
-
-    _entry.activate.connect (() =>
-    {
-      string query = _entry.get_text ();
-      if (!(query.has_prefix ("#")))
-        query = "#" + query;
-      _entry.set_text ("");
-      _searches.create (query, query);
-    });
-
-    _entry.show_all ();
-    box.pack_start (_entry, false, false, 0);
-    _entry.size_allocate.connect_after (()=> { queue_draw (); });
-
-    _title = new Gtk.Label ("");
-    box.pack_start (_title, false, false, 4);
-
-    _searches.updated.connect((id) => {
-      var search_map = _searches.lookup (id);
-      var name = search_map["name"];
-      _stream_view.hide ();
-      var filtered_model = streams.transient_filter_model (streams.transient_model, id);
-      _stream_view.model = filtered_model;
-      _stream_view.stream = stream;
-      _search_view.hide ();
-      _title.set_markup("<b>" + name + "</b>");
-      _title.show ();
-      raise (this);
-      _stream_view.show_all ();
-      _stream_view.showing = true;
-    });
-
-    _search_view.show_transient.connect((id, name) => {
-      _stream_view.hide ();
-      var filtered_model = streams.transient_filter_model (streams.transient_model, id);
-      _stream_view.model = filtered_model;
-      _stream_view.stream = stream;
-      _search_view.hide ();
-      _title.set_markup("<b>" + name + "</b>");
-      _title.show ();
-      raise (this);
-      _stream_view.show_all ();
-      _stream_view.showing = true;
-    });
-
-
-    var but = new TabWidgets.Button (_("Saved Searches"));
-    but.clicked.connect(() => {
-      _stream_view.hide ();
-      _search_view.show_all ();
-      _title.hide ();
-      });
-    box.pack_end (but, false, false, 0);
-
-    active_hander_id = notify["active"].connect(() => {
-      if (active)
-      {
-        _search_view.showing = true;
-        if (active_hander_id > 0)
-          disconnect (active_hander_id);
-      }
-    });
-
-    _stream_view.notify["showing"].connect (() => {
-      if (_stream_view.showing)
-        _search_view.hide ();
-    });
-
-    _search_view.notify["showing"].connect (() => {
-      if (_search_view.showing)
-        _stream_view.hide ();
-    });
-
-
-    _align.show_all ();
-  }
-
-  [Signal (action=true)]
-  public virtual signal void raise (TabBarItem item)
-  {
-  }
-
-  public override Gtk.Widget? get_toolbar ()
-  {
-    return _align;
-  }
-  
-  public override Gtk.Widget? get_view ()
-  {
-    return _view;
-  }
-}

=== removed file 'client/status-bar.vala'
--- client/status-bar.vala	2012-02-15 17:13:23 +0000
+++ client/status-bar.vala	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Ken VanDine <[e-mail]>
- */
-
-public class StatusBar : Gtk.InfoBar
-{
-  private string _message;
-  private Gtk.Label _message_label;
-  private Gtk.Container _content_area;
-
-  private Gwibber.Service _service;
-
-  private bool _showing = false;
-
-  public bool showing {