adium.1-4: a1ea1626: Removed facebook prpl

evands at pidgin.im evands at pidgin.im
Mon Jun 27 18:15:52 EDT 2011


----------------------------------------------------------------------
Revision: a1ea1626a4bd15736c21e7f5059b00f9dce6b306
Parent:   9fa905dc57b224f6ecc51361480da7be9668055c
Author:   evands at pidgin.im
Date:     06/27/11 18:11:06
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/a1ea1626a4bd15736c21e7f5059b00f9dce6b306

Changelog: 

Removed facebook prpl

Changes against parent 9fa905dc57b224f6ecc51361480da7be9668055c

  dropped  libpurple/protocols/facebook
  dropped  libpurple/protocols/facebook/COPYING
  dropped  libpurple/protocols/facebook/COPYRIGHT
  dropped  libpurple/protocols/facebook/Makefile.am
  dropped  libpurple/protocols/facebook/facebook.nsi
  dropped  libpurple/protocols/facebook/facebook16.png
  dropped  libpurple/protocols/facebook/facebook22.png
  dropped  libpurple/protocols/facebook/facebook48.png
  dropped  libpurple/protocols/facebook/fb_blist.c
  dropped  libpurple/protocols/facebook/fb_blist.h
  dropped  libpurple/protocols/facebook/fb_connection.c
  dropped  libpurple/protocols/facebook/fb_connection.h
  dropped  libpurple/protocols/facebook/fb_conversation.c
  dropped  libpurple/protocols/facebook/fb_conversation.h
  dropped  libpurple/protocols/facebook/fb_friendlist.c
  dropped  libpurple/protocols/facebook/fb_friendlist.h
  dropped  libpurple/protocols/facebook/fb_info.c
  dropped  libpurple/protocols/facebook/fb_info.h
  dropped  libpurple/protocols/facebook/fb_json.c
  dropped  libpurple/protocols/facebook/fb_json.h
  dropped  libpurple/protocols/facebook/fb_managefriends.c
  dropped  libpurple/protocols/facebook/fb_managefriends.h
  dropped  libpurple/protocols/facebook/fb_messages.c
  dropped  libpurple/protocols/facebook/fb_messages.h
  dropped  libpurple/protocols/facebook/fb_notifications.c
  dropped  libpurple/protocols/facebook/fb_notifications.h
  dropped  libpurple/protocols/facebook/fb_search.c
  dropped  libpurple/protocols/facebook/fb_search.h
  dropped  libpurple/protocols/facebook/fb_util.c
  dropped  libpurple/protocols/facebook/fb_util.h
  dropped  libpurple/protocols/facebook/libfacebook.c
  dropped  libpurple/protocols/facebook/libfacebook.h
  dropped  libpurple/protocols/facebook/login.facebook.com.pem
  dropped  libpurple/protocols/facebook/pidgin-facebookchat.rc
  dropped  libpurple/protocols/facebook/rss.xml
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/msn/notification.c

-------------- next part --------------
============================================================
--- libpurple/protocols/Makefile.am	d6bb7821c73b36662de94b459015be3fe309cebf
+++ libpurple/protocols/Makefile.am	5f196fd01403a22854270d8f585700839347063e
@@ -1,5 +1,5 @@ EXTRA_DIST = Makefile.mingw
 EXTRA_DIST = Makefile.mingw
 
-DIST_SUBDIRS = bonjour facebook gg irc jabber msn myspace mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
============================================================
--- libpurple/protocols/msn/notification.c	d2cf259e32d9efed7f9be8b21156e2afb9c8b44c
+++ libpurple/protocols/msn/notification.c	eb55fbe227de514d2f89d568c2b22e2269d80b70
@@ -106,6 +106,9 @@ connect_cb(MsnServConn *servconn)
 
 	vers = g_string_new("");
 
+	purple_debug_warning("msn", "Version max %i, min %i",
+						 WLM_MAX_PROTOCOL, WLM_MIN_PROTOCOL);
+	
 	for (i = WLM_MAX_PROTOCOL; i >= WLM_MIN_PROTOCOL; i--)
 		g_string_append_printf(vers, " MSNP%d", i);
 
============================================================
--- libpurple/protocols/facebook/COPYING	8624bcdae55baeef00cd11d5dfcfa60f68710a02
+++ /dev/null	
@@ -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>.
============================================================
--- libpurple/protocols/facebook/COPYRIGHT	350f6fe5791205ae71bfa3bc71755eebde13a432
+++ /dev/null	
@@ -1,5 +0,0 @@
-This protocol plugin is copyright (C) 2008 by the following:
-
-Mark Doliner
-Casey Ho
-Eion Robb
============================================================
--- libpurple/protocols/facebook/Makefile.am	39a629e613b6031db6cc07318b3375b3079a131c
+++ /dev/null	
@@ -1,56 +0,0 @@
-EXTRA_DIST = \
-	Makefile.mingw
-
-pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-
-FACEBOOK_SOURCES = \
-	libfacebook.h \
-	libfacebook.c \
-	fb_blist.h \
-	fb_blist.c \
-	fb_connection.h \
-	fb_connection.c \
-	fb_conversation.h \
-	fb_conversation.c \
-	fb_friendlist.h \
-	fb_friendlist.c \
-	fb_info.h \
-	fb_info.c \
-	fb_json.h \
-	fb_json.c \
-	fb_managefriends.h \
-	fb_managefriends.c \
-	fb_messages.h \
-	fb_messages.c \
-	fb_notifications.h \
-	fb_notifications.c \
-	fb_search.h \
-	fb_search.c \
-	fb_util.h \
-	fb_util.c
-
-AM_CFLAGS = $(st)
-
-libfacebook_la_LDFLAGS = -module -avoid-version
-
-if STATIC_FACEBOOK
-
-st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES    = libfacebook.la
-libfacebook_la_SOURCES = $(FACEBOOK_SOURCES)
-libfacebook_la_CFLAGS  = $(AM_CFLAGS)
-
-else
-
-st =
-pkg_LTLIBRARIES       = libfacebook.la
-libfacebook_la_SOURCES = $(FACEBOOK_SOURCES)
-libfacebook_la_LIBADD  = $(GLIB_LIBS)
-
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/libpurple \
-	-I$(top_builddir)/libpurple \
-	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/facebook/facebook.nsi	97ea60c5d4a321ff9d8ba51c38f2f940518b8b7f
+++ /dev/null	
@@ -1,99 +0,0 @@
-; Script based on the Skype4Pidgin and Off-the-Record Messaging NSI files
-
-
-SetCompress off
-
-; todo: SetBrandingImage
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "pidgin-facebookchat"
-!define PRODUCT_VERSION "1.65"
-!define PRODUCT_PUBLISHER "Eion Robb"
-!define PRODUCT_WEB_SITE "http://pidgin-facebookchat.googlecode.com/"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "COPYING"
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_TEXT "Run Pidgin"
-!define MUI_FINISHPAGE_RUN_FUNCTION "RunPidgin"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-;!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "${PRODUCT_NAME}.exe"
-
-Var "PidginDir"
-
-ShowInstDetails show
-ShowUnInstDetails show
-
-Section "MainSection" SEC01
-    ;Check for pidgin installation
-    Call GetPidginInstPath
-    
-    SetOverwrite try
-    
-	SetOutPath "$PidginDir\pixmaps\pidgin"
-	File "/oname=protocols\16\facebook.png" "facebook16.png"
-	File "/oname=protocols\22\facebook.png" "facebook22.png"
-	File "/oname=protocols\48\facebook.png" "facebook48.png"
-
-	SetOutPath "$PidginDir\ca-certs"
-	File "login.facebook.com.pem"
-
-    SetOverwrite try
-	copy:
-		ClearErrors
-		Delete "$PidginDir\plugins\libfacebook.dll"
-		IfErrors dllbusy
-		SetOutPath "$PidginDir\plugins"
-	    File "libfacebook.dll"
-		Goto after_copy
-	dllbusy:
-		MessageBox MB_RETRYCANCEL "libfacebook.dll is busy. Please close Pidgin (including tray icon) and try again" IDCANCEL cancel
-		Goto copy
-	cancel:
-		Abort "Installation of pidgin-facebookchat aborted"
-	after_copy:
-	
-	SetOutPath "$PidginDir"
-	File "libjson-glib-1.0.dll"
-	
-SectionEnd
-
-Function GetPidginInstPath
-  Push $0
-  ReadRegStr $0 HKLM "Software\pidgin" ""
-	IfFileExists "$0\pidgin.exe" cont
-	ReadRegStr $0 HKCU "Software\pidgin" ""
-	IfFileExists "$0\pidgin.exe" cont
-		MessageBox MB_OK|MB_ICONINFORMATION "Failed to find Pidgin installation."
-		Abort "Failed to find Pidgin installation. Please install Pidgin first."
-  cont:
-	StrCpy $PidginDir $0
-FunctionEnd
-
-Function RunPidgin
-	ExecShell "" "$PidginDir\pidgin.exe"
-FunctionEnd
-
============================================================
# /dev/null is binary
============================================================
# /dev/null is binary
============================================================
# /dev/null is binary
============================================================
--- libpurple/protocols/facebook/fb_blist.c	cb0dd67c0da50e91b4b2c27f0008ac45f385afce
+++ /dev/null	
@@ -1,690 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "libfacebook.h"
-#include "fb_connection.h"
-#include "fb_blist.h"
-#include "fb_util.h"
-#include "fb_friendlist.h"
-#include "blist.h"
-
-static void set_buddies_offline(PurpleBuddy *buddy,
-		GHashTable *online_buddies_list)
-{
-	if (PURPLE_BUDDY_IS_ONLINE(buddy) &&
-		g_hash_table_lookup(online_buddies_list, buddy->name) == NULL)
-	{
-		purple_prpl_got_user_status(buddy->account, buddy->name,
-				purple_primitive_get_id_from_type(
-					PURPLE_STATUS_OFFLINE),
-				NULL);
-	}
-}
-
-static void buddy_icon_cb(FacebookAccount *fba, const gchar *data, gsize data_len,
-		gpointer user_data)
-{
-	gchar *buddyname;
-	PurpleBuddy *buddy;
-	FacebookBuddy *fbuddy;
-	gpointer buddy_icon_data;
-
-	buddyname = user_data;
-
-	purple_debug_info("facebook",
-			"buddy icon for buddy %s %" G_GSIZE_FORMAT "\n",
-			buddyname, data_len);
-
-	buddy = purple_find_buddy(fba->account, buddyname);
-	g_free(buddyname);
-
-	g_return_if_fail(buddy != NULL);
-
-	fbuddy = buddy->proto_data;
-
-	g_return_if_fail(fbuddy != NULL);
-
-	buddy_icon_data = g_memdup(data, data_len);
-
-	purple_buddy_icons_set_for_user(fba->account, buddy->name,
-			buddy_icon_data, data_len, fbuddy->thumb_url);
-}
-
-/**
- * Find buddy names 
- */
-static GList *get_buddies(FacebookAccount *fba, const gchar *uid,
-		const gchar *name, JsonArray *friend_list_ids)
-{
-	GList *buddies;
-	GList *cur;
-
-	buddies = fb_get_buddies_friend_list(fba, uid, friend_list_ids);
-
-	// Initialize proto data for each buddy.
-	for (cur = buddies; cur != NULL; cur = cur->next)
-	{
-		PurpleBuddy *buddy;
-
-		buddy = (PurpleBuddy *) cur->data;
-
-		/* Set the FacebookBuddy structure */
-		if (buddy->proto_data == NULL)
-		{
-			FacebookBuddy *fbuddy;
-			gchar *buddy_icon_url;
-
-			fbuddy = g_new0(FacebookBuddy, 1);
-			fbuddy->buddy = buddy;
-			fbuddy->fba = fba;
-			fbuddy->uid = atoll(uid);
-			fbuddy->name = g_strdup(name);
-
-			// load the old buddy icon url from the icon 'checksum'
-			buddy_icon_url = (char *)
-				purple_buddy_icons_get_checksum_for_user(buddy);
-			if (buddy_icon_url != NULL)
-				fbuddy->thumb_url = g_strdup(buddy_icon_url);
-
-			buddy->proto_data = fbuddy;
-		}
-	}
-
-	return buddies;
-}
-
-static void process_buddy_icon(FacebookAccount *fba, FacebookBuddy *fbuddy,
-	const gchar *buddy_icon_url)
-{
-	PurpleBuddy *buddy;
-	gchar *icon_host;
-	gchar *icon_path, *real_path;
-	gchar *search_tmp;
-
-	buddy = fbuddy->buddy;
-	
-	/* Seperate the URL into pieces */
-	purple_url_parse(buddy_icon_url, &icon_host, NULL, &icon_path, NULL, NULL);
-	
-	if (icon_path != NULL && icon_path[0] != '/')
-	{
-		/* Slap a / at the front of that badboy */
-		real_path = g_strconcat("/", icon_path, NULL);
-		g_free(icon_path);
-		icon_path = real_path;
-	}
-	
-	if (fbuddy->thumb_url == NULL ||
-	    !g_str_equal(fbuddy->thumb_url, icon_path))
-	{
-		g_free(fbuddy->thumb_url);
-		if (g_str_equal(icon_path, "/pics/q_silhouette.gif"))
-		{
-			fbuddy->thumb_url = NULL;
-			/* User has no icon */
-			purple_buddy_icons_set_for_user(fba->account,
-				purple_buddy_get_name(buddy), NULL, 0, NULL);
-		}
-		else
-		{
-			fbuddy->thumb_url = g_strdup(icon_path);
-
-			/* small icon at /profile6/1845/74/q800753867_2878.jpg */
-			/* bigger icon at /profile6/1845/74/n800753867_2878.jpg */
-			search_tmp = strstr(icon_path, "/q");
-			if (search_tmp)
-				*(search_tmp + 1) = 'n';
-			else
-			{
-				search_tmp = strstr(icon_path, "_q.jpg");
-				if (search_tmp)
-					*(search_tmp + 1) = 'n';
-			}
-			purple_debug_info("facebook", "buddy %s has a new buddy icon at http://%s%s\n", buddy->name, icon_host, icon_path);
-			/* Fetch their icon */
-			fb_post_or_get(fba, FB_METHOD_GET, icon_host,
-					icon_path, NULL,
-					buddy_icon_cb, g_strdup(purple_buddy_get_name(buddy)), FALSE);
-		}
-	}
-	g_free(icon_host);
-	g_free(icon_path);
-}
-
-static void process_buddies(FacebookAccount *fba, GHashTable *online_buddies_list,
-	JsonObject *nowAvailableList, gchar *uid, JsonObject *userInfo)
-{
-	const gchar *name;
-	gboolean idle;
-	GList *buddies, *cur;
-	gboolean current_buddy_online;
-
-	JsonArray *friend_list_ids;
-
-	friend_list_ids = NULL;
-	name = json_node_get_string(json_object_get_member(userInfo, "name"));
-
-	/* look for "uid":{"i":_____} */
-	if (json_object_has_member(nowAvailableList, uid))
-	{
-		JsonObject *userBlistInfo;
-		userBlistInfo = json_node_get_object(
-			json_object_get_member(nowAvailableList, uid));
-		idle = json_node_get_boolean(
-			json_object_get_member(userBlistInfo, "i"));
-		if (json_object_has_member(userBlistInfo, "fl")) {
-			friend_list_ids = json_node_get_array(
-				json_object_get_member(userBlistInfo, "fl"));
-		}
-
-		current_buddy_online = TRUE;
-	} else {
-		/* if we're here, the buddy's info has been sent, 
-		 * but they're not actually online */
-		current_buddy_online = FALSE;
-		idle = FALSE;
-	}
-
-	/* is this us? */
-	if (atoll(uid) == fba->uid)
-	{
-		purple_connection_set_display_name(fba->pc, name);
-
-		/* check that we don't want to show ourselves */
-		current_buddy_online = !purple_account_get_bool(
-			fba->account, "facebook_hide_self", TRUE);
-	}
-
-	buddies = get_buddies(fba, uid, name, friend_list_ids);
-	for (cur = buddies; cur != NULL; cur = cur->next)
-	{
-		PurpleBuddy *buddy;
-		FacebookBuddy *fbuddy;
-
-		buddy = (PurpleBuddy *)cur->data;
-		fbuddy = buddy->proto_data;
-
-		process_buddy_icon(fba, fbuddy, json_node_get_string(
-			json_object_get_member(userInfo, "thumbSrc")));
-
-		purple_presence_set_idle(purple_buddy_get_presence(buddy),
-				idle, 0);
-
-		if (current_buddy_online)
-		{
-			/* Add buddy to the list of online buddies */
-			g_hash_table_insert(online_buddies_list, buddy->name, buddy);
-
-			// Set buddy as online in buddy list.  We check for several
-			// conditions before doing this, because if we set it always
-			// Pidgin has a bug where the logs go nuts with "x is online".
-			if (!PURPLE_BUDDY_IS_ONLINE(buddy) ||
-			    idle != purple_presence_is_idle(
-				purple_buddy_get_presence(buddy)))
-			{
-				purple_prpl_got_user_status(fba->account, buddy->name,
-					purple_primitive_get_id_from_type(
-						idle ? PURPLE_STATUS_AWAY :
-					       	PURPLE_STATUS_AVAILABLE), NULL);
-			}
-		}
-	}
-
-	/* update the blist if we have no previous alias */
-	fb_blist_set_alias(fba, uid, name);
-}
-
-static void process_notifications(FacebookAccount *fba,
-		JsonObject *notifications)
-{
-	if (notifications != NULL &&
-	    purple_account_get_check_mail(fba->account))
-	{
-		JsonNode *inboxCount_node = json_object_get_member(
-			notifications, "inboxCount");
-		if (inboxCount_node) {
-			gint inbox_count = json_node_get_int(inboxCount_node);
-			if (inbox_count &&
-			    inbox_count != fba->last_inbox_count) {
-				fba->last_inbox_count = inbox_count;
-				gchar *url = g_strdup("http://www.facebook.com/inbox/");
-				purple_notify_emails(
-					fba->pc, inbox_count,
-					FALSE, NULL, NULL,
-					(const char**) &(fba->account->username),
-					(const char**) &(url), NULL, NULL);
-				g_free(url);
-			}
-		}
-	}
-}
-
-static void got_status_stream_cb(FacebookAccount *fba, const gchar *data,
-		gsize data_len, gpointer userdata)
-{
-	gchar *error = NULL;
-	JsonParser *parser;
-	JsonObject *objnode;
-	gint new_latest;
-	const gchar *html;
-	gchar **messages;
-	gchar *message;
-	gint i;
-	gchar *uid_string;
-	gchar *message_string;
-	gsize uid_length;
-	FacebookBuddy *fbuddy;
-	PurpleBuddy *buddy;
-	
-	purple_debug_info("facebook", "parsing status message stream\n");
-	
-	if (fba == NULL)
-		return;
-
-	parser = fb_get_parser(data, data_len);
-	if (parser == NULL) {
-		purple_debug_info("facebook", "could not parse\n");
-		return;
-	}
-	
-	//purple_debug_misc("facebook", "status message stream\n%s\n", data);
-	
-	objnode = fb_get_json_object(parser, &error);
-	
-	if (error || !json_object_has_member(objnode, "payload")) {
-		purple_debug_info("facebook", "no payload\n");
-		json_parser_free(parser);
-		return;
-	}
-	
-	objnode = json_node_get_object(json_object_get_member(
-			objnode, "payload"));
-	
-	html = json_node_get_string(json_object_get_member(
-			objnode, "html"));
-	//purple_debug_misc("facebook", "html data\n%s\n", html);
-	
-	messages = g_strsplit(html, "/h6>", -1);
-	for(i = 0; messages[i]; i++)
-	{
-		message = messages[i];
-		uid_length = 0;
-		
-		//find uid:
-		//start with aid_ ...  "
-		uid_string = strstr(message, "aid_");
-		if (!uid_string)
-			continue;
-		uid_string += 4;
-		while (uid_string[uid_length] >= '0' &&
-				uid_string[uid_length] <= '9')
-		{
-			uid_length++;
-		}
-		uid_string = g_strndup(uid_string, uid_length);
-		purple_debug_info("facebook", "uid: %s\n", uid_string);
-		
-		//find message:
-		// last index of
-		// /a> ... <
-		message_string = g_strrstr(message, "/a>");
-		if (!message_string)
-		{
-			g_free(uid_string);
-			continue;	
-		}
-		message_string = strchr(message_string, '>');
-		if (!message_string)
-		{
-			g_free(uid_string);
-			continue;
-		}
-		message_string += 1;
-		message_string = g_strndup(message_string, g_strrstr(message_string, "<")-message_string);
-		purple_debug_info("facebook", "message: %s\n", message_string);
-		
-		buddy = purple_find_buddy(fba->account, uid_string);
-		if (buddy && buddy->proto_data)
-		{
-			fbuddy = buddy->proto_data;
-			g_free(fbuddy->status);
-			
-			fbuddy->status = purple_strreplace(message_string, "♥", "?");
-			g_free(message_string); message_string = fbuddy->status;
-			fbuddy->status = purple_markup_strip_html(message_string);
-			
-			purple_prpl_got_user_status(fba->account, buddy->name,
-				purple_primitive_get_id_from_type(
-					purple_presence_is_idle(purple_buddy_get_presence(buddy)) ? PURPLE_STATUS_AWAY :
-						PURPLE_STATUS_AVAILABLE), "message", fbuddy->status, NULL);
-		}
-		
-		g_free(uid_string);
-		g_free(message_string);
-	}
-	g_strfreev(messages);
-	
-	new_latest = json_node_get_int(json_object_get_member(
-			objnode, "newestStoryTime"));
-	if (!new_latest)
-	{
-		purple_debug_info("facebook", "no newestStoryTime\n");
-	} else {
-		fba->last_status_timestamp = new_latest;
-	}
-	
-	json_parser_free(parser);
-}
-
-static void got_buddy_list_cb(FacebookAccount *fba, const gchar *data,
-		gsize data_len, gpointer userdata)
-{
-	GSList *buddies_list;
-	GHashTable *online_buddies_list = g_hash_table_new(
-			g_str_hash, g_str_equal);
-	gchar *uid;
-
-	purple_debug_info("facebook", "parsing buddy list\n");
-
-	if (fba == NULL)
-		return;
-
-	JsonParser *parser = fb_get_parser(data, data_len);
-	if (parser == NULL) {
-		if (fba->bad_buddy_list_count++ == 3)
-		{
-			purple_connection_error_reason(fba->pc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Could not retrieve buddy list"));
-		}
-		return;
-	}
-
-	purple_debug_misc("facebook", "buddy list\n%s\n", data);
-
-	gchar *error = NULL;
-	JsonObject *objnode = fb_get_json_object(parser, &error);
-	if (error) {
-		if (fba->bad_buddy_list_count++ == 3)
-		{
-			purple_connection_error_reason(
-				fba->pc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				error);
-		}
-		json_parser_free(parser);
-		
-		return;
-	}
-	
-	/* look for "userInfos":{ ... }, */
-	if (!json_object_has_member(objnode, "payload"))
-	{
-		json_parser_free(parser);
-		return;
-	}
-	objnode = json_node_get_object(json_object_get_member(
-			objnode, "payload"));
-	if (!json_object_has_member(objnode, "buddy_list"))
-	{
-		json_parser_free(parser);
-		return;
-	}
-	JsonObject *buddy_list = json_node_get_object(json_object_get_member(
-			objnode, "buddy_list"));
-	if (!json_object_has_member(buddy_list, "userInfos"))
-	{
-		json_parser_free(parser);
-		return;
-	}
-	
-	//Reset invalid buddy list counter
-	fba->bad_buddy_list_count = 0;
-	
-	if (purple_account_get_bool(fba->account, "facebook_use_groups", TRUE))
-	{
-		//Only process if we have the setting
-		fb_process_friend_lists(fba, buddy_list);
-	}
-	
-	// Iterate through the list of buddy infos sent to us.	
-	JsonObject *userInfos;
-	JsonObject *nowAvailableList;
-	userInfos = json_node_get_object(json_object_get_member(
-			buddy_list, "userInfos"));
-	nowAvailableList = json_node_get_object(json_object_get_member(
-			buddy_list, "nowAvailableList"));
-	GList *userIds;
-	userIds = json_object_get_members(userInfos);
-	GList *currentUserNode;
-	for(	currentUserNode = userIds;
-		currentUserNode;
-		currentUserNode = g_list_next(currentUserNode))
-	{
-		uid = currentUserNode->data;
-
-		JsonObject *userInfo;
-		userInfo = json_node_get_object(json_object_get_member(
-					userInfos, uid));
-		// Process the user, which generally consists of updating
-		// state info such as name, idle item, status message,etc.
-		process_buddies(fba, online_buddies_list, nowAvailableList,
-				uid, userInfo);
-	}
-	g_list_free(userIds);
-
-	// Set users offline.  We do this in a seperate function because FB
-	// only sends us a list of users who are online.  We find the users
-	// that are not in the union of of buddy list users + online, and
-	// mark them as offline.
-	buddies_list = purple_find_buddies(fba->account, NULL);
-	if (buddies_list != NULL)
-	{
-		g_slist_foreach(
-			buddies_list,
-			(GFunc)set_buddies_offline, online_buddies_list);
-		g_slist_free(buddies_list);
-	}
-	g_hash_table_destroy(online_buddies_list);
-	
-	// The buddy list also contains notifications data.  Process and
-	// display is appropriate.
-	process_notifications(fba, json_node_get_object(
-		json_object_get_member(objnode, "notifications")));
-
-	json_parser_free(parser);
-}
-
-gboolean fb_get_buddy_list(gpointer data)
-{
-	FacebookAccount *fba;
-	gchar *postdata;
-
-	fba = data;
-
-	postdata = g_strdup_printf(
-			"user=%" G_GINT64_FORMAT "&popped_out=true&force_render=true&buddy_list=1&__a=1&post_form_id_source=AsyncRequest&post_form_id=%s&fb_dtsg=%s&notifications=1",
-			fba->uid, fba->post_form_id?fba->post_form_id:"(null)", fba->dtsg?fba->dtsg:"(null)");
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/presence/update.php",
-			postdata, got_buddy_list_cb, NULL, FALSE);
-	g_free(postdata);
-	
-	postdata = g_strdup_printf("/ajax/intent.php?filter=app_2915120374&request_type=1&__a=1&newest=%d&ignore_self=true",
-			fba->last_status_timestamp);
-	fb_post_or_get(fba, FB_METHOD_GET, NULL, postdata,
-			NULL, got_status_stream_cb, NULL, FALSE);
-	g_free(postdata);
-
-	return TRUE;
-}
-
-static void got_full_buddy_list(FacebookAccount *fba, const gchar *data,
-		gsize data_len, gpointer userdata)
-{
-	int i;
-	PurpleGroup *fb_group;
-	JsonParser *parser;
-	gchar *error = NULL;
-	JsonObject *objnode, *node;
-	JsonArray *entries;
-	
-	purple_debug_info("facebook", "parsing full buddy list\n");
-
-	if (fba == NULL)
-		return;
-
-	parser = fb_get_parser(data, data_len);
-	if (parser == NULL)
-		return;
-
-	purple_debug_misc("facebook", "full buddy list\n%s\n", data);
-
-	objnode = fb_get_json_object(parser, &error);
-	if (!json_object_has_member(objnode, "payload"))
-	{
-		json_parser_free(parser);
-		return;
-	}
-	objnode = json_node_get_object(json_object_get_member(
-			objnode, "payload"));
-	if (!json_object_has_member(objnode, "entries"))
-	{
-		json_parser_free(parser);
-		return;
-	}
-	entries = json_node_get_array(json_object_get_member(
-			objnode, "entries"));
-			
-	fb_group = purple_find_group(DEFAULT_GROUP_NAME);
-	if (fb_group == NULL)
-	{
-		fb_group = purple_group_new(DEFAULT_GROUP_NAME);
-		purple_blist_add_group(fb_group, NULL);
-	}
-	for(i = 0; i < json_array_get_length(entries); i++)
-	{
-		node = json_node_get_object(json_array_get_element(entries, i));
-		const gchar *type = json_node_get_string(json_object_get_member(node, "ty"));
-		if (type[0] != 'u')
-			continue;
-		const gchar *uid = json_node_get_string(json_object_get_member(node, "i"));
-		if (purple_find_buddy(fba->account, uid))
-			continue;
-		
-		const gchar *name = json_node_get_string(json_object_get_member(node, "t"));
-		PurpleBuddy *buddy = purple_buddy_new(fba->account, uid, name);
-		purple_blist_add_buddy(buddy, NULL, fb_group, NULL);
-		FacebookBuddy *fbuddy = g_new0(FacebookBuddy, 1);
-		fbuddy->buddy = buddy;
-		fbuddy->fba = fba;
-		fbuddy->uid = atoll(uid);
-		fbuddy->name = g_strdup(name);
-		buddy->proto_data = fbuddy;
-		
-		const gchar *thumb_url = json_node_get_string(json_object_get_member(node, "it"));
-		process_buddy_icon(fba, fbuddy, thumb_url);
-	}
-
-	json_parser_free(parser);	
-}
-
-void fb_get_full_buddy_list(FacebookAccount *fba)
-{
-	gchar *url;
-	
-	url = g_strdup_printf("/ajax/typeahead_search.php?u=%" G_GINT64_FORMAT "&__a=1", fba->uid);
-	fb_post_or_get(fba, FB_METHOD_GET, NULL, url, NULL, got_full_buddy_list, NULL, FALSE);
-	g_free(url);
-}
-
-void fb_blist_poke_buddy(PurpleBlistNode *node, gpointer data)
-{
-	PurpleBuddy *buddy;
-	FacebookBuddy *fbuddy;
-	FacebookAccount *fba;
-	gchar *postdata;
-	
-	if(!PURPLE_BLIST_NODE_IS_BUDDY(node))
-		return;
-	buddy = (PurpleBuddy *) node;
-	if (!buddy)
-		return;
-	fbuddy = buddy->proto_data;
-	if (!fbuddy)
-		return;
-	fba = fbuddy->fba;
-	if (!fba)
-		return;
-	
-	postdata = g_strdup_printf("uid=%" G_GINT64_FORMAT "&pokeback=0&post_form_id=%s", fbuddy->uid, fba->post_form_id);
-	
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/poke.php",
-				postdata, NULL, NULL, FALSE);
-	
-	g_free(postdata);
-}
-
-void fb_blist_set_alias(FacebookAccount *fba, const gchar *id,
-		const gchar *name)
-{
-	const char *current_alias;
-	PurpleBuddy *buddy;
-
-	buddy = purple_find_buddy(fba->account, id);
-	if (!buddy) {
-		return;
-	}	
-
-	/* Set an alias if no user-defined alias is set yet.  This provides
-	 * a basic name alias for each user which is more useful than a
-	 * number.  A small corner case bug here- aliases will not change
-	 * in accordance with people changing their names on Facebook.
-	 */
-	current_alias = purple_buddy_get_alias_only(buddy);
-	if (!current_alias) {
-		purple_debug_info("facebook", "aliasing %s to %s\n", id, name);
-		purple_blist_alias_buddy(buddy, name);
-	}
-
-	/* In case user removes an alias, we have the server as fallback */
-	serv_got_alias(fba->pc, id, name);
-}
-
-void fb_blist_init(FacebookAccount *fba)
-{
-	fb_friendlist_init(fba);
-
-	fb_get_buddy_list(fba);
-
-	/* periodically check for updates to your buddy list */
-	fba->buddy_list_timer = purple_timeout_add_seconds(60,
-			fb_get_buddy_list, fba);
-
-	fb_get_full_buddy_list(fba);
-}
-
-void fb_blist_destroy(FacebookAccount *fba)
-{
-	if (fba->buddy_list_timer) {
-		purple_timeout_remove(fba->buddy_list_timer);
-	}
-
-	fb_friendlist_destroy(fba);
-}
============================================================
--- libpurple/protocols/facebook/fb_blist.h	a663d54c3277085efa235c39cbc950faf816c05c
+++ /dev/null	
@@ -1,37 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_BLIST_H
-#define FACEBOOK_BLIST_H
-
-#include "libfacebook.h"
-
-gboolean fb_get_buddy_list(gpointer data);
-void fb_blist_poke_buddy(PurpleBlistNode *node, gpointer data);
-
-void fb_blist_set_alias(FacebookAccount *fba, const char *id,
-		const char *name);
-
-void fb_blist_init(FacebookAccount *fba);
-void fb_blist_destroy(FacebookAccount *fba);
-
-void fb_get_full_buddy_list(FacebookAccount *fba);
-
-#endif /* FACEBOOK_BLIST_H */
============================================================
--- libpurple/protocols/facebook/fb_connection.c	51f2c6c9baa639ede1d17c752fd02b4ca7ba8187
+++ /dev/null	
@@ -1,661 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_connection.h"
-
-static void fb_attempt_connection(FacebookConnection *);
-static void fb_next_connection(FacebookAccount *fba);
-
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-
-static gchar *fb_gunzip(const guchar *gzip_data, ssize_t *len_ptr)
-{
-	gsize gzip_data_len	= *len_ptr;
-	z_stream zstr;
-	int gzip_err = 0;
-	gchar *data_buffer;
-	gulong gzip_len = G_MAXUINT16;
-	GString *output_string = NULL;
-
-	data_buffer = g_new0(gchar, gzip_len);
-
-	zstr.next_in = NULL;
-	zstr.avail_in = 0;
-	zstr.zalloc = Z_NULL;
-	zstr.zfree = Z_NULL;
-	zstr.opaque = 0;
-	gzip_err = inflateInit2(&zstr, MAX_WBITS+32);
-	if (gzip_err != Z_OK)
-	{
-		g_free(data_buffer);
-		purple_debug_error("facebook", "no built-in gzip support in zlib\n");
-		return NULL;
-	}
-	
-	zstr.next_in = (Bytef *)gzip_data;
-	zstr.avail_in = gzip_data_len;
-	
-	zstr.next_out = (Bytef *)data_buffer;
-	zstr.avail_out = gzip_len;
-	
-	gzip_err = inflate(&zstr, Z_SYNC_FLUSH);
-
-	if (gzip_err == Z_DATA_ERROR)
-	{
-		inflateEnd(&zstr);
-		inflateInit2(&zstr, -MAX_WBITS);
-		if (gzip_err != Z_OK)
-		{
-			g_free(data_buffer);
-			purple_debug_error("facebook", "Cannot decode gzip header\n");
-			return NULL;
-		}
-		zstr.next_in = (Bytef *)gzip_data;
-		zstr.avail_in = gzip_data_len;
-		zstr.next_out = (Bytef *)data_buffer;
-		zstr.avail_out = gzip_len;
-		gzip_err = inflate(&zstr, Z_SYNC_FLUSH);
-	}
-	output_string = g_string_new("");
-	while (gzip_err == Z_OK)
-	{
-		//append data to buffer
-		output_string = g_string_append_len(output_string, data_buffer, gzip_len - zstr.avail_out);
-		//reset buffer pointer
-		zstr.next_out = (Bytef *)data_buffer;
-		zstr.avail_out = gzip_len;
-		gzip_err = inflate(&zstr, Z_SYNC_FLUSH);
-	}
-	if (gzip_err == Z_STREAM_END)
-	{
-		output_string = g_string_append_len(output_string, data_buffer, gzip_len - zstr.avail_out);
-	} else {
-		purple_debug_error("facebook", "gzip inflate error\n");
-	}
-	inflateEnd(&zstr);
-
-	g_free(data_buffer);	
-
-	if (len_ptr)
-		*len_ptr = output_string->len;
-
-	return g_string_free(output_string, FALSE);
-}
-#else /* !HAVE_ZLIB */
-#warning You really want to compile with -DHAVE_ZLIB
-#endif
-
-void fb_connection_destroy(FacebookConnection *fbconn)
-{
-	fbconn->fba->conns = g_slist_remove(fbconn->fba->conns, fbconn);
-
-	if (fbconn->request != NULL)
-		g_string_free(fbconn->request, TRUE);
-
-	g_free(fbconn->rx_buf);
-
-	if (fbconn->connect_data != NULL)
-		purple_proxy_connect_cancel(fbconn->connect_data);
-
-	if (fbconn->ssl_conn != NULL)
-		purple_ssl_close(fbconn->ssl_conn);
-
-	if (fbconn->fd >= 0) {
-		close(fbconn->fd);
-	}
-
-	if (fbconn->input_watcher > 0)
-		purple_input_remove(fbconn->input_watcher);
-
-	g_free(fbconn->url);
-	g_free(fbconn->hostname);
-	g_free(fbconn);
-}
-
-static void fb_update_cookies(FacebookAccount *fba, const gchar *headers)
-{
-	const gchar *cookie_start;
-	const gchar *cookie_end;
-	gchar *cookie_name;
-	gchar *cookie_value;
-	int header_len;
-
-	g_return_if_fail(headers != NULL);
-
-	header_len = strlen(headers);
-
-	/* look for the next "Set-Cookie: " */
-	/* grab the data up until ';' */
-	cookie_start = headers;
-	while ((cookie_start = strstr(cookie_start, "\r\nSet-Cookie: ")) &&
-			(cookie_start - headers) < header_len)
-	{
-		cookie_start += 14;
-		cookie_end = strchr(cookie_start, '=');
-		cookie_name = g_strndup(cookie_start, cookie_end-cookie_start);
-		cookie_start = cookie_end + 1;
-		cookie_end = strchr(cookie_start, ';');
-		cookie_value= g_strndup(cookie_start, cookie_end-cookie_start);
-		cookie_start = cookie_end;
-
-		g_hash_table_replace(fba->cookie_table, cookie_name,
-				cookie_value);
-	}
-}
-
-static void fb_connection_process_data(FacebookConnection *fbconn)
-{
-	ssize_t len;
-	gchar *tmp;
-
-	len = fbconn->rx_len;
-	tmp = g_strstr_len(fbconn->rx_buf, len, "\r\n\r\n");
-	if (tmp == NULL) {
-		/* This is a corner case that occurs when the connection is
-		 * prematurely closed either on the client or the server.
-		 * This can either be no data at all or a partial set of
-		 * headers.  We pass along the data to be good, but don't
-		 * do any fancy massaging.  In all likelihood the result will
-		 * be tossed by the connection callback func anyways
-		 */
-		tmp = g_strndup(fbconn->rx_buf, len);
-	} else {
-		tmp += 4;
-		len -= g_strstr_len(fbconn->rx_buf, len, "\r\n\r\n") -
-				fbconn->rx_buf + 4;
-		tmp = g_memdup(tmp, len + 1);
-		tmp[len] = '\0';
-		fbconn->rx_buf[fbconn->rx_len - len] = '\0';
-		fb_update_cookies(fbconn->fba, fbconn->rx_buf);
-
-#ifdef HAVE_ZLIB
-		if (strstr(fbconn->rx_buf, "Content-Encoding: gzip"))
-		{
-			/* we've received compressed gzip data, decompress */
-			gchar *gunzipped;
-			gunzipped = fb_gunzip((const guchar *)tmp, &len);
-			g_free(tmp);
-			tmp = gunzipped;
-		}
-#endif
-	}
-
-	g_free(fbconn->rx_buf);
-	fbconn->rx_buf = NULL;
-
-	if (fbconn->callback != NULL) {
-		purple_debug_info("facebook", "executing callback for %s\n", fbconn->url);
-		fbconn->callback(fbconn->fba, tmp, len, fbconn->user_data);
-	}
-
-	g_free(tmp);
-}
-
-static void fb_fatal_connection_cb(FacebookConnection *fbconn)
-{
-	PurpleConnection *pc = fbconn->fba->pc;
-
-	purple_debug_error("facebook", "fatal connection error\n");
-
-	fb_connection_destroy(fbconn);
-
-	/* We died.  Do not pass Go.  Do not collect $200 */
-	/* In all seriousness, don't attempt to call the normal callback here.
-	 * That may lead to the wrong error message being displayed */
-	purple_connection_error_reason(pc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Server closed the connection."));
-
-}
-
-static void fb_post_or_get_readdata_cb(gpointer data, gint source,
-		PurpleInputCondition cond)
-{
-	FacebookConnection *fbconn;
-	FacebookAccount *fba;
-	gchar buf[4096];
-	ssize_t len;
-
-	fbconn = data;
-	fba = fbconn->fba;
-
-	if (fbconn->method & FB_METHOD_SSL) {
-		len = purple_ssl_read(fbconn->ssl_conn,
-				buf, sizeof(buf) - 1);
-	} else {
-		len = recv(fbconn->fd, buf, sizeof(buf) - 1, 0);
-	}
-
-	if (len < 0)
-	{
-		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
-			/* Try again later */
-			return;
-		}
-
-		if (fbconn->method & FB_METHOD_SSL && fbconn->rx_len > 0) {
-			/*
-			 * This is a slightly hacky workaround for a bug in either
-			 * GNU TLS or in the SSL implementation on Facebook's web
-			 * servers.  The sequence of events is:
-			 * 1. We attempt to read the first time and successfully read
-			 *    the server's response.
-			 * 2. We attempt to read a second time and libpurple's call
-			 *    to gnutls_record_recv() returns the error
-			 *    GNUTLS_E_UNEXPECTED_PACKET_LENGTH, or
-			 *    "A TLS packet with unexpected length was received."
-			 *
-			 * Normally the server would have closed the connection
-			 * cleanly and this second read() request would have returned
-			 * 0.  Or maybe it's normal for SSL connections to be severed
-			 * in this manner?  In any case, this differs from the behavior
-			 * of the standard recv() system call.
-			 */
-			purple_debug_warning("facebook",
-				"ssl error, but data received.  attempting to continue\n");
-		} else {
-			/* TODO: Is this a regular occurrence?  If so then maybe resend the request? */
-			fb_fatal_connection_cb(fbconn);
-			return;
-		}
-	}
-
-	if (len > 0)
-	{
-		buf[len] = '\0';
-
-		fbconn->rx_buf = g_realloc(fbconn->rx_buf,
-				fbconn->rx_len + len + 1);
-		memcpy(fbconn->rx_buf + fbconn->rx_len, buf, len + 1);
-		fbconn->rx_len += len;
-
-		/* Wait for more data before processing */
-		return;
-	}
-
-	/* The server closed the connection, let's parse the data */
-	fb_connection_process_data(fbconn);
-
-	fb_connection_destroy(fbconn);
-	
-	fb_next_connection(fba);
-}
-
-static void fb_post_or_get_ssl_readdata_cb (gpointer data,
-		PurpleSslConnection *ssl, PurpleInputCondition cond)
-{
-	fb_post_or_get_readdata_cb(data, -1, cond);
-}
-
-static void fb_post_or_get_connect_cb(gpointer data, gint source,
-		const gchar *error_message)
-{
-	FacebookConnection *fbconn;
-	ssize_t len;
-
-	fbconn = data;
-	fbconn->connect_data = NULL;
-
-	if (error_message)
-	{
-		purple_debug_error("facebook", "post_or_get_connect failure to %s\n", fbconn->url);
-		purple_debug_error("facebook", "post_or_get_connect_cb %s\n",
-				error_message);
-		fb_fatal_connection_cb(fbconn);
-		return;
-	}
-
-	fbconn->fd = source;
-
-	/* TODO: Check the return value of write() */
-	len = write(fbconn->fd, fbconn->request->str,
-			fbconn->request->len);
-	fbconn->input_watcher = purple_input_add(fbconn->fd,
-			PURPLE_INPUT_READ,
-			fb_post_or_get_readdata_cb, fbconn);
-}
-
-static void fb_post_or_get_ssl_connect_cb(gpointer data,
-		PurpleSslConnection *ssl, PurpleInputCondition cond)
-{
-	FacebookConnection *fbconn;
-	ssize_t len;
-
-	fbconn = data;
-
-	purple_debug_info("facebook", "post_or_get_ssl_connect_cb\n");
-
-	/* TODO: Check the return value of write() */
-	len = purple_ssl_write(fbconn->ssl_conn,
-			fbconn->request->str, fbconn->request->len);
-	purple_ssl_input_add(fbconn->ssl_conn,
-			fb_post_or_get_ssl_readdata_cb, fbconn);
-}
-
-static void fb_host_lookup_cb(GSList *hosts, gpointer data,
-		const char *error_message)
-{
-	GSList *host_lookup_list;
-	struct sockaddr_in *addr;
-	gchar *hostname;
-	gchar *ip_address;
-	FacebookAccount *fba;
-	PurpleDnsQueryData *query;
-
-	/* Extract variables */
-	host_lookup_list = data;
-
-	fba = host_lookup_list->data;
-	host_lookup_list =
-			g_slist_delete_link(host_lookup_list, host_lookup_list);
-	hostname = host_lookup_list->data;
-	host_lookup_list =
-			g_slist_delete_link(host_lookup_list, host_lookup_list);
-	query = host_lookup_list->data;
-	host_lookup_list =
-			g_slist_delete_link(host_lookup_list, host_lookup_list);
-
-	/* The callback has executed, so we no longer need to keep track of
-	 * the original query.  This always needs to run when the cb is 
-	 * executed. */
-	fba->dns_queries = g_slist_remove(fba->dns_queries, query);
-
-	/* Any problems, capt'n? */
-	if (error_message != NULL)
-	{
-		purple_debug_warning("facebook",
-				"Error doing host lookup: %s\n", error_message);
-		return;
-	}
-
-	if (hosts == NULL)
-	{
-		purple_debug_warning("facebook",
-				"Could not resolve host name\n");
-		return;
-	}
-
-	/* Discard the length... */
-	hosts = g_slist_delete_link(hosts, hosts);
-	/* Copy the address then free it... */
-	addr = hosts->data;
-	ip_address = g_strdup(inet_ntoa(addr->sin_addr));
-	g_free(addr);
-	hosts = g_slist_delete_link(hosts, hosts);
-
-	/*
-	 * DNS lookups can return a list of IP addresses, but we only cache
-	 * the first one.  So free the rest.
-	 */
-	while (hosts != NULL)
-	{
-		/* Discard the length... */
-		hosts = g_slist_delete_link(hosts, hosts);
-		/* Free the address... */
-		g_free(hosts->data);
-		hosts = g_slist_delete_link(hosts, hosts);
-	}
-
-	g_hash_table_insert(fba->hostname_ip_cache, hostname, ip_address);
-}
-
-static void fb_cookie_foreach_cb(gchar *cookie_name,
-		gchar *cookie_value, GString *str)
-{
-	/* TODO: Need to escape name and value? */
-	g_string_append_printf(str, "%s=%s;", cookie_name, cookie_value);
-}
-
-/**
- * Serialize the fba->cookie_table hash table to a string.
- */
-static gchar *fb_cookies_to_string(FacebookAccount *fba)
-{
-	GString *str;
-
-	str = g_string_new(NULL);
-
-	g_hash_table_foreach(fba->cookie_table,
-			(GHFunc)fb_cookie_foreach_cb, str);
-
-	return g_string_free(str, FALSE);
-}
-
-static void fb_ssl_connection_error(PurpleSslConnection *ssl,
-		PurpleSslErrorType errortype, gpointer data)
-{
-	FacebookConnection *fbconn = data;
-	PurpleConnection *pc = fbconn->fba->pc;
-
-	fbconn->ssl_conn = NULL;
-	fb_connection_destroy(fbconn);
-	purple_connection_ssl_error(pc, errortype);
-}
-
-void fb_post_or_get(FacebookAccount *fba, FacebookMethod method,
-		const gchar *host, const gchar *url, const gchar *postdata,
-		FacebookProxyCallbackFunc callback_func, gpointer user_data,
-		gboolean keepalive)
-{
-	GString *request;
-	gchar *cookies;
-	FacebookConnection *fbconn;
-	gchar *real_url;
-	gboolean is_proxy = FALSE;
-	const gchar *user_agent;
-	const gchar* const *languages;
-	gchar *language_names;
-	PurpleProxyInfo *proxy_info = NULL;
-	gchar *proxy_auth;
-	gchar *proxy_auth_base64;
-
-	/* TODO: Fix keepalive and use it as much as possible */
-	keepalive = FALSE;
-
-	if (host == NULL)
-		host = "www.facebook.com";
-
-	if (fba && fba->account && !(method & FB_METHOD_SSL))
-	{
-		proxy_info = purple_proxy_get_setup(fba->account);
-		if (purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL)
-			proxy_info = purple_global_proxy_get_info();
-		if (purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_HTTP)
-		{
-			is_proxy = TRUE;
-		}	
-	}
-	if (is_proxy == TRUE)
-	{
-		real_url = g_strdup_printf("http://%s%s", host, url);
-	} else {
-		real_url = g_strdup(url);
-	}
-
-	cookies = fb_cookies_to_string(fba);
-	user_agent = purple_account_get_string(fba->account, "user-agent", "Opera/9.50 (Windows NT 5.1; U; en-GB)");
-	
-	if (method & FB_METHOD_POST && !postdata)
-		postdata = "";
-
-	/* Build the request */
-	request = g_string_new(NULL);
-	g_string_append_printf(request, "%s %s HTTP/1.0\r\n",
-			(method & FB_METHOD_POST) ? "POST" : "GET",
-			real_url);
-	if (is_proxy == FALSE)
-		g_string_append_printf(request, "Host: %s\r\n", host);
-	g_string_append_printf(request, "Connection: %s\r\n",
-			(keepalive ? "Keep-Alive" : "close"));
-	g_string_append_printf(request, "User-Agent: %s\r\n", user_agent);
-	if (method & FB_METHOD_POST) {
-		g_string_append_printf(request,
-				"Content-Type: application/x-www-form-urlencoded\r\n");
-		g_string_append_printf(request,
-				"Content-length: %zu\r\n", strlen(postdata));
-	}
-	g_string_append_printf(request, "Accept: */*\r\n");
-	g_string_append_printf(request, "Cookie: isfbe=false;%s\r\n", cookies);
-#ifdef HAVE_ZLIB
-	g_string_append_printf(request, "Accept-Encoding: gzip\r\n");
-#endif
-	if (is_proxy == TRUE)
-	{
-		if (purple_proxy_info_get_username(proxy_info) &&
-			purple_proxy_info_get_password(proxy_info))
-		{
-			proxy_auth = g_strdup_printf("%s:%s", purple_proxy_info_get_username(proxy_info), purple_proxy_info_get_password(proxy_info));
-			proxy_auth_base64 = purple_base64_encode((guchar *)proxy_auth, strlen(proxy_auth));
-			g_string_append_printf(request, "Proxy-Authorization: Basic %s\r\n", proxy_auth_base64);
-			g_free(proxy_auth_base64);
-			g_free(proxy_auth);
-		}
-	}
-
-	/* Tell the server what language we accept, so that we get error messages in our language (rather than our IP's) */
-	languages = g_get_language_names();
-	language_names = g_strjoinv(", ", (gchar **)languages);
-	purple_util_chrreplace(language_names, '_', '-');
-	g_string_append_printf(request, "Accept-Language: %s\r\n", language_names);
-	g_free(language_names);
-
-	purple_debug_info("facebook", "getting url %s\n", url);
-
-	g_string_append_printf(request, "\r\n");
-	if (method & FB_METHOD_POST)
-		g_string_append_printf(request, "%s", postdata);
-
-	/* If it needs to go over a SSL connection, we probably shouldn't print
-	 * it in the debug log.  Without this condition a user's password is
-	 * printed in the debug log */
-	if (method == FB_METHOD_POST)
-		purple_debug_info("facebook", "sending request data:\n%s\n",
-			postdata);
-
-	g_free(cookies);
-
-	/*
-	 * Do a separate DNS lookup for the given host name and cache it
-	 * for next time.
-	 *
-	 * TODO: It would be better if we did this before we call
-	 *       purple_proxy_connect(), so we could re-use the result.
-	 *       Or even better: Use persistent HTTP connections for servers
-	 *       that we access continually.
-	 *
-	 * TODO: This cache of the hostname<-->IP address does not respect
-	 *       the TTL returned by the DNS server.  We should expire things
-	 *       from the cache after some amount of time.
-	 */
-	if (!is_proxy && !(method & FB_METHOD_SSL))
-	{
-		/* Don't do this for proxy connections, since proxies do the DNS lookup */
-		gchar *host_ip;
-
-		host_ip = g_hash_table_lookup(fba->hostname_ip_cache, host);
-		if (host_ip != NULL) {
-			host = host_ip;
-		} else if (fba->account && !fba->account->disconnecting) {
-			GSList *host_lookup_list = NULL;
-			PurpleDnsQueryData *query;
-
-			host_lookup_list = g_slist_prepend(
-					host_lookup_list, g_strdup(host));
-			host_lookup_list = g_slist_prepend(
-					host_lookup_list, fba);
-
-			query = purple_dnsquery_a(host, 80,
-					fb_host_lookup_cb, host_lookup_list);
-			fba->dns_queries = g_slist_prepend(fba->dns_queries, query);
-			host_lookup_list = g_slist_append(host_lookup_list, query);
-		}
-	}
-
-	fbconn = g_new0(FacebookConnection, 1);
-	fbconn->fba = fba;
-	fbconn->url = real_url;
-	fbconn->method = method;
-	fbconn->hostname = g_strdup(host);
-	fbconn->request = request;
-	fbconn->callback = callback_func;
-	fbconn->user_data = user_data;
-	fbconn->fd = -1;
-	fbconn->connection_keepalive = keepalive;
-	fbconn->request_time = time(NULL);
-	
-	g_queue_push_head(fba->waiting_conns, fbconn);
-	fb_next_connection(fba);
-}
-
-static void fb_next_connection(FacebookAccount *fba)
-{
-	FacebookConnection *fbconn;
-	
-	g_return_if_fail(fba != NULL);	
-	
-	if (!g_queue_is_empty(fba->waiting_conns))
-	{
-		if(g_slist_length(fba->conns) < FB_MAX_CONNECTIONS)
-		{
-			fbconn = g_queue_pop_tail(fba->waiting_conns);
-			fb_attempt_connection(fbconn);
-		}
-	}
-}
-
-static void fb_attempt_connection(FacebookConnection *fbconn)
-{
-	FacebookAccount *fba = fbconn->fba;
-
-#if 0
-	/* Connection to attempt retries.  This code doesn't work perfectly, but
-	 * remains here for future reference if needed */
-	if (time(NULL) - fbconn->request_time > 5) {
-		/* We've continuously tried to remake this connection for a 
-		 * bit now.  It isn't happening, sadly.  Time to die. */
-		purple_debug_error("facebook", "could not connect after retries\n");
-		fb_fatal_connection_cb(fbconn);
-		return;
-	}
-
-	purple_debug_info("facebook", "making connection attempt\n");
-
-	/* TODO: If we're retrying the connection, consider clearing the cached
-	 * DNS value.  This will require some juggling with the hostname param */
-	/* TODO/FIXME: This retries almost instantenously, which in some cases
-	 * runs at blinding speed.  Slow it down. */
-	/* TODO/FIXME: this doesn't retry properly on non-ssl connections */
-#endif
-	
-	fba->conns = g_slist_prepend(fba->conns, fbconn);
-
-	if (fbconn->method & FB_METHOD_SSL) {
-		fbconn->ssl_conn = purple_ssl_connect(fba->account, fbconn->hostname,
-				443, fb_post_or_get_ssl_connect_cb,
-				fb_ssl_connection_error, fbconn);
-	} else {
-		fbconn->connect_data = purple_proxy_connect(NULL, fba->account,
-				fbconn->hostname, 80, fb_post_or_get_connect_cb, fbconn);
-	}
-
-	return;
-}
-
============================================================
--- libpurple/protocols/facebook/fb_connection.h	e3c87874ac44ae6437066264c6a9996be5333a0e
+++ /dev/null	
@@ -1,61 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_CONNECTION_H
-#define FACEBOOK_CONNECTION_H
-
-#include "libfacebook.h"
-
-/*
- * This is a bitmask.
- */
-typedef enum
-{
-	FB_METHOD_GET  = 0x0001,
-	FB_METHOD_POST = 0x0002,
-	FB_METHOD_SSL  = 0x0004
-} FacebookMethod;
-
-typedef struct _FacebookConnection FacebookConnection;
-struct _FacebookConnection {
-	FacebookAccount *fba;
-	FacebookMethod method;
-	gchar *hostname;
-	gchar *url;
-	GString *request;
-	FacebookProxyCallbackFunc callback;
-	gpointer user_data;
-	char *rx_buf;
-	size_t rx_len;
-	PurpleProxyConnectData *connect_data;
-	PurpleSslConnection *ssl_conn;
-	int fd;
-	guint input_watcher;
-	gboolean connection_keepalive;
-	time_t request_time;
-};
-
-void fb_connection_destroy(FacebookConnection *fbconn);
-void fb_post_or_get(FacebookAccount *fba, FacebookMethod method,
-		const gchar *host, const gchar *url, const gchar *postdata,
-		FacebookProxyCallbackFunc callback_func, gpointer user_data,
-		gboolean keepalive);
-
-#endif /* FACEBOOK_CONNECTION_H */
============================================================
--- libpurple/protocols/facebook/fb_info.c	67afa65f38125540d235bda3b66cd7dceb54ddd1
+++ /dev/null	
@@ -1,237 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_connection.h"
-#include "fb_info.h"
-#include "fb_blist.h"
-
-/*
- * TODO: Do we really want to do this?  Maybe we could just set a
- *       flag that says that this protocol supports HTML?
- */
-static gchar *fb_remove_useless_stripped_links(const gchar *input)
-{
-	/* removes stripped links like "(/s.php? ... )" from user info */
-	/* as an artifact of purple_markup_strip_html */
-
-	gchar *output = g_strdup(input);
-	gchar *i = output;
-	gchar *end;
-
-	while ((i = strstr(i, " (/")))
-	{
-		end = strchr(i, ')');
-		if (end)
-		{
-			end += 1;
-			/* overwrite everything after the brackets to before it */
-			g_stpcpy(i, end);
-		}
-	}
-
-	return output;
-}
-
-static void fb_get_info_cb(FacebookAccount *fba, const gchar *data, gsize data_len, gpointer user_data)
-{
-	PurpleNotifyUserInfo *user_info;
-	PurpleBuddyIcon *buddy_icon;
-	size_t image_size;
-	gconstpointer image_pointer;
-	int icon_id = -1;
-	gchar *uid = user_data;
-	gchar *label_tmp;
-	gchar *value_tmp;
-	gchar *value_tmp2;
-	gchar *search_start;
-	gchar *search_end;
-	PurpleBuddy *buddy = NULL;
-	FacebookBuddy *fbuddy = NULL;
-
-	purple_debug_info("facebook", "get_info_cb\n");
-	purple_debug_misc("facebook", "%s\n", data);
-
-	buddy = purple_find_buddy(fba->account, uid);
-	if (buddy)
-	{
-		fbuddy = buddy->proto_data;
-	}
-	
-	/* look from <div id="info_tab" class="info_tab"> */
-	/* until </div></div></div></div> */
-	search_start = g_strstr_len(data, data_len, "<div id=\"info_tab\" class=\"info_tab\">");
-	if (search_start == NULL)
-	{
-		search_start = g_strstr_len(data, data_len, "window.location.replace(\"http:\\/\\/www.facebook.com\\");
-		if (search_start)
-		{
-			search_start += strlen("window.location.replace(\"http:\\/\\/www.facebook.com\\");
-			search_end = strchr(search_start, '"');
-			value_tmp = g_strndup(search_start, search_end - search_start);
-			if (value_tmp) {
-				purple_debug_info("facebook", "info url: %s\n", value_tmp);
-				fb_post_or_get(fba, FB_METHOD_GET, NULL, value_tmp, NULL, fb_get_info_cb, uid, FALSE);
-				g_free(value_tmp);
-				return;
-			}
-		}
-		purple_debug_warning("facebook",
-				"could not find user info, showing default");
-		user_info = purple_notify_user_info_new();
-		value_tmp = g_strdup_printf("<a href=\"http://www.facebook.com/profile.php?id=%s\">%s</a>",
-				uid, _("View web profile"));
-		purple_notify_user_info_add_pair(user_info, NULL, value_tmp);
-		purple_notify_user_info_add_section_break(user_info);
-		g_free(value_tmp);
-		purple_notify_userinfo(fba->pc, uid, user_info, NULL, NULL);
-		purple_notify_user_info_destroy(user_info);
-		g_free(uid);
-		return;
-	}
-	search_end = strstr(search_start, "</div></div></div></div>");
-
-	user_info = purple_notify_user_info_new();
-
-	/* Insert link to profile at top */
-	value_tmp = g_strdup_printf("<a href=\"http://www.facebook.com/profile.php?id=%s\">%s</a>",
-			uid, _("View web profile"));
-	purple_notify_user_info_add_pair(user_info, NULL, value_tmp);
-	purple_notify_user_info_add_section_break(user_info);
-	g_free(value_tmp);
-
-	value_tmp = g_strstr_len(data, data_len, "<title>Facebook | ");
-	if (value_tmp)
-	{
-		value_tmp = strchr(value_tmp, '|')+2;
-		value_tmp2 = g_strndup(value_tmp, strstr(value_tmp, "</title>")-value_tmp);
-		value_tmp = g_strchomp(purple_markup_strip_html(value_tmp2));
-		purple_notify_user_info_add_pair(user_info, _("Name"), value_tmp);
-		fb_blist_set_alias(fba, uid, value_tmp);
-		g_free(value_tmp);
-		g_free(value_tmp2);
-	}
-
-	value_tmp = g_strstr_len(data, data_len, "<span id=\"profile_status\"");
-	if (value_tmp)
-	{
-		value_tmp2 = strstr(value_tmp, "</span>");
-		if (value_tmp2)
-		{
-			value_tmp = strchr(value_tmp, '>')+1;
-			value_tmp2 = g_strndup(value_tmp, strchr(value_tmp, '<')-value_tmp);
-			purple_debug_info("facebook", "status: %s\n", value_tmp2);
-			value_tmp = g_strchomp(purple_markup_strip_html(value_tmp2));
-			if (*value_tmp == '\0')
-			{
-				//For some reason their status message disappeared
-				//Try using their status message from the buddy list
-				if (fbuddy)
-				{
-					g_free(value_tmp);
-					value_tmp = g_strdup(fbuddy->status);
-				}
-			}
-			purple_notify_user_info_add_pair(user_info, _("Status"), value_tmp);
-			g_free(value_tmp);
-			g_free(value_tmp2);
-		}
-	}
-
-	buddy_icon = purple_buddy_icons_find(fba->account, uid);
-	if (buddy_icon)
-	{
-		image_pointer = purple_buddy_icon_get_data(buddy_icon, &image_size);
-		icon_id = purple_imgstore_add_with_id(g_memdup(image_pointer, image_size), image_size, NULL);
-		value_tmp = g_strdup_printf("<img id='%d'>", icon_id);
-		purple_debug_info("facebook", "user info pic: '%s'\n", value_tmp);
-		purple_notify_user_info_add_pair(user_info, NULL, value_tmp);
-		g_free(value_tmp);
-	}
-
-	while ((search_start = strstr(search_start, "<dt>")) && search_start < search_end)
-	{
-		search_start += 4;
-		if (search_start[0] == '<' && search_start[1] == '/' && search_start[2] == 'd' && search_start[3] == 't')
-		{
-			/* the tag closes as soon as it opens (bad xhtml) */
-			continue;
-		}
-
-		label_tmp = g_strndup(search_start, strchr(search_start, ':')-search_start);
-		if (!*label_tmp)
-		{
-			g_free(label_tmp);
-			continue;
-		}
-
-		search_start = strstr(search_start, "<dd>");
-		if (!search_start)
-		{
-			g_free(label_tmp);
-			break;
-		}
-
-		search_start += 4;
-		value_tmp = g_strndup(search_start, strstr(search_start, "</dd>")-search_start);
-		if (!*value_tmp)
-		{
-			g_free(label_tmp);
-			g_free(value_tmp);
-			continue;
-		}
-
-		/* turn html to plaintext */
-		if (strcmp(label_tmp, "AIM")) {
-			value_tmp2 = g_strchomp(purple_markup_strip_html(value_tmp));
-			g_free(value_tmp);
-			value_tmp = value_tmp2;
-
-			/* remove the silly links */
-			value_tmp2 = fb_remove_useless_stripped_links(value_tmp);
-			g_free(value_tmp);
-			value_tmp = value_tmp2;
-		}
-
-		purple_debug_info("facebook", "label: %s\n", label_tmp);
-		purple_debug_info("facebook", "value: %s\n", value_tmp);
-		purple_notify_user_info_add_pair(user_info, label_tmp, value_tmp);
-		g_free(label_tmp);
-		g_free(value_tmp);
-	}
-
-	purple_notify_userinfo(fba->pc, uid, user_info, NULL, NULL);
-	purple_notify_user_info_destroy(user_info);
-
-	if (icon_id >= 0)
-		purple_imgstore_unref_by_id(icon_id);
-
-	g_free(uid);
-}
-
-void fb_get_info(PurpleConnection *pc, const gchar *uid)
-{
-	gchar *profile_url;
-
-	profile_url = g_strdup_printf("/profile.php?id=%s&v=info", uid);
-
-	fb_post_or_get(pc->proto_data, FB_METHOD_GET, NULL, profile_url, NULL, fb_get_info_cb, g_strdup(uid), FALSE);
-
-	g_free(profile_url);
-}
============================================================
--- libpurple/protocols/facebook/fb_info.h	8769def6b5f0e9f8e3ba92664eccc9f235125559
+++ /dev/null	
@@ -1,28 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_INFO_H
-#define FACEBOOK_INFO_H
-
-#include "libfacebook.h"
-
-void fb_get_info(PurpleConnection *pc, const gchar *uid);
-
-#endif /* FACEBOOK_INFO_H */
============================================================
--- libpurple/protocols/facebook/fb_managefriends.c	46d4a0dc588110af5c4d9ceef4cf8369af7e8586
+++ /dev/null	
@@ -1,233 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_managefriends.h"
-#include "fb_connection.h"
-
-static void fb_auth_accept_cb(gpointer data)
-{
-	FacebookBuddy *fbuddy = data;
-	FacebookAccount *fba = fbuddy->fba;
-	gchar *buddy_uid;
-	gchar *postdata;
-
-	g_return_if_fail(fba != NULL);
-	g_return_if_fail(fba->post_form_id != NULL);
-	g_return_if_fail(fbuddy->uid != 0);
-
-	buddy_uid = g_strdup_printf("%" G_GINT64_FORMAT, fbuddy->uid);
-
-	postdata = g_strdup_printf(
-			"type=friend_connect&id=%s&actions[accept]=Confirm&"
-			"post_form_id=%s&fb_dtsg=%s&confirm=%s&"
-			"post_form_id_source=AsyncRequest&__a=1",
-			buddy_uid, fba->post_form_id, fba->dtsg, buddy_uid);
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/reqs.php",
-			postdata, NULL, NULL, FALSE);
-
-	g_hash_table_remove(fba->auth_buddies, buddy_uid);
-	
-	g_free(postdata);
-	g_free(fbuddy);
-	g_free(buddy_uid);
-}
-
-static void fb_auth_reject_cb(gpointer data)
-{
-	FacebookBuddy *fbuddy = data;
-	FacebookAccount *fba = fbuddy->fba;
-	gchar *buddy_uid;
-	gchar *postdata;
-
-	g_return_if_fail(fba != NULL);
-	g_return_if_fail(fba->post_form_id != NULL);
-	g_return_if_fail(fbuddy->uid != 0);
-
-	buddy_uid = g_strdup_printf("%" G_GINT64_FORMAT, fbuddy->uid);
-
-	postdata = g_strdup_printf(
-			"type=friend_connect&id=%s&action=reject&"
-			"post_form_id=%s&fb_dtsg=%s&"
-			"post_form_id_source=AsyncRequest&__a=1",
-			buddy_uid, fba->post_form_id, fba->dtsg);
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/reqs.php",
-			postdata, NULL, NULL, FALSE);
-
-	g_hash_table_remove(fba->auth_buddies, buddy_uid);
-	
-	g_free(postdata);
-	g_free(fbuddy);
-	g_free(buddy_uid);
-}
-
-static void fb_check_friend_request_cb(FacebookAccount *fba, const gchar *data,
-		gsize data_len, gpointer user_data)
-{
-	const char *uid_pre_text = "class=\"confirm\" id=\"friend_connect_";
-	const char *name_pre_text = "<td class=\"info\"><a ";
-	const char *msg_pre_text = "<div class=\"personal_msg\"><span>";
-	gchar *uid;
-	gint64 uid_int;
-	gchar *name;
-	gchar *msg;
-	gchar *msg_plain;
-	FacebookBuddy *buddy;
-	const gchar *search_start = data;
-
-	g_return_if_fail(data_len > 0);
-	g_return_if_fail(data != NULL);
-
-	/* loop through the data and look for confirm_friend_add_([0-9]*)" */
-	while ((search_start = strstr(search_start, uid_pre_text)))
-	{
-		search_start += strlen(uid_pre_text);
-		uid = g_strndup(search_start,
-				strchr(search_start, '"') - search_start);
-		purple_debug_info("facebook", "uid: %s\n", uid);
-
-		uid_int = atoll(uid);
-
-		if (g_hash_table_lookup_extended(fba->auth_buddies,
-						uid, NULL, NULL))
-		{
-			/* we've already notified the user of this friend request */
-			g_free(uid);
-			continue;
-		}
-
-		name = strstr(search_start, name_pre_text);
-		if (name != NULL)
-		{
-			name += strlen(name_pre_text);
-			name = strchr(name, '>') + 1;
-			name = g_strndup(name, strchr(name, '<') - name);
-			purple_debug_info("facebook", "name: %s\n", name);
-		} else {
-			name = NULL;
-		}
-
-		msg = strstr(search_start, msg_pre_text);
-		if (msg != NULL)
-		{
-			msg += strlen(msg_pre_text);
-			msg = g_strndup(msg, strstr(msg, "</span></div>") - msg);
-			msg_plain = purple_markup_strip_html(msg);
-			g_free(msg);
-			purple_debug_info("facebook", "msg: %s\n", msg_plain);
-		} else {
-			msg_plain = NULL;
-		}
-
-		buddy = g_new0(FacebookBuddy, 1);
-		buddy->fba = fba;
-		buddy->uid = uid_int;
-		purple_account_request_authorization(
-				fba->account, uid, NULL,
-				name, msg_plain, TRUE,
-				fb_auth_accept_cb, fb_auth_reject_cb, buddy);
-
-		/* Don't display an auth request for this buddy again */
-		g_hash_table_insert(fba->auth_buddies, uid, NULL);
-		
-		g_free(name);
-		g_free(msg_plain);		
-	}
-}
-
-gboolean fb_check_friend_requests(gpointer data)
-{
-	FacebookAccount *fba;
-
-	fba = data;
-
-	if (purple_account_get_bool(
-			fba->account, "facebook_manage_friends", FALSE)) {
-		fb_post_or_get(fba, FB_METHOD_GET, NULL, "/reqs.php", NULL,
-				fb_check_friend_request_cb, NULL, FALSE);
-	}
-
-	return TRUE;
-}
-
-void fb_add_buddy(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group)
-{
-	gchar *postdata;
-	FacebookAccount *fba = pc->proto_data;
-	gchar *buddy_tmp;
-
-	if (!purple_account_get_bool(
-				fba->account, "facebook_manage_friends", FALSE)) {
-		/*
-		 * We used to pop up dialogs here but if a user renamed a group,
-		 * this would spawn message for each person in the buddy list.  Bad!
-		purple_notify_info(fba->pc, _("Friend not added"),
-				_("Adding Facebook friends via Pidgin is disabled"),
-				_("Either add a friend via Facebook.com or edit your account preferences"));
-		*/
-		purple_debug_warning("facebook", "attempted to add %s but was blocked\n", buddy->name);
-		return;
-	}
-
-	if (atoll(buddy->name) == fba->uid)
-	{
-		purple_account_set_bool(fba->account,
-				"facebook_hide_self", FALSE);
-		return;
-	}
-
-	buddy_tmp = g_strdup(purple_url_encode(buddy->name));
-	postdata = g_strdup_printf(
-			"user=%" G_GINT64_FORMAT "&profile_id=%s&message=&"
-			"source=&submit=1&post_form_id=%s&fb_dtsg=%s&"
-			"post_form_id_source=AsyncRequest&__a=1",
-			fba->uid, buddy_tmp, fba->post_form_id, fba->dtsg);
-	g_free(buddy_tmp);
-
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/profile/connect.php",
-			postdata, NULL, NULL, FALSE);
-
-	g_free(postdata);
-}
-
-void fb_buddy_delete(PurpleConnection *pc, PurpleBuddy *buddy,
-		PurpleGroup *group)
-{
-	FacebookAccount *fba = pc->proto_data;
-	gchar *buddy_tmp, *postdata;
-
-	//This function removes a buddy from our friends list on facebook
-	//and shouldn't really be used
-	if (!purple_account_get_bool(fba->account, "facebook_manage_friends", FALSE)) {
-		purple_debug_warning("facebook", "attempted to add %s but was blocked\n", buddy->name);
-		return;
-	}
-
-	buddy_tmp = g_strdup(purple_url_encode(buddy->name));
-	postdata = g_strdup_printf(
-			"uid=%s&post_form_id=%s&fb_dtsg=%s&"
-			"post_form_id_source=AsyncRequest&__a=1",
-			buddy_tmp, fba->post_form_id, fba->dtsg);
-	g_free(buddy_tmp);
-
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/profile/removefriend.php",
-			postdata, NULL, NULL, FALSE);
-
-	g_free(postdata);
-}
============================================================
--- libpurple/protocols/facebook/fb_managefriends.h	7273887ad32b467c8a644c5be09c1fa3cea0c80e
+++ /dev/null	
@@ -1,30 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_MANAGEFRIENDS_H
-#define FACEBOOK_MANAGEFRIENDS_H
-
-#include "libfacebook.h"
-
-gboolean fb_check_friend_requests(gpointer data);
-void fb_add_buddy(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group);
-void fb_buddy_delete(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group);
-
-#endif /* FACEBOOK_MANAGEFRIENDS_H */
============================================================
--- libpurple/protocols/facebook/fb_messages.c	a68e3d53c5d9556d30ff11a48f4c70fdf56f189a
+++ /dev/null	
@@ -1,531 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_messages.h"
-#include "fb_connection.h"
-#include "fb_conversation.h"
-#include "fb_blist.h"
-#include "fb_util.h"
-
-#include "conversation.h"
-
-typedef struct _FacebookOutgoingMessage FacebookOutgoingMessage;
-
-struct _FacebookOutgoingMessage {
-	FacebookAccount *fba;
-	gchar *who;
-	GTimeVal time;
-	gchar *message;
-	gint msg_id;
-	guint retry_count;
-	guint resend_timer;
-};
-
-static gboolean fb_send_im_fom(FacebookOutgoingMessage *msg);
-static gboolean fb_resend_im_fom(FacebookOutgoingMessage *msg);
-
-static FacebookOutgoingMessage *fb_msg_create(FacebookAccount *fba)
-{
-	FacebookOutgoingMessage *msg;
-	
-	msg = g_new0(FacebookOutgoingMessage, 1);
-	msg->fba = fba;
-	
-	return msg;
-}
-
-static void fb_msg_destroy(FacebookOutgoingMessage *msg)
-{
-	if (msg->resend_timer) {
-		purple_timeout_remove(msg->resend_timer);
-	}
-	g_free(msg->who);
-	g_free(msg->message);
-	g_free(msg);	
-}
-
-void fb_cancel_resending_messages(FacebookAccount *fba)
-{
-	while (fba->resending_messages != NULL) {
-		FacebookOutgoingMessage *msg = fba->resending_messages->data;
-		fba->resending_messages = g_slist_remove(fba->resending_messages, msg);
-		fb_msg_destroy(msg);
-	}	
-}
-
-static void parse_message(PurpleConnection *pc, FacebookAccount *fba,
-	JsonObject *messageObj, const char* from, const char* to)
-{
-	gint64 message_time;
-	const gchar *message;
-
-	purple_debug_info("facebook", "message from %s to %s\n", from, to);
-
-	message = json_node_get_string(
-		json_object_get_member(messageObj, "text"));
-
-	message_time = fb_time_kludge(json_node_get_int(
-				json_object_get_member(messageObj, "time")));
-
-	fb_conversation_handle_message(fba, from, to, message_time, message, TRUE);			
-}
-
-static void parse_new_messages(PurpleConnection *pc, FacebookAccount *fba, JsonArray *messages)
-{
-	int i;
-	PurpleBuddy *buddy;
-
-	purple_debug_info("facebook", "parsing new messages\n");
-
-	for (i = 0; i < json_array_get_length(messages); i++) {
-		const gchar *type;
-		gchar *from, *to;
-		
-
-		JsonObject *object = json_node_get_object(json_array_get_element(messages, i));
-		type = json_node_get_string(json_object_get_member(object, "type"));
-
-		from = g_strdup_printf("%" G_GINT64_FORMAT, (gint64)json_node_get_int(json_object_get_member(object, "from")));
-		to = g_strdup_printf("%" G_GINT64_FORMAT, (gint64)json_node_get_int(json_object_get_member(object, "to")));
-		
-		/* Use the in-line buddy name if the buddy list hasn't been downloaded yet */
-		buddy = purple_find_buddy(pc->account, from);
-		if (buddy == NULL || buddy->server_alias == NULL || buddy->alias == NULL)
-		{
-			if (json_object_has_member(object, "from_name"))
-			{
-				const gchar *from_name = json_node_get_string(json_object_get_member(
-					object, "from_name"));
-				fb_blist_set_alias(fba, from, from_name);
-			}
-		}
-
-		if (from && to && g_str_equal(type, "msg")) {
-			JsonObject *messageObj = json_node_get_object(json_object_get_member(object, "msg"));
-			parse_message(pc, fba, messageObj, from, to);
-		} else if (from && g_str_equal(type, "typ")) {
-			purple_debug_info("facebook", "handling typing notification\n");
-
-			gint typing = json_node_get_int(json_object_get_member(object, "st"));
-			if (typing == 0) {
-				serv_got_typing(pc, from, 10, PURPLE_NOT_TYPING);
-			} else {
-				serv_got_typing(pc, from, 10, PURPLE_TYPING);
-			}
-		}
-
-		/*
-		 * we've received something from a buddy, assume they're online
-		 * only if it's not from ourselves
-		 */
-		if (from && fba->uid != atoll(from)) {
-			purple_prpl_got_user_status(
-				fba->account, from, 
-				purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE), NULL);
-
-		}
-	
-		g_free(from);
-		g_free(to);
-
-		fba->message_fetch_sequence++;
-	}
-}
-								  
-static void got_new_messages(FacebookAccount *fba, const gchar *data,
-		gsize data_len, gpointer userdata)
-{
-	JsonParser *parser;
-
-	PurpleConnection *pc = userdata;
-
-	purple_debug_misc("facebook", "got new messages:\n%s\n", data);
-
-	/* for (;;);{"t":"msg","c":"p_800753867","ms":[{"type":"msg",
-		"msg":{"text":"yes","time":1211176515861,"clientTime":1211176514750,
-		"msgID":"367146364"},"from":596176850,"to":800753867,
-		"from_name":"Jeremy Lawson","to_name":"Eion Robb",
-		"from_first_name":"Jeremy","to_first_name":"Eion"}]} */
-	/* for (;;);{"t":"refresh"} */
-	/* for (;;);{"t":"msg","c":"p_800753867","ms":[{"type":"msg",
-		"msg":{"text":"porn head","time":1211177326689,"clientTime":1211177325,
-		"msgID":"-1992480367"},"from":800753867,"to":596176850,
-		"from_name":"Eion Robb","to_name":"Jeremy Lawson",
-		"from_first_name":"Eion","to_first_name":"Jeremy"}]} */
-	/* for (;;);{"t":"msg","c":"p_800753867","ms":[{"type":"typ","st":1,
-		"from":596176850,"to":800753867},{"type":"msg","msg":{"text":"nubile!",
-		"time":1211177334019,"clientTime":1211177326690,"msgID":"696260545"},
-		"from":596176850,"to":800753867,"from_name":"Jeremy Lawson",
-		"to_name":"Eion Robb","from_first_name":"Jeremy","to_first_name":"Eion"},
-		{"type":"msg","msg":{"text":"test2","time":1211177336688,
-		"clientTime":1211177326691,"msgID":"1527815367"},"from":596176850,
-		"to":800753867,"from_name":"Jeremy Lawson","to_name":"Eion Robb",
-		"from_first_name":"Jeremy","to_first_name":"Eion"},{"type":"msg",
-		"msg":{"text":"ahhhhhhh!","time":1211177344361,"clientTime":1211177326692,
-		"msgID":"4028916254"},"from":596176850,"to":800753867,
-		"from_name":"Jeremy Lawson","to_name":"Eion Robb",
-		"from_first_name":"Jeremy","to_first_name":"Eion"}]} */
-	/* for (;;);{"t":"msg","c":"p_800753867","ms":[{"type":"msg",
-		"msg":{"text":"2","time":1211178167261,"clientTime":1211178164656,
-		"msgID":"3382240259"},"from":596176850,"to":800753867,
-		"from_name":"Jeremy Lawson","to_name":"Eion Robb",
-		"from_first_name":"Jeremy","to_first_name":"Eion"}]} */
-	/* for (;;);{"t":"refresh", "seq":1} */
-
-	parser = fb_get_parser(data, data_len);
-	if (!parser)
-	{
-		/* Sometimes proxies will return incorrect data, so we just shrug 
-		 * it off.
-		 * TODO: Only do this for proxies.  And when we do it, keep track
-		 * of consecutive failures in the case something is actually
-		 * wrong with Facebook.  Eventually this condition should cause
-		 * failure */
-		/* Continue looping, waiting for more messages */
-		purple_debug_error("facebook",
-				"got data back, but it's not even json\n");
-				
-		fb_get_new_messages(fba);
-		return;
-	}
-
-	JsonObject *objnode = fb_get_json_object(parser, NULL);
-
-	if (json_object_has_member(objnode, "t")) {
-		const gchar* command = json_node_get_string(json_object_get_member(objnode, "t"));
-		if (g_str_equal(command, "refresh")) {
-			if (json_object_has_member(objnode, "seq")) {
-				fba->message_fetch_sequence = json_node_get_int(
-					json_object_get_member(objnode, "seq"));
-			}
-
-			/* grab history items for all open conversations */
-			GList *conversations = purple_get_conversations();
-			while (conversations != NULL) {
-				PurpleConversation *conv =
-					(PurpleConversation *)conversations->data;
-				if (fb_conversation_is_fb(conv)) {
-					purple_debug_info("facebook",
-						"checking for dropped messages with %s\n",
-						conv->name);
-					fb_history_fetch(fba, conv->name, FALSE);
-				}
-				conversations = conversations->next;
-			}
-
-			/* refresh means that the channel is invalid */
-			fb_reconnect(fba);
-			json_parser_free(parser);
-			return;
-		} else if (g_str_equal(command, "continue")) {
-			/* continue means that the server wants us to remake the connection.
- 			 * continue the loop and wait for messages. noop. */
-		} else if (g_str_equal(command, "msg")) {
-			parse_new_messages(pc, fba,
-				json_node_get_array(json_object_get_member(objnode, "ms")));
-		}
-	}
-
-	json_parser_free(parser);
-
-	/* Continue looping, waiting for more messages */
-	fb_get_new_messages(fba);
-}
-
-/* Message fetch loop.  An invariant here is that get_new_messages()
- * is the only function which can create a new timer for
- * new_messages_check_timer.  The timer always calls got_new_messages(),
- * and got_new_messages always calls get_new_messages (either directly
- * or indirectly).  To start the loops off, get_new_messages should be
- * called ONCE and only ONCE.  After that the timers will take care of
- * themselves until final cleanup.
- */
-gboolean fb_get_new_messages(FacebookAccount *fba)
-{
-	time_t now;
-	gchar *fetch_url;
-	gchar *fetch_server;
-	const gchar *channel_number;
-
-	fba->new_messages_check_timer = 0;
-
-	now = time(NULL);
-	if (fba->last_messages_download_time > now - 3) {
-		/*
-		 * Wait a bit before fetching more messages, to make sure we
-		 * never hammer their servers.
-		 *
-		 * TODO: This could be smarter.  Like, allow 3 requests per
-		 *       10 seconds or something.
-		 */
-		fba->new_messages_check_timer = purple_timeout_add_seconds(
-				3 - (now - fba->last_messages_download_time),
-				(GSourceFunc)fb_get_new_messages, fba);
-		return FALSE;
-	}
-
-	if (fba->channel_number == NULL)
-	{
-		return FALSE;
-	} else {
-		channel_number = fba->channel_number;
-	}
-
-	purple_debug_info("facebook", "getting new messages\n");
-
-	fetch_server = g_strdup_printf("%d.%s.facebook.com", 0, channel_number);
-	/* use the current time in the url to get past any transparent proxy caches */
-	fetch_url = g_strdup_printf("/x/%lu/%s/p_%" G_GINT64_FORMAT "=%d", (gulong)time(NULL), (fba->is_idle?"false":"true"), fba->uid, fba->message_fetch_sequence);
-
-	fb_post_or_get(fba, FB_METHOD_GET, fetch_server, fetch_url, NULL, got_new_messages, fba->pc, TRUE);
-	fba->last_messages_download_time = now;
-
-	g_free(fetch_url);
-	g_free(fetch_server);
-
-	return FALSE;
-}
-
-static void fb_send_im_cb(FacebookAccount *fba, const gchar *data, gsize data_len, gpointer user_data)
-{
-	FacebookOutgoingMessage *msg = user_data;
-	JsonParser *parser;
-	JsonObject *object;
-	PurpleConversation *conv;
-	gchar *error = NULL;
-
-	purple_debug_misc("facebook", "sent im response: %s\n", data);
-	
-	parser = fb_get_parser(data, data_len);
-	if (!parser) {
-		// We didn't get data, but this isn't necessarily fatal.
-		purple_debug_warning("facebook", "bad data while parsing sent IM\n");
-		return;
-	}
-	object = fb_get_json_object(parser, &error);
-	
-	if (error)
-	{
-		purple_debug_error("facebook", "sent im error: %s\n", error);
-		/* there was an error, either report it or retry */
-		if (msg->retry_count++ < FB_MAX_MSG_RETRY)
-		{
-			msg->resend_timer = purple_timeout_add_seconds(1, (GSourceFunc)fb_resend_im_fom, msg);
-			fba->resending_messages = g_slist_prepend(fba->resending_messages, msg);
-			json_parser_free(parser);
-			return;
-		}
-		else
-		{
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
-					fba->account, msg->who);
-			purple_conversation_write(conv, NULL, error,
-					PURPLE_MESSAGE_ERROR, msg->time.tv_sec);
-		}
-		
-		g_hash_table_remove(fba->sent_messages_hash, msg->message);
-	}
-
-	json_parser_free(parser);
-	fb_msg_destroy(msg);
-}
-
-static gboolean fb_send_im_fom(FacebookOutgoingMessage *msg)
-{
-	gchar *encoded_message;
-	gchar *postdata;
-	gchar *jstime;
-	
-	jstime = g_strdup_printf("%ld%ld", msg->time.tv_sec, (msg->time.tv_usec/1000));
-
-	encoded_message = g_strdup(purple_url_encode(msg->message));
-	postdata = g_strdup_printf("msg_text=%s&msg_id=%d&to=%s&client_time=%s&post_form_id=%s",
-			encoded_message, msg->msg_id, msg->who, jstime,
-			msg->fba->post_form_id ? msg->fba->post_form_id : "0");
-	g_free(encoded_message);
-	g_free(jstime);
-
-	fb_post_or_get(msg->fba, FB_METHOD_POST, NULL, "/ajax/chat/send.php", postdata, fb_send_im_cb, msg, FALSE);
-	g_free(postdata);
-
-	return FALSE;
-}
-
-static gboolean fb_resend_im_fom(FacebookOutgoingMessage *msg)
-{
-	msg->fba->resending_messages = g_slist_remove(msg->fba->resending_messages, msg);
-
-	return fb_send_im_fom(msg);
-}
-
-int fb_send_im(PurpleConnection *pc, const gchar *who, const gchar *message, PurpleMessageFlags flags)
-{
-	FacebookOutgoingMessage *msg;
-	FacebookAccount *fba = pc->proto_data;
-
-	msg = fb_msg_create(fba);
-
-	/* convert html to plaintext, removing trailing spaces */
-	msg->message = purple_markup_strip_html(message);
-	if (strlen(msg->message) > 999)
-	{
-		fb_msg_destroy(msg);
-		return -E2BIG;
-	}
-
-	msg->msg_id = g_random_int();
-	msg->who = g_strdup(who);
-	g_get_current_time(&msg->time);
-	msg->retry_count = 0;
-
-	//save that we're sending the message
-	g_hash_table_insert(fba->sent_messages_hash, strdup(msg->message), NULL);
-
-	fb_send_im_fom(msg);
-
-	/* Return 1 so UI will display message */
-	return 1;
-}
-
-void got_reconnect_json(FacebookAccount *fba, const gchar *data, gsize data_len, gpointer userdata)
-{
-	JsonParser *parser;
-	JsonObject *objnode;
-
-	parser = fb_get_parser(data, data_len);
-
-	if (!parser) {
-		purple_debug_error("facebook", "couldn't parse reconnect data\n");
-		purple_debug_info("facebook", "page content: %s\n", data);
-		purple_connection_error_reason(fba->pc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Chat service currently unavailable"));
-		return;
-	}
-
-	objnode = fb_get_json_object(parser, NULL);
-
-	JsonObject *payload = json_node_get_object(json_object_get_member(objnode, "payload"));
-	
-	/* eg {"host":"channel01"} */
-	const gchar *new_channel_host = json_node_get_string(json_object_get_member(payload, "host"));
-
-	if (new_channel_host == NULL)
-	{
-		purple_debug_error("facebook", "couldn't find new channel number\n");
-		purple_debug_info("facebook", "page content: %s\n", data);
-		purple_connection_error_reason(fba->pc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Error fetching channel; did you log in elsewhere?"));
-		json_parser_free(parser);
-		return;
-	}
-	
-	g_free(fba->channel_number);
-	fba->channel_number = g_strdup(new_channel_host);
-	
-	gint new_seq = json_node_get_int(json_object_get_member(payload, "seq"));
-	fba->message_fetch_sequence = new_seq;
-	
-	/*
-	 * Now that we have a channel number we can start looping and
-	 * waiting for messages
-	 */
-	fb_get_new_messages(fba);
-	json_parser_free(parser);
-}
-
-gboolean fb_reconnect(FacebookAccount *fba)
-{
-	gchar *url = g_strdup_printf("/ajax/presence/reconnect.php?reason=7&post_form_id=%s&__a=1", fba->post_form_id);
-	fb_post_or_get(fba, FB_METHOD_GET, NULL, url, NULL, got_reconnect_json, NULL, FALSE);
-	g_free(url);
-	
-	return FALSE;
-}
-
-static void got_form_id_page(FacebookAccount *fba, const gchar *data, gsize data_len, gpointer userdata)
-{
-	const gchar *start_text = "id=\"post_form_id\" name=\"post_form_id\" value=\"";
-	const gchar *dtsg_start = "fb_dtsg:\"";
-	const gchar *channel_start = "js\", \"channel";
-	const gchar *channel_start2 = "js\",\"channel";
-	gchar *post_form_id;
-	gchar *channel = NULL;
-	gchar *tmp = NULL;
-	FacebookFunc callback;
-	
-	/* NULL data crashes on Windows */
-	if (data == NULL)
-		data = "(null)";
-	
-	tmp = g_strstr_len(data, data_len, start_text);
-	if (tmp == NULL)
-	{
-		purple_debug_error("facebook", "couldn't find post_form_id\n");
-		purple_debug_info("facebook", "page content: %s\n", data);
-		/* Maybe they changed their HTML slightly? */
-		purple_connection_error_reason(fba->pc,
-				PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
-				_("Error getting info from Facebook."));
-		return;
-	}
-	tmp += strlen(start_text);
-	post_form_id = g_strndup(tmp, strchr(tmp, '"') - tmp);
-	
-	g_free(fba->post_form_id);
-	fba->post_form_id = post_form_id;
-	
-	tmp = g_strstr_len(data, data_len, dtsg_start);
-	if (tmp != NULL)
-	{
-		tmp += strlen(dtsg_start);
-		g_free(fba->dtsg);
-		fba->dtsg = g_strndup(tmp, strchr(tmp, '"') - tmp);
-	}
-
-	tmp = g_strstr_len(data, data_len, channel_start);
-	if (tmp != NULL)
-	{
-		tmp += 6;
-	} else {
-		tmp = g_strstr_len(data, data_len, channel_start2);
-		if (tmp != NULL)
-			tmp += 5;
-	}
-	if (tmp != NULL)
-	{
-		channel = g_strndup(tmp, strchr(tmp, '"') - tmp);
-		g_free(fba->channel_number);
-		fba->channel_number = channel;
-	}
-	
-	if (userdata)
-	{
-		callback = userdata;
-		callback(fba);
-	}
-}
-
-gboolean fb_get_post_form_id(FacebookAccount *fba, FacebookFunc callback)
-{
-	fb_post_or_get(fba, FB_METHOD_GET, NULL, "/presence/popout.php", NULL, got_form_id_page, callback, FALSE);
-	return FALSE;
-}
============================================================
--- libpurple/protocols/facebook/fb_messages.h	7ecfce3f7074f5876a23403922ec0ae691eaedde
+++ /dev/null	
@@ -1,35 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_MESSAGES_H
-#define FACEBOOK_MESSAGES_H
-
-#include "libfacebook.h"
-
-gboolean fb_get_post_form_id(FacebookAccount *fba, FacebookFunc callback);
-gboolean fb_reconnect(FacebookAccount *fba);
-int fb_send_im(PurpleConnection *pc, const gchar *who, const gchar *message,
-		PurpleMessageFlags flags);
-
-void fb_cancel_resending_messages(FacebookAccount *fba);
-
-gboolean fb_get_new_messages(FacebookAccount *fba);
-
-#endif /* FACEBOOK_MESSAGES_H */
============================================================
--- libpurple/protocols/facebook/fb_notifications.c	3358d387fd6f063dd96182632bf38084f62bdcf3
+++ /dev/null	
@@ -1,198 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_notifications.h"
-#include "fb_connection.h"
-
-static void fb_got_notifications_cb(FacebookAccount *fba, const gchar *url_text, gsize len, gpointer userdata)
-{
-	gchar *salvaged;
-	time_t last_fetch_time;
-	time_t time_of_message;
-	time_t newest_message = 0;
-	gchar *tmp;
-	gchar month_string[4], weekday[4];
-	guint year, month, day, hour, minute, second;
-	long timezone;
-	gchar *subject, *url;
-
-	month_string[3] = weekday[3] = '\0';
-	year = month = day = hour = minute = second = 0;
-
-	if (!url_text || !len)
-		return;
-
-	last_fetch_time = purple_account_get_int(fba->account, "facebook_notifications_last_fetch", 0);
-	/* purple_debug_info("facebook", "last fetch time: %zu\n", last_fetch_time); */
-
-	salvaged = purple_utf8_salvage(url_text);
-	xmlnode *rss_root = xmlnode_from_str(salvaged, -1);
-	g_free(salvaged);
-	if (rss_root == NULL)
-	{
-		purple_debug_error("facebook", "Could not load RSS file\n");
-		return;
-	}
-	xmlnode *channel = xmlnode_get_child(rss_root, "channel");
-	if (channel == NULL)
-	{
-		purple_debug_warning("facebook", "Invalid RSS feed\n");
-		xmlnode_free(rss_root);
-		return;
-	}
-	xmlnode *item = xmlnode_get_child(channel, "item");
-	if (item == NULL)
-	{
-		purple_debug_info("facebook", "No new notifications\n");
-	}
-	for (; item != NULL; item = xmlnode_get_next_twin(item))
-	{
-		xmlnode *pubDate = xmlnode_get_child(item, "pubDate");
-		if (!pubDate)
-			continue;
-		tmp = xmlnode_get_data_unescaped(pubDate);
-		/* rss times are in Thu, 19 Jun 2008 15:51:25 -1100 format */
-		sscanf(tmp, "%3s, %2u %3s %4u %2u:%2u:%2u %5ld", (char*)&weekday, &day, (char*)&month_string, &year, &hour, &minute, &second, &timezone);
-		if (g_str_equal(month_string, "Jan")) month = 0;
-		else if (g_str_equal(month_string, "Feb")) month = 1;
-		else if (g_str_equal(month_string, "Mar")) month = 2;
-		else if (g_str_equal(month_string, "Apr")) month = 3;
-		else if (g_str_equal(month_string, "May")) month = 4;
-		else if (g_str_equal(month_string, "Jun")) month = 5;
-		else if (g_str_equal(month_string, "Jul")) month = 6;
-		else if (g_str_equal(month_string, "Aug")) month = 7;
-		else if (g_str_equal(month_string, "Sep")) month = 8;
-		else if (g_str_equal(month_string, "Oct")) month = 9;
-		else if (g_str_equal(month_string, "Nov")) month = 10;
-		else if (g_str_equal(month_string, "Dec")) month = 11;
-		g_free(tmp);
-
-		/* try using pidgin's functions */
-		tmp = g_strdup_printf("%04u%02u%02uT%02u%02u%02u%05ld", year, month, day, hour, minute, second, timezone);
-		time_of_message = purple_str_to_time(tmp, FALSE, NULL, NULL, NULL);
-		g_free(tmp);
-
-		if (time_of_message <= 0)
-		{
-			/* there's no cross-platform, portable way of converting string to time
-			   which doesn't need a new version of glib, so just cheat */
-			time_of_message = second + 60*minute + 3600*hour + 86400*day + 2592000*month + 31536000*(year-1970);
-		}
-
-		if (time_of_message > newest_message)
-		{
-			/* we'll keep the newest message to save */
-			newest_message = time_of_message;
-		}
-
-		if (time_of_message <= last_fetch_time)
-		{
-			/* fortunatly, rss messages are ordered from newest to oldest */
-			/* so if this message is older than the last one, ignore rest */
-			break;
-		}
-		
-		xmlnode *link = xmlnode_get_child(item, "link");
-		if (link)
-		{
-			url = xmlnode_get_data_unescaped(link);
-		} else {
-			url = g_strdup("");
-		}
-		
-		xmlnode *title = xmlnode_get_child(item, "title");
-		if (title)
-		{
-			subject = xmlnode_get_data_unescaped(title);
-		} else {
-			subject = g_strdup("");
-		}
-		
-		purple_notify_email(fba->pc, subject, NULL, fba->account->username, url, NULL, NULL);
-		g_free(subject);
-		g_free(url);
-	}
-	xmlnode_free(rss_root);
-
-	if (newest_message > last_fetch_time)
-	{
-		/* update the last fetched time if we had newer messages */
-		purple_account_set_int(fba->account, "facebook_notifications_last_fetch", newest_message);
-	}
-}
-
-static void find_feed_url_cb(FacebookAccount *fba, const gchar *data, gsize data_len, gpointer userdata)
-{
-	const gchar *search_string = "/feeds/notifications.php";
-	gchar *feed_url;
-	gchar *stripped;
-
-	purple_debug_info("facebook", "find_feed_url_cb\n");
-
-	if (!data)
-		data = "(null)";
-
-	feed_url = g_strstr_len(data, data_len, search_string);
-	if (!feed_url)
-	{
-		purple_debug_error("facebook", "received data, but could not find url on page\n");
-		return;
-	}
-
-	feed_url = g_strndup(feed_url, strchr(feed_url, '"') - feed_url);
-
-	/* convert & to & */
-	stripped = purple_unescape_html(feed_url);
-	g_free(feed_url);
-	feed_url = stripped;
-	
-	purple_debug_info("facebook", "parsed feed url %s\n", feed_url);
-
-	if (feed_url && *feed_url)
-	{
-		purple_account_set_string(fba->account, "notifications_feed_url", feed_url);
-		fb_get_notifications_feed(fba);
-	}
-}
-
-static void fb_find_feed_url(FacebookAccount *fba)
-{
-	fb_post_or_get(fba, FB_METHOD_GET, NULL, "/notifications.php", NULL,
-			find_feed_url_cb, NULL, FALSE);
-}
-
-gboolean fb_get_notifications_feed(FacebookAccount *fba)
-{
-	const gchar *feed_url;
-
-	if (purple_account_get_bool(fba->account, "facebook_get_notifications", TRUE)) {
-		feed_url = purple_account_get_string(fba->account, "notifications_feed_url", NULL);
-		if (!feed_url)
-		{
-			purple_debug_info("facebook", "no notifications feed url available, searching for it\n");
-			fb_find_feed_url(fba);
-			return TRUE;
-		}
-
-		fb_post_or_get(fba, FB_METHOD_GET, NULL, feed_url, NULL, fb_got_notifications_cb, NULL, FALSE);
-	}
-
-	return TRUE;
-}
============================================================
--- libpurple/protocols/facebook/fb_notifications.h	e6eaace2cba400524a8fdb61f21fb8af96af57e7
+++ /dev/null	
@@ -1,28 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_NOTIFICATIONS_H
-#define FACEBOOK_NOTIFICATIONS_H
-
-#include "libfacebook.h"
-
-gboolean fb_get_notifications_feed(FacebookAccount *fba);
-
-#endif /* FACEBOOK_NOTIFICATIONS_H */
============================================================
--- libpurple/protocols/facebook/fb_search.c	5fe1103a70f6d161889aa7658b41b35399fac8a0
+++ /dev/null	
@@ -1,200 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "libfacebook.h"
-#include "fb_connection.h"
-#include "fb_info.h"
-#include "fb_search.h"
-
-static void fb_searchresults_add_buddy(PurpleConnection *pc, GList *row,
-		void *user_data)
-{
-	PurpleAccount *account = purple_connection_get_account(pc);
-
-	if (!purple_find_buddy(account, g_list_nth_data(row, 0)))
-		purple_blist_request_add_buddy(account,
-				g_list_nth_data(row, 0), NULL, NULL);
-}
-
-static void fb_searchresults_info_buddy(PurpleConnection *pc, GList *row,
-		void *user_data)
-{
-	/* PurpleAccount *account = purple_connection_get_account(pc); */
-
-	/* if (purple_find_buddy(account, g_list_nth_data(row, 0))) */
-		fb_get_info(pc, g_list_nth_data(row, 0));
-}
-
-static void fb_found_friends(FacebookAccount *fba, const gchar *data,
-		gsize data_len, gpointer user_data)
-{
-	PurpleNotifySearchResults *results;
-	PurpleNotifySearchColumn *column;
-	gchar *id, *tmp, *stripped;
-	const gchar *id_pos = data, *last_id_pos = 0;
-	gchar *search_term = user_data;
-	const gchar *id_search_term =
-			"facebook.com/inbox/?compose&id="; /* " */
-	const gchar *name_search_term = "class=\"url fn\""; /* < */
-	const gchar *network_search_term = "class=\"result_network\">"; /* < */
-
-	if (!g_strstr_len(data, data_len, id_search_term))
-	{
-		/* there's no friends found; notify as such */
-		tmp = g_strdup_printf(_("No results found for %s"),
-				search_term);
-		purple_notify_error(fba->pc, NULL, tmp, NULL);
-		g_free(tmp);
-		g_free(search_term);
-		return;
-	}
-
-	results = purple_notify_searchresults_new();
-	if (results == NULL)
-	{
-		g_free(search_term);
-		return;
-	}
-
-	/* columns: Facebook ID, Name, Network */
-	column = purple_notify_searchresults_column_new(_("ID"));
-	purple_notify_searchresults_column_add(results, column);
-	column = purple_notify_searchresults_column_new(_("Name"));
-	purple_notify_searchresults_column_add(results, column);
-	column = purple_notify_searchresults_column_new(_("Network"));
-	purple_notify_searchresults_column_add(results, column);
-	column = purple_notify_searchresults_column_new(_("In List?"));
-	purple_notify_searchresults_column_add(results, column);
-
-	if (purple_account_get_bool(fba->account, "facebook_manage_friends",
-				FALSE)) {
-		purple_notify_searchresults_button_add(results,
-				PURPLE_NOTIFY_BUTTON_ADD,
-				fb_searchresults_add_buddy);
-	}
-	purple_notify_searchresults_button_add(results,
-			PURPLE_NOTIFY_BUTTON_INFO,
-			fb_searchresults_info_buddy);
-
-	purple_debug_info("facebook", "found_friends\n");
-	while ((id_pos = strstr(id_pos, id_search_term)))
-	{
-		/* the row in the search results table */
-		/* prepend to it backwards then reverse to speed up adds */
-		GList *row = NULL;
-
-		/* grab id */
-		id_pos += strlen(id_search_term);
-		if (strchr(id_pos, '&') < strchr(id_pos, '"'))
-		{
-			/* new layout repeats the id */
-			continue;
-		}
-		id = g_strndup(id_pos, strchr(id_pos, '"')-id_pos);
-		purple_debug_info("facebook", "Found user with id: %s\n", id);
-		row = g_list_prepend(row, id);
-
-		/* look for name */
-		tmp = g_strrstr_len(data, id_pos-data, name_search_term);
-		if (tmp && tmp > last_id_pos)
-		{
-			tmp += strlen(name_search_term);
-			tmp = strchr(tmp, '>') + 1;
-			tmp = g_strndup(tmp, strchr(tmp, '<')-tmp);
-			stripped = purple_unescape_html(tmp);
-			g_free(tmp);
-			purple_debug_info("facebook", "With name: %s\n",
-					stripped);
-			row = g_list_prepend(row, stripped);
-		} else {
-			row = g_list_prepend(row, NULL);
-		}
-
-		/* look for network */
-		tmp = g_strrstr_len(data, id_pos-data, network_search_term);
-		if (tmp && tmp > last_id_pos)
-		{
-			tmp += strlen(network_search_term);
-			tmp = g_strndup(tmp, strchr(tmp, '<')-tmp);
-			stripped = purple_unescape_html(tmp);
-			g_free(tmp);
-			purple_debug_info("facebook", "With network: %s\n",
-					stripped);
-			row = g_list_prepend(row, stripped);
-		} else {
-			row = g_list_prepend(row, NULL);
-		}
-
-		if (purple_find_buddy(fba->account, id))
-			row = g_list_prepend(row, g_strdup(_("Yes")));
-		else
-			row = g_list_prepend(row, g_strdup(_("No")));
-
-		row = g_list_reverse(row);
-		purple_notify_searchresults_row_add(results, row);
-
-		last_id_pos = id_pos;
-	}
-	purple_debug_info("facebook", "dumping search results\n");
-	purple_notify_searchresults(fba->pc, NULL, search_term, NULL,
-			results, NULL, NULL);
-
-	g_free(search_term);
-}
-
-static void fb_search_users_search_cb(gpointer connection,
-		const gchar *search_text)
-{
-	PurpleConnection *pc = connection;
-	FacebookAccount *fba = pc->proto_data;
-	gchar *search_url;
-	gchar *search_tmp;
-	gchar *sid_cookie_value;
-
-	if (!search_text || !*search_text)
-		return;
-
-	search_tmp = g_strdup(purple_url_encode(search_text));
-	sid_cookie_value = g_hash_table_lookup(fba->cookie_table, "sid");
-	if (sid_cookie_value == NULL)
-		sid_cookie_value = "1";
-	search_url = g_strdup_printf("/s.php?q=%s&init=q&sid=%s",
-			search_tmp, sid_cookie_value);
-	g_free(search_tmp);
-
-	fb_post_or_get(fba, FB_METHOD_GET, NULL, search_url, NULL,
-			fb_found_friends, g_strdup(search_text), FALSE);
-
-	g_free(search_url);
-}
-
-void fb_search_users(PurplePluginAction *action)
-{
-	PurpleConnection *pc = (PurpleConnection *) action->context;
-
-	purple_request_input(pc, _("Search for Friends"),
-			_("Search for Facebook Friends"),
-			_("Type the full name or e-mail address of the friend you are searching for."),
-			NULL, FALSE, FALSE, NULL,
-			_("_Search"), G_CALLBACK(fb_search_users_search_cb),
-			_("_Cancel"), NULL,
-			purple_connection_get_account(pc), NULL, NULL,
-			pc);
-}
============================================================
--- libpurple/protocols/facebook/fb_search.h	c4e78a2ac047c38f1d18a677f7c7ecfbf7b383bf
+++ /dev/null	
@@ -1,28 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_SEARCH_H
-#define FACEBOOK_SEARCH_H
-
-#include "libfacebook.h"
-
-void fb_search_users(PurplePluginAction *action);
-
-#endif /* FACEBOOK_SEARCH_H */
============================================================
--- libpurple/protocols/facebook/libfacebook.c	26b3f5f2fae2cd652f04d3dfd42b1c83525e6c51
+++ /dev/null	
@@ -1,909 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "libfacebook.h"
-#include "fb_blist.h"
-#include "fb_connection.h"
-#include "fb_conversation.h"
-#include "fb_info.h"
-#include "fb_managefriends.h"
-#include "fb_messages.h"
-#include "fb_notifications.h"
-#include "fb_search.h"
-#include "fb_friendlist.h"
-
-static void fb_login_cb(FacebookAccount *fba, const gchar *response, gsize len,
-		gpointer userdata);
-static void fb_close(PurpleConnection *pc);
-static void fb_buddy_free(PurpleBuddy *buddy);
-
-/******************************************************************************/
-/* PRPL functions */
-/******************************************************************************/
-
-static const char *fb_list_icon(PurpleAccount *account, PurpleBuddy *buddy)
-{
-	return "facebook";
-}
-
-static gchar *fb_status_text(PurpleBuddy *buddy)
-{
-	FacebookBuddy *fbuddy = buddy->proto_data;
-
-	if (fbuddy && fbuddy->status && *fbuddy->status != '\0')
-		return g_strdup(fbuddy->status);
-
-	return NULL;
-}
-
-static void fb_tooltip_text(PurpleBuddy *buddy,
-		PurpleNotifyUserInfo *userinfo, gboolean full)
-{
-	FacebookBuddy *fbuddy = buddy->proto_data;
-	gchar *status;
-
-	g_return_if_fail(fbuddy);
-
-	if (fbuddy->status && *fbuddy->status != '\0')
-	{
-		status = g_strdup_printf("%s %s",
-				fbuddy->name, fbuddy->status);
-
-		purple_notify_user_info_add_pair(userinfo,
-				_("Status"), status);
-		g_free(status);
-	}
-}
-
-static GList *fb_statuses(PurpleAccount *account)
-{
-	GList *types = NULL;
-	PurpleStatusType *status;
-
-	/* Online people have a status message and also a date when it was set */
-	status = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
-		NULL, _("Online"), FALSE, TRUE, FALSE, "message",
-		_("Message"), purple_value_new(PURPLE_TYPE_STRING), NULL);
-	types = g_list_append(types, status);
-	
-	/* Cave into feature requests and allow people to set themselves to be idle */
-	status = purple_status_type_new_with_attrs(PURPLE_STATUS_AWAY,
-		NULL, _("Idle"), FALSE, TRUE, FALSE, "message",
-		_("Message"), purple_value_new(PURPLE_TYPE_STRING), NULL);
-	types = g_list_append(types, status);
-
-	/* Offline people dont have messages */
-	status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE, NULL, _("Offline"), FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	return types;
-}
-
-void fb_post_form_id_cb(FacebookAccount *fba)
-{
-	gchar *tmp;
-	
-	tmp = g_strdup_printf("visibility=true&post_form_id=%s", fba->post_form_id);
-	fb_post_or_get(fba, FB_METHOD_POST, "apps.facebook.com", "/ajax/chat/settings.php", tmp, NULL, NULL, FALSE);
-	g_free(tmp);
-	
-	if (fba->channel_number == NULL)
-	{
-		/* Grab new channel number */
-		fb_reconnect(fba);
-	} else {
-		fb_get_new_messages(fba);
-	}
-}
-
-static gboolean fb_get_messages_failsafe(FacebookAccount *fba)
-{
-	if (fba->last_messages_download_time < (time(NULL) - (60*5))) {
-		/* Messages haven't been downloaded in a while-
-		 * something is probably wrong */
-		purple_debug_warning("facebook",
-				"executing message check failsafe\n");
-		fb_get_post_form_id(fba, fb_post_form_id_cb);
-	}
-
-	return TRUE;
-}
-
-void fb_login_captcha_cancel_cb(PurpleConnection *pc, PurpleRequestFields *fields)
-{
-	purple_connection_error_reason(pc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-		"Could not authenticate captcha.  Logging into the Facebook website may fix this.");
-}
-
-void fb_login_captcha_ok_cb(PurpleConnection *pc, PurpleRequestFields *fields)
-{
-	const gchar *captcha_response;
-	gchar *postdata, *encoded_username, *encoded_password, *encoded_charset_test,
-			*encoded_persist_data, *encoded_response, *encoded_extra_challenge,
-			*encoded_session;
-	FacebookAccount *fba = pc->proto_data;
-
-	captcha_response = purple_request_fields_get_string(fields, "captcha_response");
-	
-	encoded_response = g_strdup(purple_url_encode(captcha_response));
-	encoded_username = g_strdup(purple_url_encode(
-			purple_account_get_username(fba->account)));
-	encoded_password = g_strdup(purple_url_encode(
-			purple_account_get_password(fba->account)));
-	encoded_extra_challenge = g_strdup(purple_url_encode(
-			fba->extra_challenge));
-	encoded_persist_data = g_strdup(purple_url_encode(
-			fba->persist_data));
-	encoded_session = g_strdup(purple_url_encode(
-			fba->captcha_session));
-	encoded_charset_test = g_strdup(purple_url_encode("EUR,?,EUR,?,?,?,?"));
-
-	postdata = g_strdup_printf("charset_test=%s&"
-								"version=1.0&"
-								"return_session=0&"
-								"charset_test=%s&"
-								"answered_captcha=1&"
-								"captcha_persist_data=%s&"
-								"captcha_session=%s&"
-								"extra_challenge_params=%s&"
-								"captcha_response=%s&"
-								"email=%s&pass=%s&"
-								"persistent=1",
-								encoded_charset_test, encoded_charset_test,
-								encoded_persist_data, encoded_session,
-								encoded_extra_challenge, encoded_response,
-								encoded_username, encoded_password);
-	g_free(encoded_username);
-	g_free(encoded_password);
-	g_free(encoded_charset_test);
-	g_free(encoded_extra_challenge);
-	g_free(encoded_persist_data);
-	g_free(encoded_response);
-	g_free(encoded_session);
-
-	fb_post_or_get(fba, FB_METHOD_POST | FB_METHOD_SSL, "login.facebook.com",
-			"/login.php?login_attempt=1&_fb_noscript=1", postdata, fb_login_cb, NULL, FALSE);
-	g_free(postdata);
-	
-	g_free(fba->extra_challenge);
-	g_free(fba->persist_data);
-	g_free(fba->captcha_session);
-	fba->extra_challenge = NULL;
-	fba->persist_data = NULL;
-	fba->captcha_session = NULL;
-}
-
-static void fb_login_captcha_image_cb(FacebookAccount *fba, const gchar *response, 
-		gsize len, gpointer userdata)
-{
-	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *group;
-	PurpleRequestField *field;
-	
-	fields = purple_request_fields_new();
-	group = purple_request_field_group_new(NULL);
-	purple_request_fields_add_group(fields, group);
-	
-	field = purple_request_field_image_new("captcha_image", "", response, len);
-	purple_request_field_group_add_field(group, field);
-	
-	field = purple_request_field_string_new("captcha_response", "", "", FALSE);
-	purple_request_field_group_add_field(group, field);
-	
-	purple_request_fields(fba->pc, 
-		_("Facebook Captcha"), _("Facebook Captcha"), 
-		_("Enter both words below, separated by a space"), 
-		fields, 
-		_("OK"), G_CALLBACK(fb_login_captcha_ok_cb), 
-		_("Logout"), G_CALLBACK(fb_login_captcha_cancel_cb), 
-		fba->account, NULL, NULL, fba->pc	 
-	);
-}
-
-static void fb_login_captcha_cb(FacebookAccount *fba, const gchar *response, 
-		gsize len, gpointer userdata)
-{
-	const gchar *challenge_start = "challenge : '";
-	gchar *challenge;
-	gchar *image_url;
-	
-	challenge = g_strstr_len(response, len, challenge_start);
-	if (challenge)
-	{
-		challenge += strlen(challenge_start);
-		challenge = g_strndup(challenge, strchr(challenge, '\'') - challenge);
-		
-		image_url = g_strdup_printf("/image?c=%s", challenge);
-		
-		fb_post_or_get(fba, FB_METHOD_GET | FB_METHOD_SSL, "api-secure.recaptcha.net",
-			image_url, NULL, fb_login_captcha_image_cb, NULL, FALSE);
-	}
-}
-
-static void fb_login_cb(FacebookAccount *fba, const gchar *response, gsize len,
-		gpointer userdata)
-{
-	gchar *user_cookie;
-	
-	if (len && g_strstr_len(response, len, "captcha") && !purple_account_get_bool(fba->account, "ignore-facebook-captcha", FALSE))
-	{
-		purple_debug_info("facebook", "captcha page: %s\n", response);
-
-		purple_connection_update_progress(fba->pc, _("Handling Captcha"), 2, 4);
-		
-		const gchar *persist_data_start = "<input type=\"hidden\" id=\"captcha_persist_data\" name=\"captcha_persist_data\" value=\"";
-		gchar *persist_data = g_strstr_len(response, len, persist_data_start);
-		if (persist_data)
-		{
-			persist_data += strlen(persist_data_start);
-			fba->persist_data = g_strndup(persist_data, strchr(persist_data, '"') - persist_data);
-		}
-		
-		const gchar *session_start = "<input type=\"hidden\" id=\"captcha_session\" name=\"captcha_session\" value=\"";
-		gchar *session = g_strstr_len(response, len, session_start);
-		if (session)
-		{
-			session += strlen(session_start);
-			fba->captcha_session = g_strndup(session, strchr(session, '"') - session);
-		}
-		
-		gchar *captcha_url;
-		const gchar *extra_challenge_params = "<input type=\"hidden\" id=\"extra_challenge_params\" name=\"extra_challenge_params\" value=\"";
-		gchar *extra_challenge = g_strstr_len(response, len, extra_challenge_params);
-		if (extra_challenge)
-		{
-			extra_challenge += strlen(extra_challenge_params);
-			fba->extra_challenge = g_strndup(extra_challenge, strchr(extra_challenge, '"') - extra_challenge);
-			extra_challenge = purple_unescape_html(fba->extra_challenge);
-			g_free(fba->extra_challenge);
-			fba->extra_challenge = extra_challenge;
-		}
-		
-		if (!fba->extra_challenge || !fba->persist_data || !fba->captcha_session)
-		{
-			purple_debug_info("facebook", "captcha response: %s\n", response);
-			g_free(fba->extra_challenge);
-			g_free(fba->persist_data);
-			g_free(fba->captcha_session);
-			fba->extra_challenge = NULL;
-			fba->persist_data = NULL;
-			fba->captcha_session = NULL;
-			purple_connection_error_reason(fba->pc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
-				"Could not authenticate captcha.  Logging into the Facebook website may fix this.");
-			return;
-		}
-		
-		captcha_url = g_strdup_printf("/challenge?k=" FACEBOOK_CAPTCHA_SITE "&%s",
-				fba->extra_challenge?fba->extra_challenge:"");
-		
-		fb_post_or_get(fba, FB_METHOD_GET | FB_METHOD_SSL, "api-secure.recaptcha.net",
-			captcha_url, NULL, fb_login_captcha_cb, NULL, FALSE);
-		
-		g_free(captcha_url);
-		
-		return;
-	}
-
-	purple_connection_update_progress(fba->pc, _("Authenticating"), 2, 3);
-
-	/* Look for our uid */
-	user_cookie = g_hash_table_lookup(fba->cookie_table, "c_user");
-	if (user_cookie == NULL) {
-		/*
-		 * Server didn't set the c_user cookie, so we must have given
-		 * them a bad username or password
-		 */
-		purple_connection_error_reason(fba->pc,
-				PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
-				_("Incorrect username or password."));
-		return;
-	}
-	fba->uid = atoll(user_cookie);
-	purple_debug_info("facebook", "uid %" G_GINT64_FORMAT "\n", fba->uid);
-
-	/* ok, we're logged in now! */
-	purple_connection_set_state(fba->pc, PURPLE_CONNECTED);
-
-	/* This will kick off our long-poll message retrieval loop */
-	fb_get_post_form_id(fba, &fb_post_form_id_cb);
-	fb_check_friend_requests(fba);
-
-	/* periodically check for people adding you to their facebook friend list */
-	fba->friend_request_timer = purple_timeout_add_seconds(60 * 5,
-			fb_check_friend_requests, fba);
-
-	/* periodically check for new notifications */
-	fba->notifications_timer = purple_timeout_add_seconds(60,
-			(GSourceFunc)fb_get_notifications_feed, fba);
-
-	/* Periodically check for new messages.  NOTE: This MUST exist,
-	 * regardless of other other mechanisms for checking messages.  This
-	 * is because the code needs a failsafe checker in case other one of
-	 * the other retrieval mechanisms dies due to a bad request, etc.
-	 * Without such a failsafe, a user will receive no messages, which is
-	 * one of hardest bugs to debug and get reports about.  Hence, the
-	 * importance of this loop.
-	 * That said, there is room for tweaking this loop and possibly even
-	 * setting it such that it is the primary or only message checker.
-	 * The key is that the method must NEVER die until logout.
-	 */
-	fba->perpetual_messages_timer = purple_timeout_add_seconds(15,
-			(GSourceFunc)fb_get_messages_failsafe, fba);
-
-	/* init blist subsystem */
-	fb_blist_init(fba);
-
-	/* init conversation subsystem */
-	fb_conversation_init(fba);
-}
-
-gboolean fb_do_http_login(FacebookAccount *fba, 
-		FacebookProxyCallbackFunc callback_func, gpointer user_data)
-{
-	gchar *postdata, *encoded_username, *encoded_password, *encoded_charset_test;
-	const gchar* const *languages;
-	const gchar *locale;
-	
-	if (fba == NULL)
-		return FALSE;
-	
-	/* Error localized in libpurple jabber.c */
-	if (!purple_ssl_is_supported()) {
-		purple_connection_error_reason (fba->pc,
-										PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-										_("Server requires TLS/SSL for login.  No TLS/SSL support found."));
-		return FALSE;
-	}
-	
-	if (fba->cookie_table == NULL)
-		fba->cookie_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	if (fba->hostname_ip_cache == NULL)
-		fba->hostname_ip_cache = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	if (fba->waiting_conns == NULL)
-		fba->waiting_conns = g_queue_new();
-	
-	g_hash_table_replace(fba->cookie_table, g_strdup("test_cookie"), g_strdup("1"));
-	g_hash_table_replace(fba->cookie_table, g_strdup("lsd"), g_strdup("abcde"));
-	
-	encoded_username = g_strdup(purple_url_encode(purple_account_get_username(fba->account)));
-	encoded_password = g_strdup(purple_url_encode(purple_account_get_password(fba->account)));
-	encoded_charset_test = g_strdup(purple_url_encode("EUR,?,EUR,?,?,?,?"));
-	languages = g_get_language_names();
-	locale = languages[0];
-	if (locale == NULL || g_str_equal(locale, "C"))
-		locale = "en_US";
-	
-	postdata = g_strdup_printf("charset_test=%s&locale=%s&email=%s&pass=%s&"
-							   "pass_placeHolder=Password&persistent=1&"
-							   "login=Login&charset_test=%s&lsd=abcde",
-							   encoded_charset_test, locale, encoded_username, 
-							   encoded_password, encoded_charset_test);
-	g_free(encoded_username);
-	g_free(encoded_password);
-	g_free(encoded_charset_test);
-	
-	fb_post_or_get(fba, FB_METHOD_POST | FB_METHOD_SSL, "login.facebook.com",
-				   "/login.php?login_attempt=1&_fb_noscript=1", postdata, callback_func, user_data, FALSE);
-	g_free(postdata);
-	
-	return TRUE;
-}
-
-static void fb_login(PurpleAccount *account)
-{
-	FacebookAccount *fba;
-	
-	/* Create account and initialize state */
-	fba = g_new0(FacebookAccount, 1);
-	fba->account = account;
-	fba->pc = purple_account_get_connection(account);
-	fba->uid = -1;
-	fba->last_messages_download_time = time(NULL) - 60; /* 60 secs is a safe buffer */
-	fba->cookie_table = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	fba->hostname_ip_cache = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	fba->sent_messages_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, NULL);
-	fba->auth_buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, NULL);
-
-	account->gc->proto_data = fba;
-
-	purple_connection_set_state(fba->pc, PURPLE_CONNECTING);
-	purple_connection_update_progress(fba->pc, _("Connecting"), 1, 3);
-
-	fb_do_http_login(fba, fb_login_cb, NULL);
-}
-
-static void fb_close(PurpleConnection *pc)
-{
-	FacebookAccount *fba;
-	GSList *buddies;
-
-	purple_debug_info("facebook", "disconnecting account\n");
-
-	g_return_if_fail(pc != NULL);
-	g_return_if_fail(pc->proto_data != NULL);
-	
-	fba = pc->proto_data;
-
-	purple_debug_info("facebook", "unloading plugin\n");
-
-	/* destroy blist subsystem */
-	fb_blist_destroy(fba);
-
-	/* destroy conversation subsystem */
-	fb_conversation_destroy(fba);
-
-	buddies = purple_find_buddies(fba->account, NULL);
-	while(buddies) {
-		PurpleBuddy *b = buddies->data;
-		fb_buddy_free(b);
-		buddies = g_slist_delete_link(buddies, buddies);
-	}
-
-	if (fba->friend_request_timer) {
-		purple_timeout_remove(fba->friend_request_timer);
-	}
-	if (fba->notifications_timer) {
-		purple_timeout_remove(fba->notifications_timer);
-	}
-	if (fba->new_messages_check_timer) {
-		purple_timeout_remove(fba->new_messages_check_timer);
-	}
-	if (fba->perpetual_messages_timer) {
-		purple_timeout_remove(fba->perpetual_messages_timer);
-	}
-	
-	purple_debug_info("facebook", "destroying %d waiting connections\n",
-					  g_queue_get_length(fba->waiting_conns));
-	
-	while (!g_queue_is_empty(fba->waiting_conns))
-		fb_connection_destroy(g_queue_pop_tail(fba->waiting_conns));
-	g_queue_free(fba->waiting_conns);
-	
-	purple_debug_info("facebook", "destroying %d incomplete connections\n",
-			g_slist_length(fba->conns));
-
-	while (fba->conns != NULL)
-		fb_connection_destroy(fba->conns->data);
-
-	while (fba->dns_queries != NULL) {
-		PurpleDnsQueryData *dns_query = fba->dns_queries->data;
-		purple_debug_info("facebook", "canceling dns query for %s\n",
-					purple_dnsquery_get_host(dns_query));
-		fba->dns_queries = g_slist_remove(fba->dns_queries, dns_query);
-		purple_dnsquery_destroy(dns_query);
-	}
-	
-	if (fba->resending_messages != NULL) {
-		fb_cancel_resending_messages(fba);
-	}
-
-	g_hash_table_destroy(fba->sent_messages_hash);
-	g_hash_table_destroy(fba->cookie_table);
-	g_hash_table_destroy(fba->hostname_ip_cache);
-	g_hash_table_destroy(fba->auth_buddies);
-	g_free(fba->post_form_id);
-	g_free(fba->dtsg);
-	g_free(fba->channel_number);
-	g_free(fba->last_status_message);
-	g_free(fba->extra_challenge);
-	g_free(fba->captcha_session);
-	g_free(fba->persist_data);
-	g_free(fba);
-}
-
-static unsigned int fb_send_typing(PurpleConnection *pc, const gchar *name,
-		PurpleTypingState state)
-{
-	int typing_state;
-	gchar *postdata;
-	FacebookAccount *fba = pc->proto_data;
-	gchar *encoded_name;
-
-	g_return_val_if_fail(fba != NULL, 0);
-	g_return_val_if_fail(fba->post_form_id != NULL, 0);
-
-	typing_state = (state == PURPLE_TYPING) ? 1 : 0;
-
-	/* Don't send typing notifications to self */
-	if (atoll(name) != fba->uid)
-	{
-		encoded_name = g_strdup(purple_url_encode(name));
-		postdata = g_strdup_printf("typ=%d&to=%s&post_form_id=%s",
-				typing_state, encoded_name, fba->post_form_id);
-		g_free(encoded_name);
-		fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/chat/typ.php",
-				postdata, NULL, NULL, FALSE);
-		g_free(postdata);
-	} else {
-		serv_got_typing(pc, name, 10, state);
-	}
-
-	/* 7 is the number of seconds before sending the new typing state.  It
-	 * corresponds with the default value that Facebook waits. */
-	return 7;
-}
-
-static void fb_set_status_ok_cb(gpointer data, const gchar *status_text)
-{
-	PurpleConnection *pc = data;
-	FacebookAccount *fba = pc->proto_data;
-	gchar *postdata;
-	gchar *status_tmp;
-	gchar *status_text_new;
-
-	g_return_if_fail(fba->post_form_id != NULL);
-
-	status_text_new = g_strstrip(g_strdup(status_text));
-
-	/* don't set the status if it's idential to what we've already set */
-	if (fba->last_status_message && g_str_equal(fba->last_status_message,
-				status_text_new)) {
-		g_free(status_text_new);
-		return;
-	}
-
-	g_free(fba->last_status_message);
-	fba->last_status_message = status_text_new;
-
-	if (*status_text_new != '\0')
-	{
-		status_tmp = g_strdup(purple_url_encode(status_text_new));
-		postdata = g_strdup_printf("profile_id=%" G_GINT64_FORMAT "&status=%s&post_form_id=%s",
-				fba->uid, status_tmp, fba->post_form_id);
-		g_free(status_tmp);
-	}
-	else
-		postdata = g_strdup_printf("profile_id=%" G_GINT64_FORMAT "&clear=1&post_form_id=%s",
-				fba->uid, fba->post_form_id);
-
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/updatestatus.php",
-			postdata, NULL, NULL, FALSE);
-
-	g_free(postdata);
-}
-
-static void fb_set_status_p(PurpleAccount *account, PurpleStatus *status)
-{
-	const gchar *message;
-	gchar *stripped;
-	FacebookAccount *fba = account->gc->proto_data;
-
-	/* if "away" set idle */
-	if (purple_status_type_get_primitive(purple_status_get_type(status)) == PURPLE_STATUS_AWAY)
-	{
-		if (fba)
-		{
-			fba->is_idle = TRUE;
-		}
-		return;
-	}
-
-	/* first check that we actually want to set this through Pidgin */
-	if (!purple_account_get_bool(account,
-				"facebook_set_status_through_pidgin", FALSE))
-	{
-		return;
-	}
-
-	message = purple_status_get_attr_string(status, "message");
-	if (message == NULL)
-		message = "";
-
-	stripped = purple_markup_strip_html(message);
-	fb_set_status_ok_cb(account->gc, stripped);
-	g_free(stripped);
-}
-
-static void fb_buddy_free(PurpleBuddy *buddy)
-{
-	FacebookBuddy *fbuddy = buddy->proto_data;
-	if (fbuddy != NULL)
-	{
-		buddy->proto_data = NULL;
-
-		g_free(fbuddy->name);
-		g_free(fbuddy->status);
-		g_free(fbuddy->thumb_url);
-		g_free(fbuddy);
-	}
-}
-
-#if PURPLE_MAJOR_VERSION >= 2 && PURPLE_MINOR_VERSION >= 5
-static GHashTable *fb_get_account_text_table(PurpleAccount *account)
-{
-	GHashTable *table;
-
-	table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	g_hash_table_insert(table, "login_label", (gpointer)_("Email Address..."));
-
-	return table;
-}
-#endif
-
-/******************************************************************************/
-/* Plugin functions */
-/******************************************************************************/
-
-static gboolean plugin_load(PurplePlugin *plugin)
-{
-	return TRUE;
-}
-
-static gboolean plugin_unload(PurplePlugin *plugin)
-{
-	return TRUE;
-}
-
-static void fb_set_status_cb(PurplePluginAction *action)
-{
-	PurpleConnection *pc = action->context;
-	FacebookAccount *fba = pc->proto_data;
-	gchar *uid_str;
-
-	uid_str = g_strdup_printf("%" G_GINT64_FORMAT, fba->uid);
-
-	purple_request_input(pc, NULL, _("Set your Facebook status"),
-			purple_account_get_alias(pc->account), "is ",
-			FALSE, FALSE, NULL, _("OK"),
-			G_CALLBACK(fb_set_status_ok_cb), _("Cancel"),
-			NULL, pc->account, uid_str, NULL, pc);
-
-	g_free(uid_str);
-}
-
-static void fb_display_plugin_info(PurplePluginAction *action)
-{
-	purple_notify_info(action->context, _("About Facebook for Pidgin"),
-			_("Version"), FACEBOOK_PLUGIN_VERSION);
-}
-
-static void fb_refresh_blist(PurplePluginAction *action)
-{
-	PurpleConnection *pc;
-	FacebookAccount *fba;
-
-	pc = (PurpleConnection *) action->context;
-	fba = pc->proto_data;
-
-	fb_get_buddy_list(fba);
-}
-
-static GList *fb_actions(PurplePlugin *plugin, gpointer context)
-{
-	GList *m = NULL;
-	PurplePluginAction *act;
-
-	act = purple_plugin_action_new(_("About Facebook for Pidgin"),
-			fb_display_plugin_info);
-	m = g_list_append(m, act);
-
-	act = purple_plugin_action_new(_("Set Facebook status..."),
-			fb_set_status_cb);
-	m = g_list_append(m, act);
-
-	act = purple_plugin_action_new(_("Search for buddies..."),
-			fb_search_users);
-	m = g_list_append(m, act);
-
-	// TODO: remove, this is for testing.  REMOVE.
-	act = purple_plugin_action_new(_("Refresh buddy list..."),
-			fb_refresh_blist);
-	m = g_list_append(m, act);
-
-	return m;
-}
-
-static GList *fb_node_menu(PurpleBlistNode *node)
-{
-	GList *m = NULL;
-	PurpleMenuAction *act;
-	PurpleBuddy *buddy;
-	
-	if(PURPLE_BLIST_NODE_IS_BUDDY(node))
-	{
-		buddy = (PurpleBuddy *)node;
-		
-		act = purple_menu_action_new(_("_Poke"),
-				PURPLE_CALLBACK(fb_blist_poke_buddy),
-				NULL, NULL);
-		m = g_list_append(m, act);
-	}
-	return m;
-}
-
-static void fb_set_idle(PurpleConnection *gc, int time)
-{
-	FacebookAccount *fba = gc->proto_data;
-	
-	g_return_if_fail(fba != NULL);
-	
-	if (time)
-	{
-		fba->is_idle = TRUE;
-	} else {
-		fba->is_idle = FALSE;
-	}
-}
-
-static void plugin_init(PurplePlugin *plugin)
-{
-	PurpleAccountOption *option;
-	PurplePluginInfo *info = plugin->info;
-	PurplePluginProtocolInfo *prpl_info = info->extra_info;
-
-	/* Add options to the advanced screen in the account settings */
-	option = purple_account_option_bool_new(
-		_("Show history in new conversations"),
-		"facebook_show_history", TRUE);
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-
-	
-	option = purple_account_option_bool_new(
-		_("Use Facebook friend-lists as Pidgin groups"),
-		"facebook_use_groups", TRUE);
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-	
-	option = purple_account_option_bool_new(
-		_("Hide myself in the Buddy List"),
-		"facebook_hide_self", TRUE);
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-
-	option = purple_account_option_bool_new(
-		_("Set Facebook status through Pidgin status"),
-		"facebook_set_status_through_pidgin", FALSE);
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-
-	option = purple_account_option_bool_new(
-		_("Show Facebook notifications as e-mails in Pidgin"),
-		"facebook_get_notifications", TRUE);
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-	
-	option = purple_account_option_string_new(
-		_("Notifications RSS Feed URL"),
-		"notifications_feed_url", "");
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-
-	option = purple_account_option_bool_new(
-		_("Edit Facebook friends from Pidgin"),
-		"facebook_manage_friends", FALSE);
-	prpl_info->protocol_options = g_list_append(
-		prpl_info->protocol_options, option);
-}
-
-static PurplePluginProtocolInfo prpl_info = {
-	/* options */
-	OPT_PROTO_MAIL_CHECK,
-
-	NULL,                   /* user_splits */
-	NULL,                   /* protocol_options */
-	/* NO_BUDDY_ICONS */    /* icon_spec */
-	{"jpg", 0, 0, 50, 50, -1, PURPLE_ICON_SCALE_SEND}, /* icon_spec */
-	fb_list_icon,           /* list_icon */
-	NULL,                   /* list_emblems */
-	fb_status_text,         /* status_text */
-	fb_tooltip_text,        /* tooltip_text */
-	fb_statuses,            /* status_types */
-	fb_node_menu,           /* blist_node_menu */
-	NULL,                   /* chat_info */
-	NULL,                   /* chat_info_defaults */
-	fb_login,               /* login */
-	fb_close,               /* close */
-	fb_send_im,             /* send_im */
-	NULL,                   /* set_info */
-	fb_send_typing,         /* send_typing */
-	fb_get_info,            /* get_info */
-	fb_set_status_p,        /* set_status */
-	fb_set_idle,            /* set_idle */
-	NULL,                   /* change_passwd */
-	fb_add_buddy,           /* add_buddy */
-	NULL,                   /* add_buddies */
-	fb_buddy_remove,        /* remove_buddy */
-	NULL,                   /* remove_buddies */
-	NULL,                   /* add_permit */
-	NULL,                   /* add_deny */
-	NULL,                   /* rem_permit */
-	NULL,                   /* rem_deny */
-	NULL,                   /* set_permit_deny */
-	NULL,                   /* join_chat */
-	NULL,                   /* reject chat invite */
-	NULL,                   /* get_chat_name */
-	NULL,                   /* chat_invite */
-	NULL,                   /* chat_leave */
-	NULL,                   /* chat_whisper */
-	NULL,                   /* chat_send */
-	NULL,                   /* keepalive */
-	NULL,                   /* register_user */
-	NULL,                   /* get_cb_info */
-	NULL,                   /* get_cb_away */
-	NULL,                   /* alias_buddy */
-	fb_group_buddy_move,    /* group_buddy */
-	fb_group_rename,        /* rename_group */
-	fb_buddy_free,          /* buddy_free */
-	fb_conversation_closed, /* convo_closed */
-	purple_normalize_nocase,/* normalize */
-	NULL,                   /* set_buddy_icon */
-	fb_group_remove,        /* remove_group */
-	NULL,                   /* get_cb_real_name */
-	NULL,                   /* set_chat_topic */
-	NULL,                   /* find_blist_chat */
-	NULL,                   /* roomlist_get_list */
-	NULL,                   /* roomlist_cancel */
-	NULL,                   /* roomlist_expand_category */
-	NULL,                   /* can_receive_file */
-	NULL,                   /* send_file */
-	NULL,                   /* new_xfer */
-	NULL,                   /* offline_message */
-	NULL,                   /* whiteboard_prpl_ops */
-	NULL,                   /* send_raw */
-	NULL,                   /* roomlist_room_serialize */
-	NULL,                   /* unregister_user */
-	NULL,                   /* send_attention */
-	NULL,                   /* attention_types */
-#if PURPLE_MAJOR_VERSION >= 2 && PURPLE_MINOR_VERSION >= 5
-	sizeof(PurplePluginProtocolInfo), /* struct_size */
-	fb_get_account_text_table, /* get_account_text_table */
-#else
-	(gpointer) sizeof(PurplePluginProtocolInfo)
-#endif
-};
-
-static PurplePluginInfo info = {
-	PURPLE_PLUGIN_MAGIC,
-	2,						/* major_version */
-	3, 						/* minor version */
-	PURPLE_PLUGIN_PROTOCOL, 			/* type */
-	NULL, 						/* ui_requirement */
-	0, 						/* flags */
-	NULL, 						/* dependencies */
-	PURPLE_PRIORITY_DEFAULT, 			/* priority */
-	FACEBOOK_PLUGIN_ID,				/* id */
-	"Facebook", 					/* name */
-	FACEBOOK_PLUGIN_VERSION, 			/* version */
-	N_("Facebook Protocol Plugin"), 		/* summary */
-	N_("Facebook Protocol Plugin"), 		/* description */
-	"Eion Robb <eionrobb at gmail.com>", 		/* author */
-	"http://pidgin-facebookchat.googlecode.com/",	/* homepage */
-	plugin_load, 					/* load */
-	plugin_unload, 					/* unload */
-	NULL, 						/* destroy */
-	NULL, 						/* ui_info */
-	&prpl_info, 					/* extra_info */
-	NULL, 						/* prefs_info */
-	fb_actions, 					/* actions */
-
-							/* padding */
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-PURPLE_INIT_PLUGIN(facebook, plugin_init, info);
============================================================
--- libpurple/protocols/facebook/libfacebook.h	c7f920d377b94b738396470d9fe9a34ba09fcbbf
+++ /dev/null	
@@ -1,134 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef LIBFACEBOOK_H
-#define LIBFACEBOOK_H
-
-#define FACEBOOK_PLUGIN_VERSION "1.65"
-#define FACEBOOK_PLUGIN_ID "prpl-bigbrownchunx-facebookim"
-#define FACEBOOK_CAPTCHA_SITE "6LezHAAAAAAAADqVjseQ3ctG3ocfQs2Elo1FTa_a"
-
-/* Maximum number of simultaneous connections to a server */
-#define FB_MAX_CONNECTIONS 32
-
-#include <glib.h>
-
-#include <errno.h>
-#include <string.h>
-#include <glib/gi18n.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#ifndef G_GNUC_NULL_TERMINATED
-#	if __GNUC__ >= 4
-#		define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#	else
-#		define G_GNUC_NULL_TERMINATED
-#	endif /* __GNUC__ >= 4 */
-#endif /* G_GNUC_NULL_TERMINATED */
-
-#ifdef _WIN32
-#	include "win32dep.h"
-#	define dlopen(a,b) LoadLibrary(a)
-#	define RTLD_LAZY
-#	define dlsym(a,b) GetProcAddress(a,b)
-#	define dlclose(a) FreeLibrary(a)
-#else
-#	include <arpa/inet.h>
-#	include <dlfcn.h>
-#	include <netinet/in.h>
-#	include <sys/socket.h>
-#endif
-
-#ifndef PURPLE_PLUGINS
-#	define PURPLE_PLUGINS
-#endif
-
-#include "accountopt.h"
-#include "connection.h"
-#include "debug.h"
-#include "dnsquery.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "sslconn.h"
-#include "version.h"
-
-#if GLIB_MAJOR_VERSION >= 2 && GLIB_MINOR_VERSION >= 12
-#	define atoll(a) g_ascii_strtoll(a, NULL, 0)
-#endif
-
-#define FB_MAX_MSG_RETRY 2
-
-typedef struct _FacebookAccount FacebookAccount;
-typedef struct _FacebookBuddy FacebookBuddy;
-
-typedef void (*FacebookProxyCallbackFunc)(FacebookAccount *fba, const gchar *data, gsize data_len, gpointer user_data);
-typedef void (*FacebookFunc)(FacebookAccount *fba);
-
-struct _FacebookAccount {
-	PurpleAccount *account;
-	PurpleConnection *pc;
-	GSList *conns; /**< A list of all active FacebookConnections */
-	GQueue *waiting_conns; /**< A list of all FacebookConnections waiting to process */
-	GSList *dns_queries;
-	GHashTable *cookie_table;
-	gchar *post_form_id;
-	gint64 uid;
-	guint buddy_list_timer; 		/* handled by fb_blist */
-	GHashTable *friend_lists;		/* handled by fb_friendlist */
-	GHashTable *friend_lists_reverse;	/* handled by fb_friendlist */
-	guint friend_request_timer;
-	gchar *channel_number;
-	guint message_fetch_sequence;
-	gint64 last_message_time;		/* handled by fb_conversation */
-	GSList *resending_messages;
-	GHashTable *auth_buddies;
-	GHashTable *hostname_ip_cache;
-	guint notifications_timer;
-	time_t last_messages_download_time;
-	guint new_messages_check_timer;
-	guint perpetual_messages_timer;
-	gchar *last_status_message;
-	gboolean is_idle;
-	GHashTable *sent_messages_hash;
-	gint last_inbox_count;
-	gchar *extra_challenge;
-	gchar *persist_data;
-	gchar *captcha_session;
-	gint last_status_timestamp;
-	guint bad_buddy_list_count;
-	gchar *dtsg;
-};
-
-struct _FacebookBuddy {
-	FacebookAccount *fba;
-	PurpleBuddy *buddy;
-	gint64 uid;
-	gchar *name;
-	gchar *status;
-	gchar *thumb_url;
-};
-
-
-gboolean fb_do_http_login(FacebookAccount *fba, 
-		FacebookProxyCallbackFunc callback_func, gpointer user_data);
-
-#endif /* LIBFACEBOOK_H */
============================================================
--- libpurple/protocols/facebook/login.facebook.com.pem	95e6d2dd6733436f6c1ecee7264751969145ad1b
+++ /dev/null	
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUTCCArqgAwIBAgIDBRtMMA0GCSqGSIb3DQEBBAUAMFoxCzAJBgNVBAYTAlVT
-MRwwGgYDVQQKExNFcXVpZmF4IFNlY3VyZSBJbmMuMS0wKwYDVQQDEyRFcXVpZmF4
-IFNlY3VyZSBHbG9iYWwgZUJ1c2luZXNzIENBLTEwHhcNMDYxMjEzMDczMTQ5WhcN
-MTAwMTEyMDczMTQ5WjCBwDELMAkGA1UEBhMCVVMxGzAZBgNVBAoTEmxvZ2luLmZh
-Y2Vib29rLmNvbTETMBEGA1UECxMKR1QwNDQ4MjQ1MjExMC8GA1UECxMoU2VlIHd3
-dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwcyAoYykwNjEvMC0GA1UECxMmRG9t
-YWluIENvbnRyb2wgVmFsaWRhdGVkIC0gUXVpY2tTU0woUikxGzAZBgNVBAMTEmxv
-Z2luLmZhY2Vib29rLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1R9N
-IM5CJpFurag3pBa3ZOahUvLgh9sGa2Ur0MT3+5tWJYw5ay2r74WK6dYv2bcrqDLU
-uyHWJWCeJewglGs2VZ3cOPxN9x68OPxuTP0IPpAJDpphFne3zTH5njkfitrV2oaW
-UgzbkbUEaFnVOpeScy9U4Ks6uVTgV+KNsZFEsCkCAwEAAaOBvTCBujAOBgNVHQ8B
-Af8EBAMCBPAwHQYDVR0OBBYEFM627PadoUPV4GdpPT8AbJOxchf+MDsGA1UdHwQ0
-MDIwMKAuoCyGKmh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvZ2xvYmFsY2Ex
-LmNybDAfBgNVHSMEGDAWgBS+qKB0clBrRLfJI9j7qP+zV2tobDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQQF
-AAOBgQBRlplWgG9NU89FVKCDkUNCoTqkdPJw4Nl7Ypdpf6WhPk3dq57teOseTKCf
-O3XxHLqz+EYslUO4K5l88RgF+dK+dlESmjmewAtADpkrSC4DHKg6fdFywObnD9b9
-TqibCw82YJ3b7v6G3Ec4ApD0sqiQqrz59pWjdFrZwagyT42YFw==
------END CERTIFICATE-----
============================================================
--- libpurple/protocols/facebook/pidgin-facebookchat.rc	ad98bb312d865fa1422790bf78d4e9d3730582f8
+++ /dev/null	
@@ -1,28 +0,0 @@
-
-1 VERSIONINFO
-FILEVERSION 1,65,0,0
-PRODUCTVERSION 1,65,0,0
-FILEOS 0x40004 // VOS_NT_WINDOWS32
-FILETYPE 0x2 // VFT_DLL
-{
-BLOCK "StringFileInfo"
-{
-	BLOCK "040904B0" // U.S. English, Unicode
-	{
-		VALUE "CompanyName", "Eion Robb\0"
-		VALUE "FileDescription",  "Facebook Chat plugin for Pidgin\0"
-		VALUE "ProductName", "pidgin-facebookchat\0"
-		VALUE "FileVersion", "1.65\0"
-		VALUE "ProductVersion", "1.65\0"
-		VALUE "InternalName", "pidgin-facebookchat\0"
-		VALUE "OriginalFilename", "libfacebook.dll\0"
-		VALUE "Comments", "http://pidgin-facebookchat.googlecode.com/\0"
-	}
-}
-
-BLOCK "VarFileInfo"
-{
-	VALUE "Translation", 0x0409, 0x04B0 // U.S. English, Unicode
-}
-}
-
============================================================
--- libpurple/protocols/facebook/rss.xml	567c3aa5d4fa196f8211764630cd6d709b89aa31
+++ /dev/null	
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-	<channel>
-		<title>pidgin-facebookchat Changelog</title>
-		<atom:link href="http://pidgin-facebookchat.googlecode.com/svn/trunk/rss.xml" rel="self" type="application/rss+xml" />
-		<link>http://code.google.com/p/pidgin-facebookchat/wiki/Changelog</link>
-		<description>Recent updates for the Facebook plugin for Pidgin</description>
-		<language>en-NZ</language>
-		<image>
-			<title>pidgin-facebookchat Changelog</title>
-			<url>http://pidgin-facebookchat.googlecode.com/svn/trunk/facebook48.png</url>
-			<link>http://code.google.com/p/pidgin-facebookchat/</link>
-			<width>48</width><height>48</height>
-		</image>
-		<item>
-			<title>Version 1.65</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c53</link>
-			<description><![CDATA[Hi all. Been a wee while since the last version of the plugin.  This version has a 
-			fix for newer buddy icons being too small, and also downloads all your offline 
-			buddies as well as your online ones.<br/>
-			Download from usual place<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Downloads">http://code.google.com/p/pidgin-facebookchat/wiki/Downloads</a><br/>
-			<br/>
-			Also, in case you haven't heard, Facebook has come out with an XMPP interface (so 
-			you dont *have* to use this plugin to connect to FB anymore).  I'm currently 
-			working on rewriting a new, more stable version 2.0 of the plugin, which will use 
-			XMPP, while filling in some of the gaps of features that you're all used to by now :)<br/>]]></description>
-			<pubDate>Fri 26 Feb 2010 14:40:29 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c53</guid>
-		</item>
-		<item>
-			<title>Version 1.64</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c52</link>
-			<description><![CDATA[I've just dropped v1.64 out for download at<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Downloads">http://code.google.com/p/pidgin-facebookchat/wiki/Downloads</a><br/>
-			<br/>
-			It fixes up some really annoying things like buddy icons not working and some strange status message stuffs.<br/>
-			<br/>
-			Changelog:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Changelog">http://code.google.com/p/pidgin-facebookchat/wiki/Changelog</a><br/>
-			<br/>
-			(Apologies to rss feed subscribers for the slow post) ]]></description>
-			<pubDate>Fri 4 December 2009 17:43:30 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c52</guid>
-		</item>
-		<item>
-			<title>Version 1.63</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c51</link>
-			<description><![CDATA[Just pushed out v1.63 which fixes up a few of the little annoying things that didn't 
-			work since the last update.<br/>
-			Status messages are back, inbox notifications are back, friend accept/reject/add is 
-			back.<br/>
-			<br/>
-			Download as usual from<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Downloads">
-			http://code.google.com/p/pidgin-facebookchat/wiki/Downloads</a>
-			]]></description>
-			<pubDate>Sat, 14 November 2009 12:21:52 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c51</guid>
-		</item>
-		<item>
-			<title>Version 1.62</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c50</link>
-			<description><![CDATA[Some of you fancy people might have noticed that the plugin hasn't been doing too well over the last few hours.<br/>
-			Fortunately, I've been hard at work to quickly push out a new version.<br/>
-			<br/>
-			Grab it from<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Downloads">http://code.google.com/p/pidgin-facebookchat/wiki/Downloads</a><br/>
-			while it's still hot]]></description>
-			<pubDate>Wed, 4 November 2009 18:49:10 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c50</guid>
-		</item>
-		<item>
-			<title>Version 1.61</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c49</link>
-			<description><![CDATA[Against all odds, I've just put out a new version 1.61 of the plugin.  It should fix up the problems with messages arriving from weird numbers, but it also now requires version 0.7.6 of json-glib to work.  It might or might not also have the option to disable friends lists, depending on who you ask :)<br/><br/>
-			Changelog:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Changelog">http://code.google.com/p/pidgin-facebookchat/wiki/Changelog</a><br/>
-			Download:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a><br/>]]></description>
-			<pubDate>Tue, 8 September 2009 17:38:16 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c49</guid>
-		</item>
-		<item>
-			<title>Version 1.60</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c48</link>
-			<description><![CDATA[Hi all, sorry for the recent weirdness with the plugin.  v1.60 is out which addresses the major bit of these problems.<br/>
-			Changelog:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Changelog">http://code.google.com/p/pidgin-facebookchat/wiki/Changelog</a><br/>
-			Download:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a><br/>
-			(apologies to you RSS readers out there who missed out on v1.54)]]></description>
-			<pubDate>Fri, 17 July 2009 22:05:20 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c48</guid>
-		</item>
-		<item>
-			<title>Version 1.53</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c46</link>
-			<description><![CDATA[<a href="http://www.pidgin.im">Pidgin 2.5.8</a> is available and so is 1.53 of pidgin-facebookchat.
-			<br/><br/>
-			We've fixed some important things such as no more missing messages, and buddy names working.  You can see all the neat things we've done at:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Changelog">http://code.google.com/p/pidgin-facebookchat/wiki/Changelog</a>
-			<br/><br/>
-			Thank you all for using the plugin!  If you feel like helping me pay for my fianc?es $300/month medication bills I'd really appreciate a donation.  Even one or two dollars can go a long way.  You can donate at:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Donate">http://code.google.com/p/pidgin-facebookchat/wiki/Donate</a>
-			<br/><br/>
-			Otherwise, go grab the update from the usual place:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>]]></description>
-			<pubDate>Mon, 29 June 2009 20:56:20 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c46</guid>
-		</item>
-		<item>
-			<title>Version 1.52</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c45</link>
-			<description><![CDATA[Just uploaded version 1.52 which fixes an annoying crash sometimes.  Don't forget to download 2.5.7 of Pidgin while you're at it
-			<br/><br/>
-			Download pidgin-facebookchat from:<br/>
-			http://code.google.com/p/pidgin-facebookchat/downloads/list]]></description>
-			<pubDate>Mon, 22 June 2009 19:04:56 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c45</guid>
-		</item>
-		<item>
-			<title>Version 1.51</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c44</link>
-			<description><![CDATA[Version 1.51 of the pidgin-facebookchat plugin is available for download.<br/>
-			<br/>
-			Download (as usual) from:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">
-			http://code.google.com/p/pidgin-facebookchat/downloads/list</a><br/>
-			<br/>
-			A list of the changes to the plugin is at:<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Changelog">
-			http://code.google.com/p/pidgin-facebookchat/wiki/Changelog</a><br/>
-			<br/>
-			If you're a package maintainer, you'll want to look at my blog post:<br/>
-			<a href="http://eion.robbmob.com/blog/2009/06/12/pidgin-facebookchat-v1-51-important-changes/">
-			http://eion.robbmob.com/blog/2009/06/12/pidgin-facebookchat-v1-51-important-changes/</a><br/>
-			(Shameless plug)<br/>
-			<br/>
-			And of course, if you like this plugin feel free to leave a comment or donation at<br/>
-			<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Donate">
-			http://code.google.com/p/pidgin-facebookchat/wiki/Donate</a>
-			]]></description>
-			<pubDate>Sat, 13 June 2009 19:24:19 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c44</guid>
-		</item>
-		<item>
-			<title>Version 1.50</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c42</link>
-			<description><![CDATA[So its been a while since the last version so I've bumped it up to v1.50.
-			<br/><br/>
-			This version should (hopefully) fix the bandwidth issues that people are having, as well as a crash-on-quit issue.			
-			<br/><br/>
-			Oh, and some people may be interested to try setting their status to 'idle' when they set their status to 'away'.  Maybe.  Haven't tried it :)
-			<br/><br/>
-			Download v1.50 of the plugin from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>]]></description>
-			<pubDate>Mon, 13 Apr 2009 00:03:29 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c42</guid>
-		</item>	
-		<item>
-			<title>Version 1.47</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c41</link>
-			<description><![CDATA[v1.47 Gets rid of the "(via Pidgin)" but when setting status message and fixes some rare crashes
-			<br/><br/>
-			Download v1.47 of the plugin from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>]]></description>
-			<pubDate>Wed, 31 Dec 2008 18:18:18 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c41</guid>
-		</item>	
-		<item>
-			<title>Version 1.46</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c40</link>
-			<description><![CDATA[v1.46 is out, and for once we didn't have any crashes to fix :)
-			<br/><br/>
-We've added support for Pokes, we've made the idle/away stuff work properly, the buddy icons are larger for everyone, and aliases work better on buddies.
-			<br/><br/>
-Just a bit of news: this Facebook plugin is now in Meebo, thanks to Mark Doliner from Meebo who is a "Project Member" of this plugin.  Also, Casey Ho (who has been doing a fantastic job of triaging issues) has been promoted to "Project Owner" so that he can mess around with the page a bit.
-			<br/><br/>
-I just wanted to say a big public thanks to both these people for their hard work.  This plugin gets thousands of downloads and it's so exciting for me to see the plugin in Meebo so that thousands more people can enjoy the plugin :)
-			<br/><br/>
-Without futher ado, grab v1.46 of the plugin from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>]]></description>
-			<pubDate>Mon, 29 Dec 2008 23:00:00 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c40</guid>
-		</item>
-		<item>
-			<title>Version 1.45</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c39</link>
-			<description><![CDATA[v1.45 Fixes a couple more crashes and some memory leaks.
-			<br/><br/>
-Go get v1.45 from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>]]></description>
-			<pubDate>Fri, 19 Dec 2008 00:00:00 +1300</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c39</guid>
-		</item>
-		<item>
-			<title>Version 1.44</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c38</link>
-			<description><![CDATA[v1.44 Fixes a couple of crashes and might help you if you're experiencing any problems.
-			<br/><br/>
-Go get v1.44 from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>]]></description>
-			<pubDate>Tue, 11 Dec 2008 00:00:00 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c38</guid>
-		</item>
-		<item>
-			<title>Version 1.43</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c37</link>
-			<description><![CDATA[v1.43 is available for download.
-			<br/><br/>
-It fixes 2 major crashes, and the status message now updates properly.  Also, the .deb package should work for Finch or libpurple installs now, and not just Pidgin.
-			<br/><br/>
-Go get v1.43 from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a>
-			<br/><br/>
-Send us developers some hard-earned love at:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/wiki/Donate">http://code.google.com/p/pidgin-facebookchat/wiki/Donate</a> ]]></description>
-			<pubDate>Mon, 8 Dec 2008 00:00:00 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c37</guid>
-		</item>
-		<item>
-			<title>Version 1.41</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c35</link>
-			<description><![CDATA[v1.41 is out, hot on the heels of version 1.40... two releases in one day.
-			<br/><br/>
-The only real reason for this update is to address a couple of minor bugs and some annoying crashes.  That should be all of them.
-Also new to the table is an RSS feed at <a href="http://pidgin-facebookchat.googlecode.com/svn/trunk/rss.xml">http://pidgin-facebookchat.googlecode.com/svn/trunk/rss.xml</a>.  I'll keep updating the issue, so that you can still be kept up-to-date by email, but now you have another option.
-			<br/><br/>
-From now on, the minimum version of Pidgin you'll need is 2.3.0.  Also, the source package has changed slightly, so if you've got any automated build scripts you might want to update them.
-			<br/><br/>
-Go download v1.41 from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a> ]]></description>
-			<pubDate>Wed, 3 Dec 2008 17:41:09 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c36</guid>
-		</item>
-		<item>
-			<title>Version 1.40</title>
-			<link>http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c35</link>
-			<description><![CDATA[So thanks to the fantastic efforts of Mark and Casey, v1.40 is now available for download.  They've fixed most of the crashes and made the plugin really really stable.
-		<br/><br/>
-Go download v1.40 from:<br/>
-<a href="http://code.google.com/p/pidgin-facebookchat/downloads/list">http://code.google.com/p/pidgin-facebookchat/downloads/list</a> ]]></description>
-			<pubDate>Wed, 3 Dec 2008 07:31:09 +1200</pubDate>
-			<guid isPermaLink="true">http://code.google.com/p/pidgin-facebookchat/issues/detail?id=24#c35</guid>
-		</item>
-	</channel>
-</rss>
-
============================================================
--- libpurple/protocols/facebook/fb_conversation.c	2dece593f09b3a8e8a8f18a0b26daad0b9a52240
+++ /dev/null	
@@ -1,259 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_conversation.h"
-#include "fb_connection.h"
-#include "fb_util.h"
-#include "fb_json.h"
-
-#include "conversation.h"
-#include "signals.h"
-
-/*****************************************************************************
- * MESSAGE PROCESSING                                                        *
- *****************************************************************************/
-void fb_conversation_handle_message(FacebookAccount *fba, const char *from,
-	const char *to, gint64 message_time, const gchar *message_orig,
-	gboolean log)
-{
-	gchar *tmp, *message_text;
-
-	if (!log) {
-		purple_debug_info("facebook", "message with no logging\n");
-	}
-
-	// Process message.
-	message_text = fb_strdup_withhtml(message_orig);
-	tmp = message_text;
-	message_text = fb_replace_styled_text(message_text);
-	g_free(tmp);
-
-	if (fba->uid != atoll(from) || fba->uid == atoll(to)) {
-		purple_debug_info("facebook",
-			"displaying received message %lld: %s\n",
-			(long long int) message_time, message_text);
-		// TODO/FIXME: cheat here by changing formatting colors.
-		// Or add an option to just disable history on conv open.  TBD.
-		serv_got_im(fba->pc, from, message_text,
-			log? 
-				PURPLE_MESSAGE_RECV :
-				PURPLE_MESSAGE_RECV,
-			message_time / 1000);
-		if (message_time > fba->last_message_time) {
-			fba->last_message_time = message_time;
-		} else {
-			purple_debug_warning("facebook",
-					"displaying message out of sync\n");
-		}
-	} else if (!g_hash_table_remove(
-		fba->sent_messages_hash, message_orig))
-	{
-		purple_debug_info("facebook",
-			"displaying sent message %lld: %s\n",
-			(long long int) message_time, message_text);
-
-		serv_got_im(fba->pc, to, message_text,
-			log? 
-				PURPLE_MESSAGE_SEND :
-				PURPLE_MESSAGE_SEND,
-			message_time / 1000);
-		if (message_time > fba->last_message_time) {
-			fba->last_message_time = message_time;
-		} else {
-			purple_debug_warning("facebook",
-					"displaying message out of sync\n");
-		}
-	}
-
-	// Cleanup.
-	g_free(message_text);
-}
-
-
-/*****************************************************************************
- * HISTORY CODE                                                              *
- *****************************************************************************/
-
-static void fb_history_fetch_cb(FacebookAccount *fba, const gchar *data,
-	gsize data_len, gpointer userdata)
-{
-	JsonParser *parser;
-	JsonObject *object, *payload;
-	JsonArray *history;
-	guint i;
-	gint64 min_time;
-
-	parser = fb_get_parser(data, data_len);
-
-	if (!parser) {
-		// We didn't get data, but this isn't necessarily fatal.
-		purple_debug_warning("facebook",
-			"bad data while fetching history\n");
-		return;
-	}
-
-	min_time = atoll((char *) userdata);
-	g_free(userdata);
-	purple_debug_info("facebook", "history fetch with min time of %lld\n",
-		       (long long int) min_time);	
-
-	object = fb_get_json_object(parser, NULL);
-	payload = json_node_get_object(
-		json_object_get_member(object, "payload"));
-	history = json_node_get_array(
-		json_object_get_member(payload, "history"));
-
-	purple_debug_info("facebook",
-			"found %d history items to possibly render\n",
-			json_array_get_length(history));
-
-	for (i = 0; i < json_array_get_length(history); i++) {
-		const gchar *type;
-		JsonObject *message_obj;
-
-		message_obj = json_node_get_object(
-			json_array_get_element(history, i));
-		type = json_node_get_string(json_object_get_member(
-			message_obj, "type"));
-	
-		if (g_str_equal(type, "msg")) {
-			gint64 message_time;
-			const gchar *message;
-			gchar *from;
-			gchar *to;
-			JsonObject *text_obj;
-
-			from = g_strdup_printf("%" G_GINT64_FORMAT, (gint64)json_node_get_int(
-				json_object_get_member(message_obj, "from")));
-			to = g_strdup_printf("%" G_GINT64_FORMAT, (gint64)json_node_get_int(
-				json_object_get_member(message_obj, "to")));
-
-			text_obj = json_node_get_object(
-				json_object_get_member(message_obj, "msg"));
-			message = json_node_get_string(
-				json_object_get_member(text_obj, "text"));
-
-			message_time = fb_time_kludge(json_node_get_int(
-				json_object_get_member(message_obj, "time")));
-
-			if (message_time > min_time) {
-				purple_debug_info("facebook",
-					"displaying history message %lld\n",
-					(long long int) message_time);
-				fb_conversation_handle_message(
-					fba, from, to, message_time, message,
-					min_time != 0);
-			}
-
-			g_free(from);
-			g_free(to);
-		}
-	}
-	
-	json_parser_free(parser);
-}
-
-void fb_history_fetch(FacebookAccount *fba, const char *who,
-		gboolean display_all)
-{
-	g_return_if_fail(fba != NULL);
-	
-	purple_debug_info("facebook", "fetching history with %s\n", who);
-
-	gint64 min_time = fba->last_message_time;
-	if (display_all) {
-		min_time = 0;
-	}
-
-	gchar *url = g_strdup_printf("/ajax/chat/history.php?id=%s&__a=1", who);
-	fb_post_or_get(
-		fba, FB_METHOD_GET, NULL, url, NULL, fb_history_fetch_cb,
-		g_strdup_printf("%lld", (long long int) min_time), FALSE);
-	g_free(url);
-}
-
-/*****************************************************************************
- * GENERAL EVENTS CODE                                                       *
- *****************************************************************************/
-
-void fb_conversation_closed(PurpleConnection *gc, const char *who)
-{
-	FacebookAccount *fba = gc->proto_data;
-	gchar *postdata;
-
-	g_return_if_fail(fba->post_form_id != NULL);
-
-	/* notify server that we closed the chat window */
-	/* close_chat=589039771&window_id=3168919846&
-	 * post_form_id=c258fe42460c7e8b61e242a37ef05afc */
-	postdata = g_strdup_printf("close_chat=%s&post_form_id=%s&fb_dtsg=%s&"
-			"post_form_id_source=AsyncRequest&__a=1", who,
-			fba->post_form_id, fba->dtsg);
-	fb_post_or_get(fba, FB_METHOD_POST, NULL, "/ajax/chat/settings.php",
-			postdata, NULL, NULL, FALSE);
-	g_free(postdata);
-}
-
-static void fb_conversation_created(PurpleConversation *conv)
-{
-	PurpleAccount *account = purple_conversation_get_account(conv);
-
-	if (!fb_conversation_is_fb(conv)) {
-		return;
-	}
-
-	purple_debug_info("facebook", "conversation created with %s\n",
-		conv->name);
-
-	if (purple_account_get_bool(account, "facebook_show_history", TRUE))
-	{
-		fb_history_fetch(account->gc->proto_data, conv->name, TRUE);
-	}
-}
-
-gboolean fb_conversation_is_fb(PurpleConversation *conv)
-{
-	PurpleAccount *account = purple_conversation_get_account(conv);
-	const gchar *prpl = purple_account_get_protocol_id(account);
-	return g_str_equal(prpl, FACEBOOK_PLUGIN_ID);
-}
-
-void fb_conversation_init(FacebookAccount *fba)
-{
-	fba->last_message_time = 0;
-
-	purple_signal_connect(
-		purple_conversations_get_handle(),
-		"conversation-created",
-		fba,
-		PURPLE_CALLBACK(fb_conversation_created),
-		NULL);
-}
-
-void fb_conversation_destroy(FacebookAccount *fba)
-{
-	purple_signal_disconnect(
-		purple_conversations_get_handle(),
-		"conversation-created",
-		fba,
-		PURPLE_CALLBACK(fb_conversation_created));
-}
-
-
============================================================
--- libpurple/protocols/facebook/fb_conversation.h	828d73df9a7ffcd3680ee051f49606328a742185
+++ /dev/null	
@@ -1,38 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_CONVERSATION_H
-#define FACEBOOK_CONVERSATION_H
-
-#include "libfacebook.h"
-
-void fb_conversation_init(FacebookAccount *fba);
-void fb_conversation_destroy(FacebookAccount *fba);
-
-void fb_conversation_closed(PurpleConnection *gc, const char *who);
-gboolean fb_conversation_is_fb(PurpleConversation *conv);
-
-void fb_history_fetch(FacebookAccount *fba, const char *who,
-		gboolean display_all);
-void fb_conversation_handle_message(FacebookAccount *fba, const char *from,
-	const char *to, gint64 message_time, const gchar *message_orig,
-	gboolean log);
-
-#endif /* FACEBOOK_CONVERSATION_H */
============================================================
--- libpurple/protocols/facebook/fb_util.c	892bc0b45bd3472256d7c28b4e3952a760abbabd
+++ /dev/null	
@@ -1,301 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_util.h"
-
-/*****************************************************************************
- * UTILITY CODE                                                              *
- *****************************************************************************/
-
-gchar *fb_convert_unicode(const gchar *input)
-{
-	/* \u00e9t\u00e9 should be ?t? */
-
-	gunichar unicode_char;
-	gchar unicode_char_str[6];
-	gint unicode_char_len;
-	gchar *next_pos;
-	gchar *input_string;
-	gchar *output_string;
-
-	if (input == NULL)
-		return NULL;
-
-	next_pos = input_string = g_strdup(input);
-
-	/* purple_debug_info("facebook", "unicode convert: in: %s\n", input); */
-	while ((next_pos = strstr(next_pos, "\\u")))
-	{
-		/* grab the unicode */
-		sscanf(next_pos, "\\u%4x", &unicode_char);
-		/* turn it to a char* */
-		unicode_char_len = g_unichar_to_utf8(unicode_char, unicode_char_str);
-		/* shove it back into the string */
-		g_memmove(next_pos, unicode_char_str, unicode_char_len);
-		/* move all the data after the \u0000 along */
-		g_stpcpy(next_pos + unicode_char_len, next_pos + 6);
-	}
-
-	/* purple_debug_info("facebook", "unicode convert: out: %s\n", input); */
-	output_string = g_strcompress(input_string);
-	g_free(input_string);
-
-	return output_string;
-}
-
-/* Like purple_strdup_withhtml, but escapes htmlentities too */
-gchar *fb_strdup_withhtml(const gchar *src)
-{
-	gulong destsize, i, j;
-	gchar *dest;
-
-	g_return_val_if_fail(src != NULL, NULL);
-
-	/* New length is (length of src) + (number of \n's * 3) + (number of &'s * 5) +
-		(number of <'s * 4) + (number of >'s *4) + (number of "'s * 6) -
-		(number of \r's) + 1 */
-	destsize = 1;
-	for (i = 0; src[i] != '\0'; i++)
-	{
-		if (src[i] == '\n' || src[i] == '<' || src[i] == '>')
-			destsize += 4;
-		else if (src[i] == '&')
-			destsize += 5;
-		else if (src[i] == '"')
-			destsize += 6;
-		else if (src[i] != '\r')
-			destsize++;
-	}
-
-	dest = g_malloc(destsize);
-
-	/* Copy stuff, ignoring \r's, because they are dumb */
-	for (i = 0, j = 0; src[i] != '\0'; i++) {
-		if (src[i] == '\n') {
-			strcpy(&dest[j], "<BR>");
-			j += 4;
-		} else if (src[i] == '<') {
-			strcpy(&dest[j], "<");
-			j += 4;
-		} else if (src[i] == '>') {
-			strcpy(&dest[j], ">");
-			j += 4;
-		} else if (src[i] == '&') {
-			strcpy(&dest[j], "&");
-			j += 5;
-		} else if (src[i] == '"') {
-			strcpy(&dest[j], """);
-			j += 6;
-		} else if (src[i] != '\r')
-			dest[j++] = src[i];
-	}
-
-	dest[destsize-1] = '\0';
-
-	return dest;
-}
-
-static gboolean is_json_64bit_safe()
-{
-	//Cache the result to try make this function quick
-	static gint result = -1;
-	gint64 largeint = G_MAXINT64;
-	
-	if (result == 1)
-		return TRUE;
-	if (result == 0)
-		return FALSE;
-	
-	if (sizeof(gint) >= sizeof(gint64))
-	{
-		result = 1;
-		return TRUE;
-	}
-
-#ifndef USE_JSONC
-	JsonNode *node;
-
-	node = json_node_new(JSON_NODE_VALUE);
-	json_node_set_int(node, largeint);
-	if(json_node_get_int(node) == largeint)
-	{
-		result = 1;
-	} else {
-		result = 0;
-	}
-	json_node_free(node);
-	return result ? TRUE : FALSE;
-	
-#endif /* !USE_JSONC */
-	
-	result = 0;
-	return FALSE;
-}
-
-gint64 fb_time_kludge(gint64 initial_time)
-{
-	if (is_json_64bit_safe())
-		return initial_time;
-	
-	gint64 now_millis = (gint64) time(NULL);
-	now_millis *= 1000;
-	now_millis &= 0xFFFFFFFF00000000LL;
-	gint64 final_time = now_millis | ((guint)initial_time);
-
-	return final_time;
-}
-
-JsonParser *fb_get_parser(const gchar *data, gsize data_len)
-{
-	JsonParser *parser;
-
-	if (data == NULL) {
-		return NULL;
-	}
-
-	data = g_strstr_len(data, data_len, "for (;;);");
-	if (!data) {
-		return NULL;
-	} else {
-		data += strlen("for (;;);");
-	}
-
-	parser = json_parser_new();
-	if (!json_parser_load_from_data(parser, data, -1, NULL)) {
-		json_parser_free(parser);
-		return NULL;
-	}
-
-	return parser;
-}
-
-JsonObject *fb_get_json_object(JsonParser *parser, char **error_message)
-{
-	JsonNode *root;
-	root = json_parser_get_root(parser);
-	JsonObject *objnode;
-	objnode = json_node_get_object(root);
-
-	/* Sample error messages */
-	/* for (;;);{"error":1357001,"errorSummary":"Not Logged In",
-		"errorDescription":"You must be logged in to do that.",
-		"payload":null,"bootload":[{"name":"js\/common.js.pkg.php",
-		"type":"js","src":"http:\/\/static.ak.fbcdn.net\/rsrc.php\/pkg\/59\
-		/98561\/js\/common.js.pkg.php"}]} */
-	if (json_object_has_member(objnode, "error"))
-	{
-		guint32 error_number;
-		const char *summary;
-		const char *description;
-
-		error_number = json_node_get_int(
-			json_object_get_member(objnode, "error"));
-		summary = json_node_get_string(
-			json_object_get_member(objnode, "errorSummary"));
-		description = json_node_get_string(
-			json_object_get_member(objnode, "errorDescription"));
-
-		if (error_number)
-		{
-			purple_debug_error("facebook",
-				"got error from facebook of %s (%s)",
-				summary, description);
-			// Pass error message to calling function if they asked for it.
-			if (error_message) {
-				*error_message = g_strdup(description);
-			}
-		}
-	}
-
-	return objnode;
-}
-
-/* Converts *text* into <b>text</b>  and _text_ into <i>text</i> */
-gchar *fb_replace_styled_text(const gchar *text)
-{
-#ifdef __ARM_EABI__
-	return g_strdup(text);
-#else /*__ARM_EABI__*/
-#if GLIB_MAJOR_VERSION >= 2 && GLIB_MINOR_VERSION >= 14
-	if (glib_check_version(2, 14, 0))
-	{
-		return g_strdup(text);
-	} else {
-		static GRegex *underline_regex = NULL;
-		static GRegex *bold_regex = NULL;
-		gchar *dup_text;
-		gchar *midway_string;
-		gchar *output_string;
-		
-		if (underline_regex == NULL)
-		{
-			underline_regex = g_regex_new(
-				"\\b_([^_\\*]+)_\\b", G_REGEX_OPTIMIZE,
-				0, NULL);
-		}
-		if (bold_regex == NULL)
-		{
-			bold_regex = g_regex_new(
-				"(\\s|^)\\*([^_\\*]+)\\*(?=$|\\s)",
-				G_REGEX_OPTIMIZE, 0, NULL);
-		}
-		
-		dup_text = g_strdup(text);
-		midway_string = g_regex_replace(underline_regex, dup_text,
-			strlen(dup_text), 0, "<u>\\1</u>", 0, NULL);
-		if (midway_string == NULL)
-		{
-			purple_debug_warning("facebook", "regex failed for underline\n");
-			return dup_text;
-		}
-		g_free(dup_text);
-		output_string = g_regex_replace(bold_regex, midway_string,
-			strlen(midway_string), 0, "\\1<b>\\2</b>", 0, NULL);
-		if (output_string == NULL)
-		{
-			purple_debug_warning("facebook", "regex failed for bold\n");
-			return midway_string;
-		}
-		g_free(midway_string);
-		
-		return output_string;
-	}
-#else /* GLIB check */
-	return g_strdup(text);
-#endif /* GLIB check */
-#endif /*__ARM_EABI__*/
-}
-
-gchar *fb_md5_encode(const gchar *string)
-{
-	PurpleCipher *cipher;
-	PurpleCipherContext *context;
-	gchar md5Hash[33];
-	
-	cipher = purple_ciphers_find_cipher("md5");
-	context = purple_cipher_context_new(cipher, NULL);
-
-	purple_cipher_context_append(context, (guchar *)string, strlen(string));
-	purple_cipher_context_digest_to_str(context, sizeof(md5Hash), md5Hash, NULL);
-	purple_cipher_context_destroy(context);
-	
-	return g_strdup(md5Hash);
-}
-
============================================================
--- libpurple/protocols/facebook/fb_util.h	2b0447d3d889abed3c90b5c633c11edab4179255
+++ /dev/null	
@@ -1,39 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_UTIL_H
-#define FACEBOOK_UTIL_H
-
-#include "libfacebook.h"
-#include "fb_json.h"
-
-#include <cipher.h>
-
-JsonParser *fb_get_parser(const gchar *data, gsize data_len);
-JsonObject *fb_get_json_object(JsonParser *parser, char **error_message);
-
-gchar *fb_replace_styled_text(const gchar *text);
-gchar *fb_strdup_withhtml(const gchar *src);
-gchar *fb_convert_unicode(const gchar *input);
-gint64 fb_time_kludge(gint64 initial_time);
-gchar *fb_md5_encode(const gchar *string);
-
-#endif /* FACEBOOK_UTIL_H */
-
============================================================
--- libpurple/protocols/facebook/fb_friendlist.c	f79866a79682445e0b77bd3d7cfaf014817cfc97
+++ /dev/null	
@@ -1,520 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_friendlist.h"
-#include "fb_connection.h"
-#include "libfacebook.h"
-#include "fb_util.h"
-
-typedef struct _MoveRequest MoveRequest;
-struct _MoveRequest {
-	char *old_group;
-	char *new_group;
-	char *who;
-};
-
-/******************************************************************************/
-/* Friend list modification methods */
-/******************************************************************************/
-static void handle_move_request(FacebookAccount *fba, MoveRequest *request)
-{
-	const gchar *old_list_id;
-	const gchar *new_list_id;
-	gchar *postdata;
-	gboolean remove_flist, no_original_list;
-	const gchar *command;
-
-	purple_debug_info("facebook",
-		"handling movement of %s from %s to %s\n",
-		request->who, request->old_group, request->new_group);
-
-	old_list_id = fb_get_list_id(fba, request->old_group);
-	new_list_id = fb_get_list_id(fba, request->new_group);
-
-	remove_flist = !new_list_id || g_str_equal(new_list_id, "-1");
-	no_original_list = !old_list_id || g_str_equal(old_list_id, "-1");
-
-	if (remove_flist) {
-		command = "&remove_fl=true";
-	} else if (no_original_list) {
-		command = "&add_fl=true";
-	} else {
-		command = "&move_fl=true";
-	}
-
-	postdata = g_strdup_printf(
-		"post_form_id=%s&drag_uid=%s&user=%" G_GINT64_FORMAT
-		"&new_flid=%s&old_flid=%s%s",
-		fba->post_form_id,
-		request->who,
-		fba->uid,
-		remove_flist ? "" : new_list_id,
-		no_original_list ? "" : old_list_id,
-		command);
-
-	fb_post_or_get(fba, FB_METHOD_POST, NULL,
-		"/ajax/chat/buddy_list_settings.php",
-		postdata, NULL, NULL, FALSE);
-
-	g_free(postdata);
-
-	g_free(request->who);
-	g_free(request->old_group);
-	g_free(request->new_group);
-	g_free(request);
-}
-
-static void create_list_cb(FacebookAccount *fba, const gchar *data,
-	gsize data_len, gpointer userdata)
-{
-	// NOTE: this method can also be used for movements between
-	// friend lists if necessary.
-
-	JsonParser *parser;
-	JsonObject *objnode;
-	MoveRequest *request;
-
-	// Parse out old data.
-	parser = fb_get_parser(data, data_len);
-	if (parser == NULL) {
-		return;
-	}
-
-	objnode = fb_get_json_object(parser, NULL);
-	if (!objnode ||
-	    !json_object_has_member(objnode, "payload"))
-	{
-		json_parser_free(parser);
-		return;
-	}
-
-	objnode = json_node_get_object(json_object_get_member(
-			objnode, "payload"));
-	fb_process_friend_lists(fba, objnode);
-
-	json_parser_free(parser);
-
-	// Move Friend
-	request = (MoveRequest *) userdata;
-	if (request) {
-		handle_move_request(fba, request);
-	}
-}
-
-static void create_friend_list(FacebookAccount *fba, const gchar *new_group,
-	MoveRequest *request)
-{
-	gchar *postdata;
-	gchar *new_group_escaped;
-
-	purple_debug_info("facebook", "creating friend list %s\n", new_group);
-
-	new_group_escaped = fb_strdup_withhtml(new_group);
-
-	postdata = g_strdup_printf(
-		"post_form_id=%s&create=%s&user=%" G_GINT64_FORMAT,
-		fba->post_form_id,
-		new_group_escaped,
-		fba->uid);
-
-	fb_post_or_get(fba, FB_METHOD_POST, NULL,
-		"/ajax/chat/buddy_list_settings.php",
-		postdata, create_list_cb, request, FALSE);
-
-	g_free(postdata);
-	g_free(new_group_escaped);
-}
-
-void fb_group_buddy_move(PurpleConnection *pc, const char *who,
-	const char *old_group, const char *new_group)
-{
-	FacebookAccount *fba;
-	MoveRequest *request;
-	const gchar *new_list_id;
-	
-	if (!purple_account_get_bool(pc->account, "facebook_use_groups", TRUE))
-	{
-		//Dont do anything if we're ignoring groups
-		return;
-	}
-	
-	fba = pc->proto_data;
-
-	purple_debug_info("facebook", "handling move of %s from %s to %s\n",
-		who, old_group, new_group);
-
-	// Don't do anything if groups are not actually changing.
-	if (!purple_utf8_strcasecmp(old_group, new_group)) {
-		purple_debug_info("facebook", "groups are same, not moving\n");
-		return;
-	}
-
-	// Facebook doesn't support moving yourself because you can't be in a
-	// friend list.  Let buddy list be updated as appropriate.
-	if (atoll(who) == fba->uid) {
-		purple_debug_info("facebook",
-			"moving self, do not update server\n");
-		return;
-	}
-
-	request = g_new0(MoveRequest, 1);
-	request->old_group = g_utf8_strdown(old_group, -1);
-	request->new_group = g_utf8_strdown(new_group, -1);
-	request->who = g_strdup(who);
-
-	new_list_id = fb_get_list_id(fba, request->new_group);
-	if (new_list_id) {
-		handle_move_request(fba, request);
-	} else {
-		create_friend_list(fba, new_group, request);
-	}
-}
-
-void fb_buddy_remove(PurpleConnection *pc, PurpleBuddy *buddy,
-		PurpleGroup *group)
-{
-	// This method should only remove a buddy from a friend list.
-	// Nothing more.  It should not defriend a user ever.  See issue
-	// #185 for a good explaination of why this is a bad idea.
-	//
-	// Moreover, defriending is such a rare operation that we should
-	// never make it easy.  Facebook intentionally hides such a action
-	// behind multiple layers of links and dialogs.
-	//
-	// If the plugin is ever to perform an actual defriending, it needs
-	// to provide a dialog and user prompt at the absolute bare minimum.
-	FacebookAccount *fba;
-	
-	if (!purple_account_get_bool(pc->account, "facebook_use_groups", TRUE))
-	{
-		//Dont do anything if we're ignoring groups
-		return;
-	}
-
-	purple_debug_info("facebook", "handing removal of buddy %s\n",
-		buddy->name);
-       
-	fba = pc->proto_data;
-
-	fb_group_buddy_move(pc, buddy->name, purple_group_get_name(group),
-			DEFAULT_GROUP_NAME);
-}
-
-void fb_group_rename(PurpleConnection *pc, const char *old_name,
-	PurpleGroup *group, GList *moved_buddies)
-{
-	
-	if (!purple_account_get_bool(pc->account, "facebook_use_groups", TRUE))
-	{
-		//Dont do anything if we're ignoring groups
-		return;
-	}
-	
-	purple_debug_info("facebook",
-		"handling group rename of %s to %s\n",
-		old_name, purple_group_get_name(group));
-	
-	// We don't do anything here.  Facebook's AJAX API for renaming groups
-	// is horribly, horribly overcomplicated.  There is no simple rename
-	// call, instead you must also pass in all the current data about the
-	// friend list and port it over.  While it is possible to implement
-	// this, it is risky and could potentially destroy a friend list if
-	// the API changes.  That's a Bad Thing(tm).  Given the risk involved
-	// with this operation and how rare it is, it's not worth it.
-	// 
-	// The problem is compounded by the fact that renaming groups triggers
-	// all sorts of weird behaviors in Pidgin.  Renaming to a new name is
-	// simple.  Renaming to an existing group name (hence a merge)
-	// triggers completely different behavior with calls to group_buddy
-	// before the call to rename.  This completely defeats the purpose of
-	// having a rename function because group_buddy is called instead.
-	//
-	// Thus, the final decision is to use the buddy_move call.
-
-	// TODO: warn users that renaming has no effect here.
-}
-
-void fb_group_remove(PurpleConnection *pc, PurpleGroup *group)
-{
-	if (!purple_account_get_bool(pc->account, "facebook_use_groups", TRUE))
-	{
-		//Dont do anything if we're ignoring groups
-		return;
-	}
-	
-	purple_debug_info("facebook", "got group removal of %s\n",
-		purple_group_get_name(group));
-
-	// We don't do anything here.  This is because a group rename also
-	// fires a group removal event.  This assumes that the new group is
-	// equivalent to the old group, but Facebook friend lists are much more
-	// than simple groups- they are privacy control lists too.  There is
-	// no easy way to port the settings between groups.  Better off not
-	// deleting, and the user can do the cleanup with their browser.
-}
-
-/******************************************************************************/
-/* Friend list fetch methods */
-/******************************************************************************/
-
-const gchar *fb_get_list_id(FacebookAccount *fba, const gchar *list_name)
-{
-	if (!purple_utf8_strcasecmp(list_name, DEFAULT_GROUP_NAME)) {
-		return "-1";
-	}
-
-	return g_hash_table_lookup(fba->friend_lists_reverse, purple_normalize_nocase(NULL, list_name));
-}
-
-gboolean fb_process_friend_lists(FacebookAccount *fba,
-		JsonObject *buddy_list)
-{
-	JsonObject *fl_obj;
-	GList *friend_list_ids, *cur;
-
-	purple_debug_info("facebook", "processing friend list data\n");
-
-	if (!json_object_has_member(buddy_list, "flData"))
-	{
-		purple_debug_info("facebook", "no friend list data\n");
-		return FALSE;
-	}
-
-
-	fl_obj = json_node_get_object(json_object_get_member(
-			buddy_list, "flData"));
-	friend_list_ids = json_object_get_members(fl_obj);
-	for (cur = friend_list_ids; cur != NULL; cur = cur->next)
-	{
-		gchar *id;
-		const gchar *name;
-		JsonObject *data;
-
-		id = (gchar *) cur->data;
-		data = json_node_get_object(json_object_get_member(
-				fl_obj, id));
-		name = json_node_get_string(json_object_get_member(
-				data, "n"));
-		if (name) {
-			// Either -1 isnt a valid JSON string or JSON-glib does
-			// this wrong.  I'm too tired to tell the difference.
-			if (g_str_equal(id, "_1")) {
-				id = "-1";
-			}
-			purple_debug_info("facebook",
-					"got friend list %s with id %s\n",
-					name, id);
-			g_hash_table_insert(fba->friend_lists,
-					g_strdup(id), g_strdup(name));
-			g_hash_table_insert(fba->friend_lists_reverse,
-					g_utf8_strdown(name, -1), g_strdup(id));
-		}
-	}
-
-	g_list_free(friend_list_ids);
-
-	return TRUE;
-}
-
-static void destroy_buddy(gpointer key, gpointer value, gpointer data)
-{
-	PurpleBuddy *buddy;
-	gchar *group_name;
-	FacebookAccount *fba;
-
-	buddy = (PurpleBuddy *) value;
-	group_name = (gchar *) key;
-	fba = (FacebookAccount *) data;
-
-	purple_debug_info("facebook", "removing %s from group %s\n",
-			buddy->name, group_name);
-	if (atoll(buddy->name) == fba->uid) {
-		purple_debug_info("facebook", "not removing self from %s\n",
-			group_name);
-		return;
-	}
-
-	purple_blist_remove_buddy(buddy);
-}
-
-static PurpleBuddy *add_buddy(FacebookAccount *fba,
-	const gchar *friend_list_id, const gchar *uid, GHashTable *cur_groups)
-{
-	const gchar *group_name;
-	PurpleGroup *fb_group;
-	PurpleBuddy *buddy;
-
-	group_name = g_hash_table_lookup(fba->friend_lists, purple_normalize_nocase(NULL, friend_list_id));
-	if (!group_name || group_name[0] == '\0') {
-		purple_debug_info("facebook",
-				"did not find name of list %s\n",
-				friend_list_id);
-		group_name = DEFAULT_GROUP_NAME;
-	}
-
-	// Initialize group as necessary.
-	fb_group = purple_find_group(group_name);
-	if (fb_group == NULL)
-	{
-		purple_debug_info("facebook", "adding friend list %s\n",
-				group_name);
-		fb_group = purple_group_new(group_name);
-		purple_blist_add_group(fb_group, NULL);
-	} 
-
-	buddy = (PurpleBuddy *)g_hash_table_lookup(cur_groups, purple_normalize_nocase(NULL, group_name));
-	if (!buddy) {
-		purple_debug_info("facebook", "adding %s to %s\n",
-				uid, group_name);
-		buddy = purple_buddy_new(fba->account, uid, NULL);
-		purple_blist_add_buddy(buddy, NULL, fb_group, NULL);
-		g_hash_table_remove(cur_groups, purple_normalize_nocase(NULL, group_name));
-	}
-
-	return buddy;
-}
-
-
-GList *fb_get_buddies_friend_list (FacebookAccount *fba,
-		const gchar *uid, JsonArray *friend_list_ids)
-{
-	GSList *buddies;
-	GSList *cur;       
-	GHashTable *cur_groups;
-	int i;
-	GList *final_buddies, *cur_buddy;
-	PurpleGroup *fb_group;
-	PurpleBuddy *buddy;
-
-	final_buddies = NULL;
-	buddies = purple_find_buddies(fba->account, uid);
-
-	// If we're already in the buddy list, stop.  Ignore FB info because
-	// it will be incorrect.
-	if (atoll(uid) == fba->uid && buddies != NULL) {
-		purple_debug_info("facebook",
-			"already have buddies for self, not adding\n");
-		for (cur = buddies; cur != NULL; cur = cur->next)
-		{
-			final_buddies = g_list_append(
-				final_buddies, cur->data);
-		}
-		g_slist_free(buddies);
-		return final_buddies;
-	}
-	
-	//Do we want to ignore groups?
-	if (!purple_account_get_bool(fba->account, "facebook_use_groups", TRUE))
-	{
-		if (buddies != NULL) {
-			//Copy the slist into the list
-			for (cur = buddies; cur != NULL; cur = cur->next)
-			{
-				final_buddies = g_list_append(
-					final_buddies, cur->data);
-			}
-			g_slist_free(buddies);
-			return final_buddies;
-		} else {
-			buddy = purple_buddy_new(fba->account, uid, NULL);
-			fb_group = purple_find_group(DEFAULT_GROUP_NAME);
-			if (fb_group == NULL)
-			{
-				fb_group = purple_group_new(DEFAULT_GROUP_NAME);
-				purple_blist_add_group(fb_group, NULL);
-			}
-			purple_blist_add_buddy(buddy, NULL, fb_group, NULL);
-			final_buddies = g_list_append(final_buddies, buddy);
-			return final_buddies;
-		}
-	}
-	
-	// Determine what buddies exist and what groups they are in.
-	cur_groups = g_hash_table_new_full(g_str_hash, g_str_equal,
-		g_free, NULL);
-	for (cur = buddies; cur != NULL; cur = cur->next)
-	{
-		const gchar *group_name;
-
-		group_name = purple_group_get_name(purple_buddy_get_group(
-					(PurpleBuddy *)cur->data));
-		group_name = purple_normalize_nocase(NULL, group_name);
-		
-		g_hash_table_insert(cur_groups, g_strdup(group_name), cur->data);
-	}
-	g_slist_free(buddies);
-
-	// Create/insert necessary buddies
-	if (friend_list_ids) {
-		for (i = 0; i < json_array_get_length(friend_list_ids); i++)
-		{
-			const gchar *friend_list_id;
-
-			friend_list_id = json_node_get_string(
-				json_array_get_element(friend_list_ids, i));
-
-			buddy = add_buddy(fba, friend_list_id, uid, cur_groups);
-
-			final_buddies = g_list_append(final_buddies, buddy);
-		}
-	} else {
-		// No friend list data, so we use the default group.
-		final_buddies = g_list_append(final_buddies,
-			add_buddy(fba, "-1", uid, cur_groups));
-	}
-
-	// Figure out which groups/buddies are not represented.
-	for (cur_buddy = final_buddies; cur_buddy != NULL;
-	     cur_buddy = cur_buddy->next)
-	{
-		const gchar *group_name = purple_group_get_name(purple_buddy_get_group(
-					(PurpleBuddy *)cur_buddy->data));
-		g_hash_table_remove(cur_groups, purple_normalize_nocase(NULL, group_name));
-	}
-
-	// Delete remaining buddies to maintain sync state with server.
-	g_hash_table_foreach(cur_groups, destroy_buddy, fba);
-
-	// Cleanup!
-	g_hash_table_destroy(cur_groups);
-
-	return final_buddies;
-}
-
-void fb_friendlist_init(FacebookAccount *fba)
-{
-	/* data structure mapping friend list id to name.  libpurple only
-	 * recognizes name, does not have group aliases */
-	fba->friend_lists = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	/* structure mapping names to list id for speed. */
-	fba->friend_lists_reverse = g_hash_table_new_full(g_str_hash,
-			g_str_equal, g_free, g_free);
-}
-
-void fb_friendlist_destroy(FacebookAccount *fba)
-{
-	if (fba->friend_lists) {
-		g_hash_table_destroy(fba->friend_lists);
-	}
-	if (fba->friend_lists_reverse) {
-		g_hash_table_destroy(fba->friend_lists_reverse);
-	}
-}
============================================================
--- libpurple/protocols/facebook/fb_friendlist.h	0c755491d5b060bfc1eb798339315627c75d4bb6
+++ /dev/null	
@@ -1,47 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_FRIENDLIST_H
-#define FACEBOOK_FRIENDLIST_H
-
-#include "libfacebook.h"
-#include "fb_json.h"
-
-#define DEFAULT_GROUP_NAME "Facebook"
-
-/* Friend list modification methods */
-void fb_group_buddy_move(PurpleConnection *pc, const char *who,
-	const char *old_group, const char *new_group);
-void fb_group_rename(PurpleConnection *pc, const char *old_name,
-	PurpleGroup *group, GList *moved_buddies);
-void fb_group_remove(PurpleConnection *pc, PurpleGroup *group);
-void fb_buddy_remove(PurpleConnection *pc, PurpleBuddy *buddy,
-	PurpleGroup *group);
-
-/* Friend list fetch methods */
-const gchar *fb_get_list_id(FacebookAccount *fba, const gchar *list_name);
-gboolean fb_process_friend_lists(FacebookAccount *fba, JsonObject *buddy_list);
-GList *fb_get_buddies_friend_list (FacebookAccount *fba,
-		const gchar *uid, JsonArray *friend_list_ids);
-
-void fb_friendlist_init(FacebookAccount *fba);
-void fb_friendlist_destroy(FacebookAccount *fba);
-
-#endif /* FACEBOOK_FRIENDLIST_H */
============================================================
--- libpurple/protocols/facebook/fb_json.c	8f00941d8e1906a3108dfedc7e4eed52e262240e
+++ /dev/null	
@@ -1,87 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#include "fb_json.h"
-
-#ifdef USE_JSONC
-
-JsonParser *
-json_parser_new(void)
-{
-	JsonParser *parser;
-	
-	parser = g_new0(JsonParser, 1);
-	parser->tok = json_tokener_new();
-	
-	return parser;
-}
-
-gboolean 
-json_parser_load_from_data(JsonParser *parser, const gchar *data,
-                           gssize length, GError **error)
-{
-	if (parser->tok == NULL)
-		return FALSE;
-
-	parser->root = json_tokener_parse_ex(parser->tok, (char*)data, (int)length);
-	
-	if (parser->tok->err != json_tokener_success)
-	{
-		json_object_put(parser->root);
-		parser->root = NULL;
-		return FALSE;
-	}
-	
-	return TRUE;
-}
-
-void
-json_parser_free(JsonParser *parser)
-{
-	json_tokener_free(parser->tok);
-	json_object_put(parser->root);
-	g_free(parser);
-}
-
-JsonNode *
-json_parser_get_root(JsonParser *parser)
-{
-	return parser->root;
-}
-
-GList *
-json_object_get_members(JsonObject *obj)
-{
-	GList *keys = NULL;
-	struct lh_entry *entry;	
-
-	for (entry = json_object_get_object(obj)->head;
-		entry;
-		entry = entry->next)
-	{
-		keys = g_list_prepend(keys, entry->k);
-	}
-	
-	keys = g_list_reverse(keys);
-	
-	return keys;
-}
-
-#endif
============================================================
--- libpurple/protocols/facebook/fb_json.h	373c5e457a7ce6b4dabf392d453de5647fa6de86
+++ /dev/null	
@@ -1,64 +0,0 @@
-/*
- * libfacebook
- *
- * libfacebook is the property of its developers.  See the COPYRIGHT file
- * for more details.
- *
- * 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/>.
- */
-
-#ifndef FACEBOOK_JSON_H
-#define FACEBOOK_JSON_H
-
-#ifndef USE_JSONC
-#	include <json-glib/json-glib.h>
-#define json_parser_free(parser) g_object_unref(parser)
-#else /* USE_JSONC */
-#	include <glib.h>
-#	include <json/json.h>
-typedef struct json_object JsonNode;
-typedef struct json_object JsonObject;
-typedef struct json_object JsonArray;
-typedef struct {
-	struct json_tokener *tok;
-	struct json_object *root;
-} JsonParser;
-
-gboolean json_parser_load_from_data(JsonParser *parser,
-									const gchar *data,
-                                    gssize length,
-                                    GError **error);
-
-JsonNode* json_parser_get_root(JsonParser *parser);
-JsonParser* json_parser_new(void);
-void json_parser_free(JsonParser *parser);
-
-#define json_object_has_member(obj, key) ((gboolean)json_object_object_get(obj, key))
-#define json_object_get_member(obj, key) json_object_object_get(obj, key)
-GList* json_object_get_members(JsonObject *object);
-
-#define json_node_get_array(node) (node)
-#define json_node_get_object(node) (node)
-#define json_node_get_boolean(node) json_object_get_boolean(node)
-#define json_node_get_double(node) json_object_get_double(node)
-#define json_node_get_int(node) json_object_get_int(node)
-#define json_node_get_string(node) json_object_get_string(node)
-
-#define json_array_get_element(array, index) json_object_array_get_idx(array, index)
-#define json_array_get_length(array) json_object_array_length(array)
-
-#endif /* USE_JSONC */
-
-#endif /* FACEBOOK_JSON_H */
-


More information about the Commits mailing list