Merge lp:~dobey/rhythmbox-ubuntuone/update-from-trunk into lp:rhythmbox-ubuntuone/stable-3-0

[dobey]

Update the plug-in to load in Rhythmbox 3.x, with a minimal set of functionality
Remove the U1MSLinks code and UI, as it's not the best way to implement the feature, and is more complex now

[Roberto Alsina (ralsina)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

Looks fine.

review: Approve

[lp:~dobey/rhythmbox-ubuntuone/update-from-trunk]

106. By dobey on 2012-01-19

Update the plug-in to load in Rhythmbox 3.x, with a minimal set of functionality
Remove the U1MSLinks code and UI, as it's not the best way to implement the feature, and is more complex now

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

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

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-11-02 15:50:32 +0000
+++ MANIFEST.in	2012-01-19 20:21:35 +0000
@@ -1,5 +1,4 @@
-include COPYING MANIFEST.in README
-include run-tests rb.py rhythmdb.py
-recursive-include gst *.py
+include COPYING COPYING.LIB MANIFEST.in README
+include run-tests
 recursive-include po *.po POTFILES.in
-recursive-include umusicstore *.py *.glade *.mp3 *.rb-plugin.in
+recursive-include ubuntuone *.py *.glade *.mp3 *.rb-plugin.in

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-09-13 03:43:27 +0000
+++ po/POTFILES.in	2012-01-19 20:21:35 +0000
@@ -1,5 +1,4 @@
-umusicstore/__init__.py
-umusicstore/MusicStoreWidget.py
-umusicstore/U1MSLinks.py
-[type: gettext/ini]umusicstore/umusicstore.rb-plugin.in
+ubuntuone/ubuntuone.py
+ubuntuone/MusicStoreWidget.py
+[type: gettext/ini]ubuntuone/ubuntuone.plugin.in
 

=== removed file 'rb.py'
--- rb.py	2011-04-05 21:31:48 +0000
+++ rb.py	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-"""Fake rb.py for use in testing."""
-
-SOURCE_GROUP_CATEGORY_FIXED = 0
-
-
-class Plugin(object):
-    """Fake Plugin class for testing."""
-
-    def __init__(self, *args, **kwargs):
-        super(Plugin, self).__init__()
-
-    def find_file(self, *args, **kwargs):
-        """Fake find_file method."""
-        pass
-
-
-class Source(object):
-    """Fake Source class for testing."""
-
-    add = __fake_it
-    remove = __fake_it
-    show_all = __fake_it
-    do_impl_activate = __fake_it
-
-    def __fake_it(self, *args, **kwargs):
-        """Fake method."""
-
-
-def rb_source_group_get_by_name(*args, **kwargs):
-    """Fake method."""
-    return
-
-def rb_display_page_group_get_by_id(*args, **kwargs):
-    """Fake method."""
-    return
-
-def rb_source_group_register(*args, **kwargs):
-    """Fake method."""
-    return

=== removed file 'rhythmdb.py'
--- rhythmdb.py	2010-11-02 15:50:32 +0000
+++ rhythmdb.py	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-"""Fake rhythmdb.py for use in testing."""
-
-PROP_ARTIST = 0
-PROP_TITLE = 1
-PROP_ALBUM = 2
-
-
-class EntryType(object):
-    """Fake EntryType object."""
-
-    def __init__(self, *args, **kwargs):
-        super(EntryType, self).__init__()

=== modified file 'run-tests'
--- run-tests	2010-11-02 15:50:32 +0000
+++ run-tests	2012-01-19 20:21:35 +0000
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-export PYTHONPATH=umusicstore
+export PYTHONPATH=ubuntuone
 u1lint .
 if [ -x `which pep8` ]; then
     pep8 --repeat .

=== modified file 'setup.cfg'
--- setup.cfg	2010-04-14 21:37:08 +0000
+++ setup.cfg	2012-01-19 20:21:35 +0000
@@ -1,2 +1,2 @@
 [build_i18n]
-desktop_files=[("lib/rhythmbox/plugins/umusicstore", ("umusicstore/umusicstore.rb-plugin.in",))]
+desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",))]

=== modified file 'setup.py'
--- setup.py	2011-12-01 19:20:35 +0000
+++ setup.py	2012-01-19 20:21:35 +0000
@@ -3,20 +3,19 @@
 
 import DistUtilsExtra.auto
 
+
 DistUtilsExtra.auto.setup(
-    name='rhythmbox-ubuntuone-music-store',
+    name='rhythmbox-ubuntuone',
     version='2.99',
     license='LGPL v3',
-    author='Stuart Langridge',
-    author_email='[e-mail]',
-    description='Ubuntu One Music Store Rhythmbox plug-in',
-    long_description=('A plug-in to access the Ubuntu One Music Store '
-                      'in Rhythmbox.'),
-    url='https://launchpad.net/rhythmbox-ubuntuone-music-store',
-    data_files=[('/usr/lib/rhythmbox/plugins/umusicstore',
-                 ['umusicstore/__init__.py',
-                  'umusicstore/MusicStoreWidget.py',
-                  'umusicstore/U1MSLinks.py',
-                  'umusicstore/u1msurl.glade'])],
+    author='Ubuntu One Developers',
+    author_email='[e-mail]',
+    description='Ubuntu One Rhythmbox plug-in',
+    long_description=('A plug-in to integrate Ubuntu One in Rhythmbox.'),
+    url='https://launchpad.net/rhythmbox-ubuntuone',
+    data_files=[('lib/rhythmbox/plugins/ubuntuone',
+                 ['ubuntuone/ubuntuone.py',
+                  'ubuntuone/MusicStoreWidget.py',
+                  ])],
     )
 

=== renamed directory 'umusicstore' => 'ubuntuone'
=== modified file 'ubuntuone/MusicStoreWidget.py'
--- umusicstore/MusicStoreWidget.py	2011-04-05 21:31:48 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-01-19 20:21:35 +0000
@@ -1,5 +1,4 @@
-"""The Ubuntu One Music Store Rhythmbox plugin."""
-# Copyright (C) 2009 Canonical, Ltd.
+# Copyright (C) 2009-2012 Canonical, Ltd.
 #
 # This library is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License
@@ -13,35 +12,25 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library. If not, see
 # <http://www.gnu.org/licenses/>.
-#
-# Authored by Stuart Langridge <[e-mail]>
-
-# pylint: disable=W0201
-
-# Import these here as gtk/gio import ordering seems to matter
-import gobject
-import gtk
-import gio
-
-import gconf
+"""The Ubuntu One Rhythmbox plugin."""
+
 import gettext
 import os
-# pylint: disable=F0401
-import rb as RB
-import rhythmdb
-# pylint: enable=F0401
 import stat
-import urllib
 import urlparse
-import xdg.BaseDirectory
-
+
+# pylint: disable=E0611
+from gi.repository import Gio, GObject, Gtk, RB
+# pylint: enable=E0611
+
+from dirspec import basedir
 from gettext import lgettext as _
-from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
+#from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
 
 gettext.bindtextdomain("rhythmbox-ubuntuone-music-store", "/usr/share/locale")
 gettext.textdomain("rhythmbox-ubuntuone-music-store")
 
-MUSIC_STORE_WIDGET = U1MusicStore()  # keep this around for later
+MUSIC_STORE_WIDGET = Gtk.EventBox()  # keep this around for later
 U1LIBRARYPATH = MUSIC_STORE_WIDGET.get_library_location()
 RB_LIBRARY_LOCATIONS = "/apps/rhythmbox/library_locations"
 PARTNER_LIST = "canonical-partner-maverick.list"
@@ -49,11 +38,11 @@
 PLUGIN_PACKAGENAME = "gstreamer0.10-fluendo-plugins-mp3-partner"
 
 
-class U1EntryType(rhythmdb.EntryType):
+class U1EntryType(RB.RhythmDBEntryType):
     """Entry type for the Ubuntu One Music Store source."""
 
     def __init__(self):
-        rhythmdb.EntryType.__init__(self, name='ubuntuone')
+        RB.RhythmDBEntryType.__init__(self, name='ubuntuone')
 
     def do_can_sync_metadata(self, entry):
         """Not a real source, so we can't sync metadata."""
@@ -68,6 +57,10 @@
     """The Ubuntu One Music Store."""
     def __init__(self, plugin):
         self.plugin = plugin
+        self.db = None
+        self.shell = None
+        self.source = None
+        self.u1_library_symlink = None
         self.entry_type = U1EntryType()
 
     def activate(self, shell):
@@ -75,12 +68,12 @@
         self.db = shell.get_property("db")
         group = RB.rb_display_page_group_get_by_id("stores")
 
-        icon = gtk.IconTheme().load_icon(
-            "ubuntuone", gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)[0], 0)
+        icon = Gtk.IconTheme.get_default().load_icon(
+            "ubuntuone", Gtk.IconSize.lookup(Gtk.IconSize.MENU)[0], 0)
 
         self.db.register_entry_type(self.entry_type)
 
-        self.source = gobject.new(U1Source,
+        self.source = GObject.new(U1Source,
                                   shell=shell,
                                   entry_type=self.entry_type,
                                   pixbuf=icon,
@@ -101,22 +94,6 @@
         """Plugin shutdown."""
         # remove source
         self.source.delete_thyself()
-        # remove the library, if it's empty
-        try:
-            filecount = len(os.listdir(self.u1_library_symlink))
-        except OSError:
-            # symlink is dangling
-            # so they never downloaded anything
-            filecount = 0
-        if filecount == 0:
-            client = gconf.client_get_default()
-            libraries = client.get_list(RB_LIBRARY_LOCATIONS,
-                                        gconf.VALUE_STRING)
-            if self.u1_library_path_url in libraries:
-                client.notify_remove(self.library_adder)
-                libraries.remove(self.u1_library_path_url)
-                client.set_list(RB_LIBRARY_LOCATIONS,
-                                gconf.VALUE_STRING, libraries)
         # delete held references
         del self.db
         del self.source
@@ -145,7 +122,7 @@
         library_path = os.path.join(self.u1_library_symlink, subpath)
         # convert path to URI. Don't use urllib for this; Python and
         # glib escape URLs differently. gio does it the glib way.
-        library_uri = gio.File(library_path).get_uri()
+        library_uri = Gio.File(library_path).get_uri()
         return library_uri
 
     def download_finished(self, source, path):
@@ -165,8 +142,10 @@
         libsrc = self.shell.props.library_source
         artist_view, album_view = libsrc.get_property_views()[0:2]
         song_view = libsrc.get_entry_view()
-        artist = self.shell.props.db.entry_get(entry, rhythmdb.PROP_ARTIST)
-        album = self.shell.props.db.entry_get(entry, rhythmdb.PROP_ALBUM)
+        artist = self.shell.props.db.entry_get(entry,
+                                               RB.RhythmDBPropType.ARTIST)
+        album = self.shell.props.db.entry_get(entry,
+                                              RB.RhythmDBPropType.ALBUM)
         self.shell.props.display_page_tree.select(libsrc)
         artist_view.set_selection([artist])
         album_view.set_selection([album])
@@ -181,7 +160,7 @@
         entry = self.shell.props.db.entry_lookup_by_location(url)
         if entry is None:
             entry = self.shell.props.db.entry_new(self.entry_type, url)
-        self.shell.props.db.set(entry, rhythmdb.PROP_TITLE, title)
+        self.shell.props.db.set(entry, RB.RhythmDBPropType.TITLE, title)
         player = self.shell.get_player()
         player.stop()
         player.play_entry(entry, self.source)
@@ -189,7 +168,7 @@
 
     def add_u1_library(self):
         """Add the U1 library if not listed in RB and re-add if changed."""
-        u1_library_path_folder = xdg.BaseDirectory.save_data_path("ubuntuone")
+        u1_library_path_folder = basedir.save_data_path("ubuntuone")
         # Ensure that we can write to the folder, because syncdaemon creates it
         # with no write permissions
         os.chmod(u1_library_path_folder,
@@ -212,90 +191,35 @@
                     "you know what you're doing. If this is a problem, then "
                     "delete or rename %s.") % (u1_library_path, U1LIBRARYPATH,
                     u1_library_path)
-        self.u1_library_path_url = "file://%s" % urllib.quote(u1_library_path)
         self.u1_library_symlink = u1_library_path
-        client = gconf.client_get_default()
-        self._add_u1_library_if_not_present(client)
-        self._remove_old_u1_library_if_present(client)
-        # Watch for changes to the gconf key and re-add the library
-        self.library_adder = client.notify_add(
-            RB_LIBRARY_LOCATIONS,
-            self._add_u1_library_if_not_present)
-
-    def _add_u1_library_if_not_present(self, client, *args, **kwargs):
-        """Check for the U1 library and add to libraries list."""
-        libraries = client.get_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING)
-        if self.u1_library_path_url not in libraries:
-            libraries.append(self.u1_library_path_url)
-            client.set_list(RB_LIBRARY_LOCATIONS,
-                            gconf.VALUE_STRING, libraries)
-
-    def _remove_old_u1_library_if_present(self, client, *args, **kwargs):
-        """Check for the old U1 library and remove it from libraries list."""
-        libraries = client.get_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING)
-        removed = False
-        # originally, this was the library path. Someone might have this.
-        old_path = "file://%s" % os.path.expanduser("~/.ubuntuone/musicstore")
-        if old_path in libraries:
-            libraries.remove(old_path)
-            removed = True
-        # Then, this was the library path, which we put into gconf unescaped
-        actual_udf_path_unescaped = "file://%s" % U1LIBRARYPATH
-        if actual_udf_path_unescaped in libraries:
-            libraries.remove(actual_udf_path_unescaped)
-            removed = True
-        # In theory, no-one should have the escaped path, but let's check
-        actual_udf_path_escaped = "file://%s" % U1LIBRARYPATH
-        if actual_udf_path_escaped in libraries:
-            libraries.remove(actual_udf_path_escaped)
-            removed = True
-        # Also, remove any library which is in .local/share and *isn't*
-        # the current library. This caters for people who got the library
-        # created under one name (say, English) and then had it created
-        # under another (say, after a translation to Dutch)
-        u1_library_path_folder = xdg.BaseDirectory.save_data_path("ubuntuone")
-        u1_library_path_folder_url = "file://%s" % urllib.quote(
-            u1_library_path_folder)
-        symlink_url = "file://" + urllib.quote(self.u1_library_symlink)
-        for lib in libraries:
-            if lib.startswith(u1_library_path_folder_url) and \
-                    lib != symlink_url:
-                libraries.remove(lib)
-                # and delete the symlink itself
-                symlink_to_remove = urllib.unquote(lib[7:])
-                os.unlink(symlink_to_remove)
-                removed = True
-        if removed:
-            client.set_list(RB_LIBRARY_LOCATIONS,
-                            gconf.VALUE_STRING, libraries)
-
-
-class U1Source(RB.Source, gobject.GObject):
+
+
+class U1Source(RB.Source):
     """A Rhythmbox source widget for the U1 Music Store."""
     # gproperties required so that rb.Source is instantiable
     __gproperties__ = {
       'plugin': (RB.Plugin, 'plugin', 'plugin',
-                 gobject.PARAM_WRITABLE | gobject.PARAM_CONSTRUCT_ONLY),
+                 GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
       }
     # we have the preview-mp3 signal; we receive it from the widget, and
     # re-emit it so that the plugin gets it, because the plugin actually
     # plays the mp3
     __gsignals__ = {
-      "preview-mp3": (gobject.SIGNAL_RUN_FIRST,
-                      gobject.TYPE_NONE, (str, str)),
-      "play-library": (gobject.SIGNAL_RUN_FIRST,
-                       gobject.TYPE_NONE, (str,)),
-      "download-finished": (gobject.SIGNAL_RUN_FIRST,
-                            gobject.TYPE_NONE, (str,)),
-      "url-loaded": (gobject.SIGNAL_RUN_FIRST,
-                     gobject.TYPE_NONE, (str,)),
+      "preview-mp3": (GObject.SIGNAL_RUN_FIRST,
+                      GObject.TYPE_NONE, (str, str)),
+      "play-library": (GObject.SIGNAL_RUN_FIRST,
+                       GObject.TYPE_NONE, (str,)),
+      "download-finished": (GObject.SIGNAL_RUN_FIRST,
+                            GObject.TYPE_NONE, (str,)),
+      "url-loaded": (GObject.SIGNAL_RUN_FIRST,
+                     GObject.TYPE_NONE, (str,)),
     }
 
     def __init__(self):
         RB.Source.__init__(self, name=_("Ubuntu One"))
-        gobject.GObject.__init__(self)
         self.browser = MUSIC_STORE_WIDGET
         self.__activated = False
+        self.__plugin = None
         self.add_music_store_widget()
 
     def do_impl_activate(self):
@@ -317,6 +241,7 @@
             return False
         uri_to_use = uri.replace("u1ms://", "http://")
         print "Calling u1musicstore plugin with %s" % uri_to_use
+        # pylint: disable=E1101
         shell = self.get_property("shell")
         shell.props.display_page_tree.select(self)
         self.browser.load_store_link(uri_to_use)
@@ -324,6 +249,7 @@
 
     def add_music_store_widget(self):
         """Display the music store widget in Rhythmbox."""
+        # pylint: disable=E1101
         self.add(self.browser)
         self.browser.show()
         self.show()
@@ -343,25 +269,28 @@
         return True  # so we can pause, else we segfault
 
     def re_emit_preview(self, widget, url, title):
-        """Handle the preview-mp3 signal and re-emit it to rb.Plugin."""
+        """Handle the preview-mp3 signal and re-emit it."""
+        # pylint: disable=E1101
         self.emit("preview-mp3", url, title)
 
     def re_emit_playlibrary(self, widget, path):
-        """Handle the play-library signal and re-emit it to rb.Plugin."""
+        """Handle the play-library signal and re-emit it."""
+        # pylint: disable=E1101
         self.emit("play-library", path)
 
     def re_emit_downloadfinished(self, widget, path):
-        """Handle the download-finished signal and re-emit it to rb.Plugin."""
+        """Handle the download-finished signal and re-emit it."""
+        # pylint: disable=E1101
         self.emit("download-finished", path)
 
     def re_emit_urlloaded(self, widget, url):
-        """Handle the url-loaded signal and re-emit it to rb.Plugin."""
-        self.emit("url-loaded", url)
+        """Handle the url-loaded signal and re-emit it."""
+        # pylint: disable=E1101
+        self.signal_emit_by_name("url-loaded", url)
 
     def do_set_property(self, prop, value):
-        """Allow property settings to handle the plugin call."""
+        """Allow property settings to handle the plug-in call."""
         if prop.name == 'plugin':
             self.__plugin = value
         else:
             raise AttributeError('unknown property %s' % prop.name)
-

=== renamed file 'umusicstore/umusicstore.rb-plugin.in' => 'ubuntuone/ubuntuone.plugin.in'
--- umusicstore/umusicstore.rb-plugin.in	2010-03-25 08:13:45 +0000
+++ ubuntuone/ubuntuone.plugin.in	2012-01-19 20:21:35 +0000
@@ -1,10 +1,11 @@
-[RB Plugin]
+[Plugin]
 Loader=python
-Module=umusicstore
+Module=ubuntuone
 IAge=1
-_Name=Ubuntu One Music Store
-_Description=The Ubuntu One Music Store
-Authors=Stuart Langridge <[e-mail]>, Rodrigo Moya <[e-mail]>
-Copyright=Copyright © 2009 Canonical
+Depends=rb
+Name=Ubuntu One
+_Description=Integration of Ubuntu One for Rhythmbox.
+Authors=Ubuntu One Developers <[e-mail]>
+Copyright=Copyright © 2009-2012 Canonical
 Website=http://one.ubuntu.com/
 

=== renamed file 'umusicstore/__init__.py' => 'ubuntuone/ubuntuone.py'
--- umusicstore/__init__.py	2011-04-05 21:31:48 +0000
+++ ubuntuone/ubuntuone.py	2012-01-19 20:21:35 +0000
@@ -1,5 +1,4 @@
-"""The Ubuntu One Music Store Rhythmbox plugin."""
-# Copyright (C) 2009 Canonical, Ltd.
+# Copyright (C) 2009-2012 Canonical, Ltd.
 #
 # This library is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License
@@ -13,46 +12,52 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library. If not, see
 # <http://www.gnu.org/licenses/>.
-#
-# Authored by Stuart Langridge <[e-mail]>
-
-import gconf
-import rb as RB
-
-from .MusicStoreWidget import U1MusicStoreWidget
-from .U1MSLinks import U1MSLinkProvider
-
-U1_FIRST_TIME_FLAG_ENTRY = \
-    "/apps/rhythmbox/plugins/umusicstore/first_time_flag"
-
-
-class U1MusicStorePlugin (RB.Plugin):
-    """The Ubuntu One Music Store."""
+"""The Ubuntu One Rhythmbox plugin."""
+
+import os
+
+# pylint: disable=E0611
+from gi.repository import Gio, GLib, GObject, Peas
+# pylint: enable=E0611
+
+# We aren't actually providing a music store widget at the moment,
+# as libu1 needs to be ported to gtk3 first. We may add it back later.
+#from MusicStoreWidget import U1MusicStoreWidget
+
+
+class UbuntuOnePlugin (GObject.GObject, Peas.Activatable):
+    """Ubuntu One integration for Rhythmbox."""
+    __gtype_name__ = 'UbuntuOnePlugin'
+    object = GObject.property(type=GObject.GObject)
 
     def __init__(self):
-        RB.Plugin.__init__(self)
+        GObject.GObject.__init__(self)
+
+        # The folder where files get stored
+        self.u1_library_path_url = 'file://{0}'.format(
+            os.path.join(GLib.get_home_dir(),
+                         '.ubuntuone',
+                         'Purchased from Ubuntu One'))
+        # RhythmDB settings so we can handle changes
+        self.rdbconf = Gio.Settings('org.gnome.rhythmbox.rhythmdb')
+        self.rdbconf.connect('changed::locations', self._locations_changed)
 
         # The Music Store itself
-        self.music_store_widget = U1MusicStoreWidget(plugin=self)
-
-        # The Links button
-        self.music_store_links_provider = U1MSLinkProvider(
-            find_file=self.find_file)
-
-    def activate(self, shell):
-        """Plugin startup."""
-        self.music_store_widget.activate(shell)
-        self.music_store_links_provider.activate(shell)
-
-        # Select the source if it's the first time
-        conf_client = gconf.client_get_default()
-        if not conf_client.get_bool(U1_FIRST_TIME_FLAG_ENTRY):
-            shell.props.display_page_tree.select(
-                self.music_store_widget.source)
-            conf_client.set_bool(U1_FIRST_TIME_FLAG_ENTRY, True)
-
-    def deactivate(self, shell):
-        """Plugin shutdown."""
-        self.music_store_widget.deactivate(shell)
-        self.music_store_links_provider.deactivate(shell)
-
+        #self.music_store_widget = U1MusicStoreWidget(plugin=self)
+
+    def _locations_changed(self, *args, **kwargs):
+        """Handle the locations setting being changed."""
+        libraries = self.rdbconf.get_strv('locations')
+        if self.u1_library_path_url not in libraries:
+            libraries.append(self.u1_library_path_url)
+            self.rdbconf.set_strv('locations', libraries)
+
+    def do_activate(self):
+        """Plug-in startup."""
+        # Add the Ubuntu One purchased music directory if not already added
+        self._locations_changed()
+        #self.music_store_widget.activate(shell)
+
+    def do_deactivate(self):
+        """Plug-in shutdown."""
+        #self.music_store_widget.deactivate(shell)

=== removed file 'umusicstore/U1MSLinks.py'
--- umusicstore/U1MSLinks.py	2010-12-22 19:16:06 +0000
+++ umusicstore/U1MSLinks.py	1970-01-01 00:00:00 +0000
@@ -1,380 +0,0 @@
-"""The Ubuntu One Music Store Links plugin."""
-# Copyright (C) 2010 Canonical, Ltd.
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License
-# version 3.0 as published by the Free Software Foundation.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3.0 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-# Authored by Stuart Langridge <[e-mail]>
-
-# Import gtk+/gio bits here because order matters for some unknown reason
-import glib
-import gtk
-import gio
-
-import cgi
-import gettext
-import locale
-import operator
-import os
-import re
-import rhythmdb
-import unicodedata
-import urllib
-import xml.parsers
-
-from gettext import lgettext as _
-from xml.dom import minidom
-
-try:
-    import gwibber.lib.gtk.widgets
-    GWIBBER_AVAILABLE = True
-except ImportError:
-    GWIBBER_AVAILABLE = False
-
-gettext.bindtextdomain("rhythmbox-ubuntuone-music-store", "/usr/share/locale")
-gettext.textdomain("rhythmbox-ubuntuone-music-store")
-
-UI_STR = \
-"""<ui>
-  <menubar name="MenuBar">
-    <menu name="ViewMenu" action="View">
-      <placeholder name="ViewMenuModePlaceholder">
-        <menuitem name="ViewMenuGetU1MSLink" action="GetU1MSLink"/>
-      </placeholder>
-    </menu>
-  </menubar>
-  <toolbar name="ToolBar">
-    <placeholder name="ToolBarPluginPlaceholder">
-      <toolitem name="U1MSLink" action="GetU1MSLink"/>
-    </placeholder>
-  </toolbar>
-</ui>"""
-
-ERRORS = {
-    "could-not-detect": _("Unable to automatically detect which "
-                "song is currently playing. Please try searching for "
-                "the song in the Ubuntu One Music Store."),
-    "could-not-find": _("Unable to automatically find the song that is "
-                        "currently playing in the Ubuntu One Music Store. "
-                        "Please try searching manually."),
-    "could-not-connect": _("Unable to look up the song (couldn't connect "
-                "to Ubuntu One). Please check your internet "
-                "connection, or try again shortly.")}
-
-BASE_URL = os.environ.get("U1MSLINK_BASE_URL", "https://one.ubuntu.com")
-# getpreferredencoding isn't threadsafe, but we should be OK
-PREFERRED_ENCODING = locale.getpreferredencoding()
-SCRUBBING_RE = re.compile(r"[\W\s]+", re.UNICODE)
-CLEANING_RE = re.compile(r"\s+", re.UNICODE)
-
-
-def normalize(string):
-    """Normalize the given string, to increase the chances of a match"""
-    # rule #0 of unicode mangling: first, normalize
-    na = unicodedata.normalize('NFKD', string)
-    # then, strip everything that's not alphanumeric
-    na = re.sub(SCRUBBING_RE, "", na)
-    # \w leaves _s
-    na = na.replace("_", " ")
-    # then, unify spaces
-    na = re.sub(CLEANING_RE, " ", na).strip()
-    # finally, lowercase
-    na = na.lower()
-    # if there's anything left, go with that, otherwise rollback
-    return na if na else string
-
-
-def modified_levenshtein(start, end):
-    """Calculates the Levenshtein distance between start and end,
-    but counts added characters as worth 0 (thus meaning that 'Foo' will match
-    'Foo (Radio Edit)' with a high degree of accuracy.)"""
-    start = normalize(start)
-    end = normalize(end)
-    ls, le = len(start), len(end)
-    if ls > le:
-        # Make sure ls <= le, to use O(min(ls, le)) space
-        start, end = end, start
-        ls, le = le, ls
-
-    current = range(ls + 1)
-    for pose in range(1, le + 1):
-        previous, current = current, [pose] + [0] * ls
-        for poss in range(1, ls + 1):
-            delete = current[poss - 1] + 1
-            change = previous[poss - 1]
-            if start[poss - 1] != end[pose - 1]:
-                change = change + 1
-            # replace add with 10000 to not count adds
-            current[poss] = min(10000, delete, change)
-
-    return current[ls]
-
-
-class U1MSLinkProvider(object):
-    """Get a public link for any playing song to buy it in
-       the Ubuntu One Music Store."""
-
-    def __init__(self, find_file):
-        self.find_file = find_file
-        self.track_fetch = None
-        self.artist_fetch = None
-        self.win = None
-        self.button = None
-        self.action_group = None
-        self.builder = None
-        self.pvb = None
-        self.tweet_button = None
-        self.message = None
-        self.ui_id = None
-        self.image = None
-
-    def activate(self, shell):
-        """Plugin startup."""
-        # Add button and menu item
-        action = gtk.Action("GetU1MSLink", _("Get link to Music Store"),
-            _("Get a link for the current song to the Ubuntu One Music Store"),
-            "view-u1mslink")
-        action.set_icon_name("ubuntuone")
-        action.connect("activate", self.get_link, shell)
-        manager = shell.get_player().get_property("ui-manager")
-        self.action_group = gtk.ActionGroup('U1MSLinkPluginActions')
-        self.action_group.add_action(action)
-        manager.insert_action_group(self.action_group, 0)
-        self.ui_id = manager.add_ui_from_string(UI_STR)
-        manager.ensure_update()
-
-    def deactivate(self, shell):
-        """Plugin shutdown."""
-        manager = shell.get_player().get_property('ui-manager')
-        manager.remove_ui(self.ui_id)
-        manager.remove_action_group(self.action_group)
-        manager.ensure_update()
-
-    def dialog_response_cb(self, dialog, response_id):
-        """Destroy the window."""
-        self.win.destroy()
-        self.win = None
-
-    def get_link(self, action, shell):
-        """Get the details of the currently playing song from RB."""
-        self.builder = gtk.Builder()
-        self.builder.add_from_file(self.find_file("u1msurl.glade"))
-        self.win = self.builder.get_object("winMain")
-        self.win.connect("response", self.dialog_response_cb)
-        self.win.set_transient_for(shell.props.window)
-        self.image = self.builder.get_object("imgMain")
-        self.image.set_from_icon_name("ubuntuone", gtk.ICON_SIZE_DIALOG)
-        self.win.show_all()
-
-        player = shell.get_player()
-        entry = player.get_playing_entry()
-        if not entry:
-            # This shouldn't happen; the button and menu item should
-            # be disabled when nothing is playing
-            self.display_error('could-not-detect')
-            return
-        artist = shell.props.db.entry_get(entry, rhythmdb.PROP_ARTIST)
-        if not artist:
-            # If you're playing something odd, like a radio station, then
-            # there is a playing entry but it doesn't have an artist.
-            self.display_error('could-not-detect')
-            return
-        title = shell.props.db.entry_get(entry, rhythmdb.PROP_TITLE)
-        album = shell.props.db.entry_get(entry, rhythmdb.PROP_ALBUM)
-        # promote them from strings to Unicode
-        artist = artist.decode(PREFERRED_ENCODING, 'replace')
-        title = title.decode(PREFERRED_ENCODING, 'replace')
-        album = album.decode(PREFERRED_ENCODING, 'replace')
-        self.builder.get_object("lblProgress").set_markup(
-            _("Looking up <i>%s</i> by <i>%s</i> from <i>%s</i>") % (
-            cgi.escape(title), cgi.escape(artist), cgi.escape(album)))
-        self.lookup_artist(title, artist, album)
-
-    def display_error(self, messagename):
-        """Display error text and a warning icon."""
-        self.builder.get_object("lblProgress").set_markup(ERRORS[messagename])
-        self.image.set_from_icon_name("dialog-warning",
-                                      gtk.ICON_SIZE_DIALOG)
-
-    def lookup_artist(self, title, artist, album):
-        """Use the 7digital public API to look up the artist."""
-        base_url = "http://api.7digital.com/1.2/artist/search"
-        params = {"q": artist.encode("utf-8", "replace"),
-                  "oauth_consumer_key": "canonical",
-                  "country": "GB"}
-        url = "%s?%s" % (base_url, urllib.urlencode(params))
-        self.artist_fetch = gio.File(url)
-        self.artist_fetch.read_async(
-            self.artist_fetched,
-            user_data=(title, artist, album))
-
-    def artist_fetched(self, gdaemonfile, result, user_data):
-        """Artist query is complete"""
-        title, artist, album = user_data
-        try:
-            data = self.artist_fetch.read_finish(result).read()
-        except glib.GError:
-            self.display_error('could-not-connect')
-            return
-        try:
-            dom = minidom.parseString(data)
-        except xml.parsers.expat.ExpatError:
-            self.display_error('could-not-connect')
-            print "Could not parse returned XML:", data
-            return
-        artistnodes = dom.getElementsByTagName("artist")
-        possibles = []
-        for anode in artistnodes:
-            names = anode.getElementsByTagName("name")
-            if not names:
-                continue
-            namenode = names[0]
-            if not namenode.hasChildNodes():
-                continue
-            name = namenode.firstChild.nodeValue
-            possibles.append((
-                anode.getAttribute("id"),
-                modified_levenshtein(name, artist),
-                name))
-        possibles.sort(key=operator.itemgetter(1))
-        if not possibles:
-            self.display_error('could-not-find')
-            print "Couldn't find artist '%s'" % artist
-            return
-        artist_id = possibles[0][0]
-        print "got artist %s" % possibles[0][2]
-        self.lookup_track(title, artist, album, artist_id)
-
-    def lookup_track(self, title, artist, album, artist_id):
-        """Use the 7digital public API to look up the song."""
-        # There is no way of searching the 7digital API and saying
-        # I *know* the artist ID, please only return me tracks by that
-        # artist. So instead we search for the artist name + track name
-        # combined, and then later we'll walk through the results ourselves.
-        base_url = "http://api.7digital.com/1.2/track/search"
-        params = {"q": "%s %s" % (artist.encode("utf-8", "replace"),
-                                  title.encode("utf-8", "replace")),
-                  "oauth_consumer_key": "canonical",
-                  "country": "GB", "pagesize": 50}
-        url = "%s?%s" % (base_url, urllib.urlencode(params))
-        self.track_fetch = gio.File(url)
-        self.track_fetch.read_async(self.track_fetched,
-            user_data=(title, artist, album, artist_id))
-
-    def track_fetched(self, gdaemonfile, result, user_data):
-        """Track query is complete"""
-        title, artist, album, artist_id = user_data
-        try:
-            data = self.artist_fetch.read_finish(result).read()
-        except glib.GError:
-            self.display_error('could-not-connect')
-            return
-        try:
-            dom = minidom.parseString(data)
-        except xml.parsers.expat.ExpatError:
-            self.display_error('could-not-connect')
-            print "Could not parse returned XML:", data
-            return
-        print data
-        tracknodes = dom.getElementsByTagName("track")
-        possibles = []
-        for tnode in tracknodes:
-            anodes = tnode.getElementsByTagName("artist")
-            if not anodes:
-                continue
-            aid = anodes[0].getAttribute("id")
-            if aid == artist_id:
-                artist_score = 0
-                artist_name = artist
-            else:
-                atnodes = anodes[0].getElementsByTagName("name")
-                if not atnodes:
-                    continue
-                if not atnodes[0].hasChildNodes():
-                    continue
-                # a +100 penalty for not being the right artist
-                artist_score = 100 + modified_levenshtein(
-                    atnodes[0].firstChild.nodeValue, artist)
-                artist_name = atnodes[0].firstChild.nodeValue
-            nnodes = tnode.getElementsByTagName("title")
-            if not nnodes:
-                continue
-            if not nnodes[0].hasChildNodes():
-                continue
-            rnodes = tnode.getElementsByTagName("release")
-            if not rnodes:
-                continue
-            rtnodes = rnodes[0].getElementsByTagName("title")
-            if not rtnodes:
-                continue
-            if not rtnodes[0].hasChildNodes():
-                continue
-            track_score = modified_levenshtein(
-                nnodes[0].firstChild.nodeValue, title)
-            album_score = modified_levenshtein(
-                rtnodes[0].firstChild.nodeValue, album)
-            total_score = track_score + album_score + artist_score
-            result = {"track": nnodes[0].firstChild.nodeValue,
-                      "album": rtnodes[0].firstChild.nodeValue,
-                      "artist": artist_name,
-                      "track_score": track_score,
-                      "album_score": album_score,
-                      "artist_score": album_score,
-                      "total_score": total_score,
-                      "trackid": tnode.getAttribute("id")}
-            if total_score < 150:
-                possibles.append(result)
-            else:
-                print "discarding", result
-        possibles.sort(key=operator.itemgetter('total_score'))
-        if not possibles:
-            print "Didn't find any matches at all"
-            self.display_error('could-not-find')
-            return
-        print possibles
-        match = possibles[0]
-        print "got a match", match
-        dest_url = "%s/music/l/%s/%s" % (
-            BASE_URL, match["trackid"], "0")  # this 0 should be userid
-        self.builder.get_object("lblProgress").set_markup(
-            _("Found <i>%s</i> by <i>%s</i> from <i>%s</i>") % (
-                cgi.escape(match["track"]), cgi.escape(match["artist"]),
-                cgi.escape(match["album"])))
-        self.builder.get_object("lblURL").set_markup(
-            "<big><b>%s</b></big>" % dest_url)
-        clipboard = gtk.Clipboard(
-            gtk.gdk.display_manager_get().get_default_display(), "CLIPBOARD")
-        clipboard.set_text(dest_url)
-
-        if GWIBBER_AVAILABLE:
-            self.tweet_button = gtk.Button("Tweet this link")
-            self.tweet_button.connect("clicked", self.gwibber, dest_url,
-                artist, album, title)
-            self.win.get_content_area().pack_end(self.tweet_button)
-            self.tweet_button.show()
-
-    def gwibber(self, button, url, artist, album, title):
-        """Show the Gwibber posting widget."""
-        self.pvb = gwibber.lib.gtk.widgets.GwibberPosterVBox()
-        self.message = "Currently listening to %s by %s %s" % (
-            title, artist, url)
-        self.pvb.input.connect("expose-event", self.gwibber_input_text)
-        self.pvb.button_send.connect("clicked",
-            lambda x: self.builder.get_object("winMain").destroy())
-        self.pvb.show_all()
-        self.builder.get_object("vbMain").pack_end(self.pvb)
-        self.tweet_button.hide()
-
-    def gwibber_input_text(self, *args):
-        """Set the Gwibber text input."""
-        self.pvb.input.set_text(self.message)

=== removed file 'umusicstore/u1msurl.glade'
--- umusicstore/u1msurl.glade	2010-09-20 15:15:15 +0000
+++ umusicstore/u1msurl.glade	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkDialog" id="winMain">
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkHBox" id="hbox1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkImage" id="imgMain">
-                <property name="visible">True</property>
-                <property name="yalign">0</property>
-                <property name="xpad">3</property>
-                <property name="ypad">3</property>
-                <property name="stock">gtk-info</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbMain">
-                <property name="visible">True</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkLabel" id="lblProgress">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="wrap">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">3</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lblURL">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="wrap">True</property>
-                    <property name="selectable">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">3</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">3</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">button1</action-widget>
-    </action-widgets>
-  </object>
-</interface>