Remove camera service

It was an experiment, but in future PipeWire will be used instead, so it
is no longer needed.

16 files changed, 2 insertions, 2222 deletions

diff --git a/.gitignore b/.gitignore
index 9281cb46..3a91f678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,13 +19,11 @@ Makefile.in*
 /cheese-lcov.info
 /data/cheese-gtk.pc
 /data/cheese.pc
-/data/org.gnome.Camera.service
 /data/org.gnome.Cheese.appdata.xml
 /data/org.gnome.Cheese.appdata.valid
 /data/org.gnome.Cheese.desktop
 /data/org.gnome.Cheese.desktop.in
 /data/org.gnome.Cheese.gschema.valid
-/data/org.gnome.Cheese.service
 /docs/reference/html/
 /docs/reference/xml/
 /docs/reference/*.stamp
@@ -54,8 +52,6 @@ Makefile.in*
 /po/POTFILES
 /po/cheese.pot
 /po/stamp-it
-/service/camera.c
-/service/camera.h
 /src/*.c
 /src/cheese-resource.h
 /????-report.html
@@ -67,7 +63,6 @@ Makefile.in*
 /tests/cheese-test-flash
 /tests/test-libcheese
 /tests/test-libcheese-gtk
-/tests/test-service-client
 /tests/test-webcam-button
 /aclocal.m4
 /Cheese-*.gir
@@ -75,7 +70,6 @@ Makefile.in*
 /cheese
 /config.*
 /configure
-/gnome-camera-service
 /gtk-doc.make
 /INSTALL
 /intltool*.in
diff --git a/COPYING.GPL3 b/COPYING.GPL3
deleted file mode 100644
index 94a9ed02..00000000
--- a/COPYING.GPL3
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.am b/Makefile.am
index 3103a0e1..ad8918c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -243,56 +243,12 @@ cheese_LDADD = \
 	$(CHEESE_LIBS) \
 	$(CHEESE_GTK_LIBS)
 
-libexec_PROGRAMS = \
-	gnome-camera-service
-
-service/camera.c: service/camera.h
-service/camera.h: Makefile data/org.gnome.Camera.xml
-	$(AM_V_GEN) $(GDBUS_CODEGEN) --interface-prefix org.gnome.Camera. \
-		--generate-c-code service/camera \
-		--c-namespace Gc $(srcdir)/data/org.gnome.Camera.xml
-
-BUILT_SOURCES = \
-	$(nodist_gnome_camera_service_SOURCES)
-
-gnome_camera_service_SOURCES = \
-	service/gc-application.c \
-	service/gc-camera-client.c \
-	service/gc-camera-manager.c \
-	service/gc-client-monitor.c \
-	service/gc-main.c
-
-noinst_gnome_camera_service_headers = \
-	service/gc-application.h \
-	service/gc-camera-client.h \
-	service/gc-camera-manager.h \
-	service/gc-client-monitor.h
-
-nodist_gnome_camera_service_headers = \
-	service/camera.h
-
-nodist_gnome_camera_service_SOURCES = \
-	service/camera.c
-
-gnome_camera_service_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/service \
-	-I$(top_srcdir)/libcheese
-
-gnome_camera_service_CFLAGS = \
-	$(CHEESE_GTK_CFLAGS)
-
-gnome_camera_service_LDADD = \
-	libcheese-gtk.la \
-	$(CHEESE_GTK_LIBS)
-
 EXAMPLES = \
 	tests/cheese-test-camera \
 	tests/cheese-test-chooser \
 	tests/cheese-test-flash \
 	tests/cheese-test-monitor \
-	tests/cheese-test-widget \
-	tests/test-service-client
+	tests/cheese-test-widget
 
 if HAVE_XTEST
 noinst_PROGRAMS = \
@@ -312,8 +268,6 @@ tests_cheese_test_chooser_SOURCES = tests/cheese-test-chooser.c
 tests_cheese_test_flash_SOURCES = tests/cheese-test-flash.c
 tests_cheese_test_monitor_SOURCES = tests/cheese-test-monitor.c
 tests_cheese_test_widget_SOURCES = tests/cheese-test-widget.c
-tests_test_service_client_SOURCES = tests/test-service-client.c
-nodist_tests_test_service_client_SOURCES = service/camera.c
 tests_test_webcam_button_SOURCES = tests/test-webcam-button.c
 
 tests_cheese_test_camera_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
@@ -321,8 +275,6 @@ tests_cheese_test_chooser_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 tests_cheese_test_flash_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 tests_cheese_test_monitor_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 tests_cheese_test_widget_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_test_service_client_CPPFLAGS = \
-	$(EXAMPLES_CPPFLAGS) -I$(top_builddir)/service
 tests_test_webcam_button_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
 
 tests_cheese_test_camera_LDADD = \
@@ -349,7 +301,6 @@ tests_cheese_test_widget_LDADD = \
 	$(CHEESE_GTK_LIBS) \
 	libcheese.la \
 	libcheese-gtk.la
-tests_test_service_client_LDADD = $(CHEESE_GTK_LIBS)
 tests_test_webcam_button_LDADD = $(XTEST_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
@@ -365,13 +316,9 @@ appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
 data/org.gnome.Cheese.service: data/org.gnome.Cheese.service.in
 	$(AM_V_GEN)$(SED) -e "s|[@]bindir[@]|$(bindir)|" $< > $@
 
-data/org.gnome.Camera.service: data/org.gnome.Camera.service.in
-	$(AM_V_GEN)$(SED) -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
-
 servicedir = $(datadir)/dbus-1/services
 service_in_files = \
-	data/org.gnome.Camera.service.in \
-	data/org.gnome.Cheese.service.in
+       data/org.gnome.Cheese.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 @GSETTINGS_RULES@
@@ -537,15 +484,12 @@ dist-hook: git-changelog-hook
 
 dist_noinst_DATA = \
 	ChangeLog.pre-git \
-	COPYING.GPL3 \
 	$(appstream_in_files) \
 	$(desktop_in_files) \
 	$(gsettings_SCHEMAS) \
-	$(noinst_gnome_camera_service_headers) \
 	$(noinst_resource_files) \
 	$(service_in_files) \
 	data/org.gnome.Cheese.gresource.xml \
-	data/org.gnome.Camera.xml \
 	build-aux/test-driver \
 	$(gtkdoc_srcdir)/cheese-docs.xml \
 	$(gtkdoc_srcdir)/cheese-sections.txt \
@@ -573,8 +517,6 @@ CLEANFILES = \
 	$(gir_DATA) \
 	$(service_DATA) \
 	$(typelib_DATA) \
-	$(nodist_gnome_camera_service_headers) \
-	$(nodist_gnome_camera_service_SOURCES) \
 	src/cheese-resource.c \
 	src/cheese-resource.h
 
diff --git a/configure.ac b/configure.ac
index ded588a5..7f1d1fec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,6 @@ PKG_CHECK_EXISTS([$GNOME_VIDEO_EFFECTS_REQUIRED],
 
 # GLib programs.
 AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
-AC_SUBST([GDBUS_CODEGEN], [`$PKG_CONFIG --variable gdbus_codegen gio-2.0`])
 
 # Recommend some runtime GStreamer plugins.
 AC_PATH_PROGS([GST_INSPECT], [gst-inspect-1.0], [notfound])
diff --git a/data/org.gnome.Camera.service.in b/data/org.gnome.Camera.service.in
deleted file mode 100644
index de474f02..00000000
--- a/data/org.gnome.Camera.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.Camera
-Exec=@libexecdir@/gnome-camera-service
diff --git a/data/org.gnome.Camera.xml b/data/org.gnome.Camera.xml
deleted file mode 100644
index 4a6926cf..00000000
--- a/data/org.gnome.Camera.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/gnome/Camera">
-    <!-- org.gnome.Camera:
-         @short_description: Use the available camera devices
-
-         The camera interface is used to take photos with the available camera
-         devices.
-    -->
-    <interface name="org.gnome.Camera.Manager">
-        <!-- GetClient:
-             @chooser: The object path of a new client object
-             @short_description: Get a client object for showing a photo dialog
-
-             Use the obtained client object to show a dialog for taking photos
-             and videos using a webcam.
-        -->
-        <method name="GetClient">
-            <arg name="client" type="o" direction="out"/>
-        </method>
-    </interface>
-
-    <!-- org.gnome.Camera.Client:
-         @short_description: Play images and videos from a camera
-    -->
-    <interface name="org.gnome.Camera.Client">
-        <!-- ImageData:
-             @short_description: Image data for photo from webcam
-
-             The PNG image data, Base64-encoded, from the photo taken by the
-             webcam, and cropped by the user.
-        -->
-        <property name="ImageData" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
-        </property>
-        <!-- ShowChooser:
-             @short_description: Show the webcam chooser dialog
-        -->
-        <method name="ShowChooser">
-        </method>
-        <!-- UserDone:
-             @photo_taken: Whether a photo was taken or not
-             @image_data: The image data as a Base64-encoded PNG, or empty
-             @short_description: Indicates that the dialog was closed
-        -->
-        <signal name="UserDone">
-            <arg name="photo_taken" type="b" />
-            <arg name="image_data" type="s" />
-        </signal>
-    </interface>
-</node>
diff --git a/service/gc-application.c b/service/gc-application.c
deleted file mode 100644
index 7e0d0869..00000000
--- a/service/gc-application.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gc-application.h"
-
-#include "gc-camera-manager.h"
-
-typedef struct
-{
-    GcCameraManager *manager;
-} GcApplicationPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (GcApplication, gc_application, G_TYPE_APPLICATION)
-
-static gboolean
-gc_application_dbus_register (GApplication *application,
-                              GDBusConnection *connection,
-                              const gchar *object_path,
-                              GError **error)
-{
-    GcApplicationPrivate *priv;
-
-    priv = gc_application_get_instance_private (GC_APPLICATION (application));
-
-    if (!G_APPLICATION_CLASS (gc_application_parent_class)->dbus_register (application,
-                                                                           connection,
-                                                                           object_path,
-                                                                           error))
-    {
-        return FALSE;
-    }
-
-    priv->manager = gc_camera_manager_new (connection, error);
-
-    if (priv->manager == NULL)
-    {
-        g_warning ("Error exporting camera interface skeleton: %s",
-                   (*error)->message);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static void
-gc_application_dbus_unregister (GApplication *application,
-                                GDBusConnection *connection,
-                                const gchar *object_path)
-{
-    GcApplicationPrivate *priv;
-
-    priv = gc_application_get_instance_private (GC_APPLICATION (application));
-
-    /* TODO: Not necessary? */
-    g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (priv->manager));
-
-    G_APPLICATION_CLASS (gc_application_parent_class)->dbus_unregister (application,
-                                                                        connection,
-                                                                        object_path);
-}
-
-static void
-gc_application_finalize (GObject *object)
-{
-    GcApplication *application;
-    GcApplicationPrivate *priv;
-
-    application = GC_APPLICATION (object);
-    priv = gc_application_get_instance_private (application);
-
-    g_clear_object (&priv->manager);
-}
-
-static void
-gc_application_init (GcApplication *application)
-{
-}
-
-static void
-gc_application_class_init (GcApplicationClass *klass)
-{
-    GObjectClass *gobject_class;
-    GApplicationClass *app_class;
-
-    gobject_class = G_OBJECT_CLASS (klass);
-    gobject_class->finalize = gc_application_finalize;
-
-    app_class = G_APPLICATION_CLASS (klass);
-    app_class->dbus_register = gc_application_dbus_register;
-    app_class->dbus_unregister = gc_application_dbus_unregister;
-}
-
-GcApplication *
-gc_application_new (void)
-{
-    return g_object_new (GC_TYPE_APPLICATION, "application-id",
-                         "org.gnome.Camera", "flags", G_APPLICATION_IS_SERVICE,
-                         NULL);
-}
diff --git a/service/gc-application.h b/service/gc-application.h
deleted file mode 100644
index a74a6ea9..00000000
--- a/service/gc-application.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GC_APPLICATION_H_
-#define GC_APPLICATION_H_
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-typedef struct
-{
-    /*< private >*/
-    GApplication parent_instance;
-} GcApplication;
-
-typedef struct
-{
-    GApplicationClass parent_class;
-} GcApplicationClass;
-
-#define GC_TYPE_APPLICATION (gc_application_get_type ())
-#define GC_APPLICATION(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GC_TYPE_APPLICATION, GcApplication))
-
-GType gc_application_get_type (void);
-GcApplication * gc_application_new (void);
-
-G_END_DECLS
-
-#endif /* GC_APPLICATION_H_ */
diff --git a/service/gc-camera-client.c b/service/gc-camera-client.c
deleted file mode 100644
index 444354db..00000000
--- a/service/gc-camera-client.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gc-camera-client.h"
-#include "cheese-avatar-chooser.h"
-
-typedef struct
-{
-    GDBusConnection *connection;
-    gchar *path;
-    GtkWidget *chooser;
-    gchar *image_data;
-} GcCameraClientPrivate;
-
-static void gc_camera_client_client_iface_init (GcClientIface *iface);
-static void gc_camera_client_initable_iface_init (GInitableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GcCameraClient, gc_camera_client,
-                         GC_TYPE_CLIENT_SKELETON,
-                         G_ADD_PRIVATE (GcCameraClient)
-                         G_IMPLEMENT_INTERFACE (GC_TYPE_CLIENT, gc_camera_client_client_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gc_camera_client_initable_iface_init))
-
-enum
-{
-    PROP_0,
-    PROP_CONNECTION,
-    PROP_PATH,
-    PROP_IMAGE_DATA,
-    N_PROPERTIES
-};
-
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-
-static void
-gc_camera_client_set_image_data_from_pixbuf (GcCameraClient *self,
-                                             GdkPixbuf *pixbuf)
-{
-    GcCameraClientPrivate *priv;
-    gchar *buffer;
-    gsize length;
-
-    priv = gc_camera_client_get_instance_private (self);
-
-    /* FIXME: Check for errors. */
-    if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &length, "png", NULL, NULL))
-    {
-        g_error ("%s", "GdkPixbuf could not be saved to PNG format");
-    }
-
-    g_free (priv->image_data);
-    priv->image_data = g_base64_encode ((const guchar *)buffer, length);
-    g_free (buffer);
-
-    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_IMAGE_DATA]);
-}
-
-static void
-on_chooser_response (CheeseAvatarChooser *chooser,
-                     gint response,
-                     GcCameraClient *self)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (self);
-
-    if (response == GTK_RESPONSE_ACCEPT)
-    {
-        gc_camera_client_set_image_data_from_pixbuf (self,
-                                                     cheese_avatar_chooser_get_picture (chooser));
-        gc_client_emit_user_done (GC_CLIENT (self), TRUE, priv->image_data);
-    }
-    else
-    {
-        gc_client_emit_user_done (GC_CLIENT (self), FALSE, priv->image_data);
-    }
-
-    /* FIXME: Destroy the chooser, as there is no way to stop the webcam
-     * viewfinder. */
-    gtk_widget_hide (GTK_WIDGET (chooser));
-}
-
-static gboolean
-gc_camera_client_handle_show_chooser (GcClient *client,
-                                      GDBusMethodInvocation *invocation)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (GC_CAMERA_CLIENT (client));
-
-    gtk_widget_show (priv->chooser);
-
-    gc_client_complete_show_chooser (client, invocation);
-
-    return TRUE;
-}
-
-static const gchar *
-gc_camera_client_get_image_data (GcClient *client)
-{
-    GcCameraClient *self;
-    GcCameraClientPrivate *priv;
-
-    self = GC_CAMERA_CLIENT (client);
-    priv = gc_camera_client_get_instance_private (self);
-
-    return priv->image_data;
-}
-
-const gchar *
-gc_camera_client_get_path (GcCameraClient *client)
-{
-    GcCameraClientPrivate *priv;
-
-    g_return_val_if_fail (GC_CAMERA_CLIENT (client), NULL);
-
-    priv = gc_camera_client_get_instance_private (client);
-
-    return priv->path;
-}
-
-static void
-gc_camera_client_finalize (GObject *object)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (GC_CAMERA_CLIENT (object));
-
-    g_clear_object (&priv->chooser);
-    g_clear_pointer (&priv->image_data, g_free);
-
-    g_free (priv->path);
-
-    G_OBJECT_CLASS (gc_camera_client_parent_class)->finalize (object);
-}
-
-static void
-gc_camera_client_get_property (GObject *object,
-                               guint prop_id,
-                               GValue *value,
-                               GParamSpec *pspec)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (GC_CAMERA_CLIENT (object));
-
-    switch (prop_id)
-    {
-        case PROP_CONNECTION:
-            g_value_set_object (value, priv->connection);
-            break;
-        case PROP_PATH:
-            g_value_set_string (value, priv->path);
-            break;
-        case PROP_IMAGE_DATA:
-            g_value_set_string (value, priv->image_data);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-gc_camera_client_set_property (GObject *object,
-                               guint prop_id,
-                               const GValue *value,
-                               GParamSpec *pspec)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (GC_CAMERA_CLIENT (object));
-
-    switch (prop_id)
-    {
-        case PROP_CONNECTION:
-            priv->connection = g_value_dup_object (value);
-            break;
-        case PROP_PATH:
-            g_free (priv->path);
-            priv->path = g_value_dup_string (value);
-            break;
-        case PROP_IMAGE_DATA:
-            g_free (priv->image_data);
-            priv->image_data = g_value_dup_string (value);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-gc_camera_client_class_init (GcCameraClientClass *klass)
-{
-    GObjectClass *object_class;
-
-    object_class = G_OBJECT_CLASS (klass);
-
-    object_class->finalize = gc_camera_client_finalize;
-    object_class->get_property = gc_camera_client_get_property;
-    object_class->set_property = gc_camera_client_set_property;
-
-    properties[PROP_CONNECTION] = g_param_spec_object ("connection",
-                                                       "Connection",
-                                                       "DBus Connection",
-                                                       G_TYPE_DBUS_CONNECTION,
-                                                       G_PARAM_READWRITE |
-                                                       G_PARAM_CONSTRUCT_ONLY |
-                                                       G_PARAM_STATIC_STRINGS);
-    g_object_class_install_property (object_class, PROP_CONNECTION,
-                                     properties[PROP_CONNECTION]);
-
-    properties[PROP_PATH] = g_param_spec_string ("path",
-                                                 "Path",
-                                                 "D-Bus object path",
-                                                 NULL,
-                                                 G_PARAM_READWRITE |
-                                                 G_PARAM_CONSTRUCT_ONLY |
-                                                 G_PARAM_STATIC_STRINGS);
-    g_object_class_install_property (object_class, PROP_PATH,
-                                     properties[PROP_PATH]);
-
-    properties[PROP_IMAGE_DATA] = g_param_spec_string ("image-data",
-                                                       "Image data",
-                                                       "PNG image data, Base64-encoded",
-                                                       NULL,
-                                                       G_PARAM_READWRITE |
-                                                       G_PARAM_STATIC_STRINGS);
-    g_object_class_install_property (object_class, PROP_IMAGE_DATA,
-                                     properties[PROP_IMAGE_DATA]);
-}
-
-static void
-gc_camera_client_init (GcCameraClient *self)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (self);
-
-    priv->chooser = cheese_avatar_chooser_new ();
-
-    g_signal_connect (priv->chooser, "response",
-                      G_CALLBACK (on_chooser_response), self);
-}
-
-static gboolean
-gc_camera_client_initable_init (GInitable *initable,
-                                GCancellable *cancellable,
-                                GError **error)
-{
-    GcCameraClientPrivate *priv;
-
-    priv = gc_camera_client_get_instance_private (GC_CAMERA_CLIENT (initable));
-
-    return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (initable),
-                                             priv->connection,
-                                             priv->path,
-                                             error);
-}
-
-static void
-gc_camera_client_client_iface_init (GcClientIface *iface)
-{
-    iface->handle_show_chooser = gc_camera_client_handle_show_chooser;
-    iface->get_image_data = gc_camera_client_get_image_data;
-}
-
-static void
-gc_camera_client_initable_iface_init (GInitableIface *iface)
-{
-    iface->init = gc_camera_client_initable_init;
-}
-
-GcCameraClient *
-gc_camera_client_new (GDBusConnection *connection,
-                      const gchar *path,
-                      GError **error)
-{
-    return g_initable_new (GC_TYPE_CAMERA_CLIENT, NULL, error, "connection",
-                           connection, "path", path, NULL);
-}
diff --git a/service/gc-camera-client.h b/service/gc-camera-client.h
deleted file mode 100644
index d611451b..00000000
--- a/service/gc-camera-client.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GC_CAMERA_CLIENT_H_
-#define GC_CAMERA_CLIENT_H_
-
-#include "camera.h"
-
-G_BEGIN_DECLS
-
-typedef struct
-{
-    /*< private >*/
-    GcClientSkeleton parent_instance;
-} GcCameraClient;
-
-typedef struct
-{
-    GcClientSkeletonClass parent_class;
-} GcCameraClientClass;
-
-#define GC_TYPE_CAMERA_CLIENT (gc_camera_client_get_type ())
-#define GC_CAMERA_CLIENT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GC_TYPE_CAMERA_CLIENT, GcCameraClient))
-
-GType gc_camera_client_get_type (void);
-GcCameraClient * gc_camera_client_new (GDBusConnection *connection, const gchar *path, GError **error);
-const gchar * gc_camera_client_get_path (GcCameraClient *client);
-
-G_END_DECLS
-
-#endif /* GC_CAMERA_CLIENT_H_ */
diff --git a/service/gc-camera-manager.c b/service/gc-camera-manager.c
deleted file mode 100644
index 94b18ea7..00000000
--- a/service/gc-camera-manager.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gc-camera-manager.h"
-
-#include "gc-camera-client.h"
-#include "gc-client-monitor.h"
-
-typedef struct
-{
-    GDBusConnection *connection;
-    GStrv cameras;
-    GHashTable *clients;
-    guint client_ids;
-} GcCameraManagerPrivate;
-
-static void gc_camera_manager_manager_iface_init (GcManagerIface *iface);
-static void gc_camera_manager_initable_iface_init (GInitableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GcCameraManager, gc_camera_manager,
-                         GC_TYPE_MANAGER_SKELETON,
-                         G_ADD_PRIVATE (GcCameraManager)
-                         G_IMPLEMENT_INTERFACE (GC_TYPE_MANAGER, gc_camera_manager_manager_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gc_camera_manager_initable_iface_init))
-
-typedef struct
-{
-    GcCameraManager *manager;
-    GDBusMethodInvocation *invocation;
-    GcClientMonitor *monitor;
-} OnClientMonitorNewReadyData;
-
-enum
-{
-    PROP_0,
-    PROP_CONNECTION,
-    PROP_CAMERAS,
-    N_PROPERTIES
-};
-
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-
-static void
-on_client_monitor_new_ready (GObject *source_object,
-                             GAsyncResult *result,
-                             gpointer user_data)
-{
-    OnClientMonitorNewReadyData *data;
-    GcClientMonitor *monitor;
-    GError *error = NULL;
-    GcCameraManager *self;
-    GcCameraManagerPrivate *priv;
-    gchar *path;
-    GcCameraClient *client;
-
-    data = (OnClientMonitorNewReadyData *)user_data;
-    monitor = gc_client_monitor_new_finish (result, &error);
-
-    if (monitor == NULL)
-    {
-        g_dbus_method_invocation_return_error (data->invocation,
-                                               G_DBUS_ERROR,
-                                               G_DBUS_ERROR_FAILED,
-                                               "%s",
-                                               error->message);
-        g_error_free (error);
-        g_slice_free (OnClientMonitorNewReadyData, data);
-
-        return;
-    }
-
-    self = data->manager;
-    priv = gc_camera_manager_get_instance_private (self);
-
-    path = g_strdup_printf ("/org/gnome/Camera/Client/%d", ++priv->client_ids);
-
-    /* FIXME: Do this properly when adding multiple client handling. */
-    g_application_hold (g_application_get_default ());
-
-    client = gc_camera_client_new (priv->connection, path, &error);
-
-    if (client == NULL)
-    {
-        goto error_out;
-    }
-
-    g_hash_table_insert (priv->clients, path, client);
-
-    gc_manager_complete_get_client (GC_MANAGER (self), data->invocation, path);
-
-    goto out;
-
-error_out:
-    g_dbus_method_invocation_return_error (data->invocation,
-                                           G_DBUS_ERROR,
-                                           G_DBUS_ERROR_FAILED,
-                                           "%s",
-                                           error->message);
-    g_error_free (error);
-
-out:
-    g_clear_object (&monitor);
-    g_slice_free (OnClientMonitorNewReadyData, data);
-    g_free (path);
-}
-
-static gboolean
-gc_camera_manager_handle_get_client (GcManager *manager,
-                                     GDBusMethodInvocation *invocation)
-{
-    GcCameraManager *self;
-    GcCameraManagerPrivate *priv;
-    const gchar *peer;
-    GcCameraClient *client;
-    OnClientMonitorNewReadyData *data;
-
-    self = GC_CAMERA_MANAGER (manager);
-    priv = gc_camera_manager_get_instance_private (self);
-
-    peer = g_dbus_method_invocation_get_sender (invocation);
-    client = g_hash_table_lookup (priv->clients, peer);
-
-    if (client != NULL)
-    {
-        const gchar *path;
-
-        path = gc_camera_client_get_path (client);
-        gc_manager_complete_get_client (manager, invocation, path);
-        return TRUE;
-    }
-
-    /* FIXME: Monitor when the associated peer disappears from the bus. */
-    data = g_slice_new (OnClientMonitorNewReadyData);
-    data->manager = self;
-    data->invocation = invocation;
-    gc_client_monitor_new_async (peer,
-                                 priv->connection,
-                                 NULL,
-                                 on_client_monitor_new_ready,
-                                 data);
-
-    return TRUE;
-}
-
-static void
-gc_camera_manager_finalize (GObject *object)
-{
-    GcCameraManagerPrivate *priv;
-
-    priv = gc_camera_manager_get_instance_private (GC_CAMERA_MANAGER (object));
-
-    g_clear_object (&priv->connection);
-    g_clear_pointer (&priv->clients, g_hash_table_unref);
-
-    G_OBJECT_CLASS (gc_camera_manager_parent_class)->finalize (object);
-}
-
-static void
-gc_camera_manager_get_property (GObject *object,
-                                guint prop_id,
-                                GValue *value,
-                                GParamSpec *pspec)
-{
-    GcCameraManagerPrivate *priv;
-
-    priv = gc_camera_manager_get_instance_private (GC_CAMERA_MANAGER (object));
-
-    switch (prop_id)
-    {
-        case PROP_CONNECTION:
-            g_value_set_object (value, priv->connection);
-            break;
-        case PROP_CAMERAS:
-            g_value_set_boxed (value, priv->cameras);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-gc_camera_manager_set_property (GObject *object,
-                                guint prop_id,
-                                const GValue *value,
-                                GParamSpec *pspec)
-{
-    GcCameraManagerPrivate *priv;
-
-    priv = gc_camera_manager_get_instance_private (GC_CAMERA_MANAGER (object));
-
-    switch (prop_id)
-    {
-        case PROP_CONNECTION:
-            priv->connection = g_value_dup_object (value);
-            break;
-        case PROP_CAMERAS:
-            g_strfreev (priv->cameras);
-            priv->cameras = g_value_dup_boxed (value);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-gc_camera_manager_class_init (GcCameraManagerClass *klass)
-{
-    GObjectClass *object_class;
-
-    object_class = G_OBJECT_CLASS (klass);
-
-    object_class->finalize = gc_camera_manager_finalize;
-    object_class->get_property = gc_camera_manager_get_property;
-    object_class->set_property = gc_camera_manager_set_property;
-
-    properties[PROP_CONNECTION] = g_param_spec_object ("connection",
-                                                       "Connection",
-                                                       "DBus Connection",
-                                                       G_TYPE_DBUS_CONNECTION,
-                                                       G_PARAM_READWRITE |
-                                                       G_PARAM_CONSTRUCT_ONLY |
-                                                       G_PARAM_STATIC_STRINGS);
-    g_object_class_install_property (object_class, PROP_CONNECTION,
-                                     properties[PROP_CONNECTION]);
-
-    properties[PROP_CAMERAS] = g_param_spec_boxed ("cameras",
-                                                   "Cameras",
-                                                   "List of connected cameras",
-                                                   G_TYPE_STRV,
-                                                   G_PARAM_READWRITE |
-                                                   G_PARAM_STATIC_STRINGS);
-    g_object_class_install_property (object_class, PROP_CAMERAS,
-                                     properties[PROP_CAMERAS]);
-}
-
-static void
-gc_camera_manager_init (GcCameraManager *self)
-{
-}
-
-static gboolean
-gc_camera_manager_initable_init (GInitable *initable,
-                                 GCancellable *cancellable,
-                                 GError **error)
-{
-    GcCameraManagerPrivate *priv;
-
-    priv = gc_camera_manager_get_instance_private (GC_CAMERA_MANAGER (initable));
-
-    priv->clients = g_hash_table_new_full (g_str_hash,
-                                           g_str_equal,
-                                           g_free,
-                                           g_object_unref);
-
-    return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (initable),
-                                             priv->connection,
-                                             "/org/gnome/Camera/Manager",
-                                             error);
-}
-
-static void
-gc_camera_manager_manager_iface_init (GcManagerIface *iface)
-{
-    iface->handle_get_client = gc_camera_manager_handle_get_client;
-}
-
-static void
-gc_camera_manager_initable_iface_init (GInitableIface *iface)
-{
-    iface->init = gc_camera_manager_initable_init;
-}
-
-GcCameraManager *
-gc_camera_manager_new (GDBusConnection *connection, GError **error)
-{
-    return g_initable_new (GC_TYPE_CAMERA_MANAGER, NULL, error, "connection",
-                           connection, NULL);
-}
diff --git a/service/gc-camera-manager.h b/service/gc-camera-manager.h
deleted file mode 100644
index 00965c3d..00000000
--- a/service/gc-camera-manager.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GC_CAMERA_MANAGER_H_
-#define GC_CAMERA_MANAGER_H_
-
-#include "camera.h"
-
-G_BEGIN_DECLS
-
-typedef struct
-{
-    /*< private >*/
-    GcManagerSkeleton parent_instance;
-} GcCameraManager;
-
-typedef struct
-{
-    GcManagerSkeletonClass parent_class;
-} GcCameraManagerClass;
-
-#define GC_TYPE_CAMERA_MANAGER (gc_camera_manager_get_type ())
-#define GC_CAMERA_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GC_TYPE_CAMERA_MANAGER, GcCameraManager))
-
-GType gc_camera_manager_get_type (void);
-GcCameraManager * gc_camera_manager_new (GDBusConnection *connection, GError **error);
-
-G_END_DECLS
-
-#endif /* GC_CAMERA_MANAGER_H_ */
diff --git a/service/gc-client-monitor.c b/service/gc-client-monitor.c
deleted file mode 100644
index 61ce70ae..00000000
--- a/service/gc-client-monitor.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gc-client-monitor.h"
-
-typedef struct
-{
-    gchar *peer;
-    GDBusConnection *connection;
-    GDBusProxy *dbus_proxy;
-    guint watch_id;
-    guint32 user_id;
-} GcClientMonitorPrivate;
-
-static void gc_client_monitor_async_initable_iface_init (GAsyncInitableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GcClientMonitor,
-                         gc_client_monitor,
-                         G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (GcClientMonitor)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, gc_client_monitor_async_initable_iface_init))
-
-enum
-{
-    PROP_0,
-    PROP_CONNECTION,
-    PROP_PEER,
-    N_PROPERTIES
-};
-
-enum
-{
-    PEER_VANISHED,
-    N_SIGNALS
-};
-
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-static guint signals[N_SIGNALS];
-
-static void
-on_name_vanished (GDBusConnection *connection,
-                  const gchar *name,
-                  gpointer user_data)
-{
-    g_signal_emit (GC_CLIENT_MONITOR (user_data), signals[PEER_VANISHED], 0);
-}
-
-static void
-on_get_user_id_ready (GObject *source_object,
-                      GAsyncResult *result,
-                      gpointer user_data)
-{
-    GTask *task;
-    GcClientMonitor *self;
-    GcClientMonitorPrivate *priv;
-    GError *error = NULL;
-    GVariant *results = NULL;
-
-    task = G_TASK (user_data);
-    self = GC_CLIENT_MONITOR (g_task_get_source_object (task));
-    priv = gc_client_monitor_get_instance_private (self);
-
-    results = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
-                                        result,
-                                        &error);
-    if (results == NULL)
-    {
-        g_task_return_error (task, error);
-        g_object_unref (task);
-
-        return;
-    }
-
-    g_assert (g_variant_n_children (results) > 0);
-    g_variant_get_child (results, 0, "u", &priv->user_id);
-    g_variant_unref (results);
-
-    priv->watch_id = g_bus_watch_name_on_connection (priv->connection,
-                                                     priv->peer,
-                                                     G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                                     NULL,
-                                                     on_name_vanished,
-                                                     self,
-                                                     NULL);
-
-    g_task_return_boolean (task, TRUE);
-
-    g_object_unref (task);
-}
-
-static void
-on_dbus_proxy_ready (GObject *source_object,
-                     GAsyncResult *result,
-                     gpointer user_data)
-{
-    GTask *task;
-    GcClientMonitor *self;
-    GcClientMonitorPrivate *priv;
-    GError *error = NULL;
-
-    task = G_TASK (user_data);
-    self = GC_CLIENT_MONITOR (g_task_get_source_object (task));
-    priv = gc_client_monitor_get_instance_private (self);
-
-    priv->dbus_proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
-
-    if (priv->dbus_proxy == NULL)
-    {
-        g_task_return_error (task, error);
-        g_object_unref (task);
-        return;
-    }
-
-    g_dbus_proxy_call (priv->dbus_proxy,
-                       "GetConnectionUnixUser",
-                       g_variant_new ("(s)", priv->peer),
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1,
-                       g_task_get_cancellable (task),
-                       on_get_user_id_ready,
-                       task);
-}
-
-static void
-gc_client_monitor_finalize (GObject *object)
-{
-    GcClientMonitorPrivate *priv;
-
-    priv = gc_client_monitor_get_instance_private (GC_CLIENT_MONITOR (object));
-
-    g_free (priv->peer);
-
-    G_OBJECT_CLASS (gc_client_monitor_parent_class)->finalize (object);
-}
-
-static void
-gc_client_monitor_get_property (GObject *object,
-                                guint prop_id,
-                                GValue *value,
-                                GParamSpec *pspec)
-{
-    GcClientMonitorPrivate *priv;
-
-    priv = gc_client_monitor_get_instance_private (GC_CLIENT_MONITOR (object));
-
-    switch (prop_id)
-    {
-        case PROP_CONNECTION:
-            g_value_set_object (value, priv->connection);
-            break;
-        case PROP_PEER:
-            g_value_set_string (value, priv->peer);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-gc_client_monitor_set_property (GObject *object,
-                                guint prop_id,
-                                const GValue *value,
-                                GParamSpec *pspec)
-{
-    GcClientMonitorPrivate *priv;
-
-    priv = gc_client_monitor_get_instance_private (GC_CLIENT_MONITOR (object));
-
-    switch (prop_id)
-    {
-        case PROP_CONNECTION:
-            priv->connection = g_value_dup_object (value);
-            break;
-        case PROP_PEER:
-            g_free (priv->peer);
-            priv->peer = g_value_dup_string (value);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-gc_client_monitor_class_init (GcClientMonitorClass *klass)
-{
-    GObjectClass *object_class;
-
-    object_class = G_OBJECT_CLASS (klass);
-
-    object_class->finalize = gc_client_monitor_finalize;
-    object_class->get_property = gc_client_monitor_get_property;
-    object_class->set_property = gc_client_monitor_set_property;
-
-    properties[PROP_CONNECTION] = g_param_spec_object ("connection",
-                                                       "Connection",
-                                                       "DBus Connection",
-                                                       G_TYPE_DBUS_CONNECTION,
-                                                       G_PARAM_READWRITE |
-                                                       G_PARAM_CONSTRUCT_ONLY |
-                                                       G_PARAM_STATIC_STRINGS);
-
-    properties[PROP_PEER] = g_param_spec_string ("peer",
-                                                 "Peer",
-                                                 "D-Bus object path of peer to monitor",
-                                                 NULL,
-                                                 G_PARAM_READWRITE |
-                                                 G_PARAM_CONSTRUCT_ONLY |
-                                                 G_PARAM_STATIC_STRINGS);
-
-    g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-}
-
-static void
-gc_client_monitor_init (GcClientMonitor *self)
-{
-}
-
-static void
-gc_client_monitor_async_initable_init_async (GAsyncInitable *initable,
-                                             gint io_priority,
-                                             GCancellable *cancellable,
-                                             GAsyncReadyCallback callback,
-                                             gpointer user_data)
-{
-    GTask *task;
-
-    task = g_task_new (initable, cancellable, callback, user_data);
-
-    g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                              G_DBUS_PROXY_FLAGS_NONE,
-                              NULL,
-                              "org.freedesktop.DBus",
-                              "/org/freedesktop/DBus",
-                              "org.freedesktop.DBus",
-                              cancellable,
-                              on_dbus_proxy_ready,
-                              task);
-}
-
-static gboolean
-gc_client_monitor_async_initable_init_finish (GAsyncInitable *initable,
-                                              GAsyncResult *result,
-                                              GError **error)
-{
-    return g_task_propagate_boolean (G_TASK (result), error);
-}
-
-static void
-gc_client_monitor_async_initable_iface_init (GAsyncInitableIface *iface)
-{
-    iface->init_async = gc_client_monitor_async_initable_init_async;
-    iface->init_finish = gc_client_monitor_async_initable_init_finish;
-}
-
-void
-gc_client_monitor_new_async (const gchar *peer,
-                             GDBusConnection *connection,
-                             GCancellable *cancellable,
-                             GAsyncReadyCallback callback,
-                             gpointer user_data)
-{
-    g_async_initable_new_async (GC_TYPE_CLIENT_MONITOR,
-                                G_PRIORITY_DEFAULT,
-                                cancellable,
-                                callback,
-                                user_data,
-                                "connection",
-                                connection,
-                                "peer",
-                                peer,
-                                NULL);
-}
-
-GcClientMonitor *
-gc_client_monitor_new_finish (GAsyncResult *result, GError **error)
-{
-    GObject *object;
-    GObject *source_object;
-
-    source_object = g_async_result_get_source_object (result);
-    object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
-                                          result,
-                                          error);
-    g_object_unref (source_object);
-
-    if (object != NULL)
-    {
-        return GC_CLIENT_MONITOR (object);
-    }
-    else
-    {
-        return NULL;
-    }
-}
diff --git a/service/gc-client-monitor.h b/service/gc-client-monitor.h
deleted file mode 100644
index 2da6f3b7..00000000
--- a/service/gc-client-monitor.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GC_CLIENT_MONITOR_H_
-#define GC_CLIENT_MONITOR_H_
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-typedef struct
-{
-    /*< private >*/
-    GObject parent_instance;
-} GcClientMonitor;
-
-typedef struct
-{
-    GObjectClass parent_class;
-
-    void (* peer_vanished) (GcClientMonitor *self);
-} GcClientMonitorClass;
-
-#define GC_TYPE_CLIENT_MONITOR (gc_client_monitor_get_type ())
-#define GC_CLIENT_MONITOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GC_TYPE_CLIENT_MONITOR, GcClientMonitor))
-
-GType gc_client_monitor_get_type (void);
-void gc_client_monitor_new_async (const gchar *bus_name, GDBusConnection *connection, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-GcClientMonitor * gc_client_monitor_new_finish (GAsyncResult *result, GError **error);
-
-G_END_DECLS
-
-#endif /* GC_CLIENT_MONITOR_H_ */
diff --git a/service/gc-main.c b/service/gc-main.c
deleted file mode 100644
index 7c40f856..00000000
--- a/service/gc-main.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <gio/gio.h>
-#include <clutter-gtk/clutter-gtk.h>
-
-#include "cheese-gtk.h"
-#include "gc-application.h"
-
-int
-main (int argc,
-      char *argv[])
-{
-    GApplication *application;
-    int status;
-
-    if (!cheese_gtk_init (&argc, &argv))
-    {
-        return 1;
-    }
-
-    g_set_prgname (PACKAGE_TARNAME);
-    application = G_APPLICATION (gc_application_new ());
-    status = g_application_run (application, argc, argv);
-    g_object_unref (application);
-
-    return status;
-}
diff --git a/tests/test-service-client.c b/tests/test-service-client.c
deleted file mode 100644
index 90294bb0..00000000
--- a/tests/test-service-client.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *  GNOME Camera - Access camera devices on a system via D-Bus
- *  Copyright (C) 2014  Red Hat, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include "camera.h"
-
-/* FIXME: Error checking. Global variables. Memory leaks. */
-
-GcManager *manager_proxy;
-GcClient *client_proxy;
-
-static void
-on_acquire_client_clicked (GtkButton *acquire_client,
-                           GtkButton *show_chooser)
-{
-    GError *error = NULL;
-    gchar *client_path;
-
-    if (!gc_manager_call_get_client_sync (manager_proxy, &client_path, NULL,
-                                          &error))
-    {
-        g_error ("error getting client from manager: %s", error->message);
-    }
-
-    client_proxy = gc_client_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                                     G_DBUS_PROXY_FLAGS_NONE,
-                                                     "org.gnome.Camera",
-                                                     client_path,
-                                                     NULL,
-                                                     NULL);
-
-    gtk_widget_set_sensitive (GTK_WIDGET (show_chooser), TRUE);
-}
-
-static void
-on_client_proxy_user_done (GcClient *client,
-                           gboolean photo_taken,
-                           const gchar *image_data,
-                           GtkImage *image)
-{
-    if (photo_taken)
-    {
-        guchar *buffer;
-        gsize length;
-        GdkPixbufLoader *loader;
-        GError *error = NULL;
-
-        buffer = g_base64_decode (image_data, &length);
-
-        loader = gdk_pixbuf_loader_new_with_type ("png", NULL);
-
-        if (!gdk_pixbuf_loader_write (loader, buffer, length, &error))
-        {
-            g_error ("Error loading image data: %s", error->message);
-        }
-
-        g_free (buffer);
-
-        if (gdk_pixbuf_loader_close (loader, NULL))
-        {
-            gtk_image_set_from_pixbuf (image,
-                                       gdk_pixbuf_loader_get_pixbuf (loader));
-        }
-        else
-        {
-            g_error ("%s", "error deserializing image data");
-        }
-
-        g_object_unref (loader);
-    }
-    else
-    {
-        g_debug ("%s", "User did not accept the image");
-    }
-}
-
-static void
-on_show_chooser_clicked (GtkButton *show_chooser,
-                         GtkImage *image)
-{
-    GError *error = NULL;
-
-    g_signal_connect (client_proxy, "user-done",
-                      G_CALLBACK (on_client_proxy_user_done), image);
-
-    if (!gc_client_call_show_chooser_sync (client_proxy, NULL, &error))
-    {
-        g_error ("error showing chooser: %s", error->message);
-    }
-}
-
-static GtkWidget *
-create_window (void)
-{
-    GtkWidget *window;
-    GtkWidget *grid;
-    GtkWidget *acquire_client;
-    GtkWidget *show_chooser;
-    GtkWidget *image;
-
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    grid = gtk_grid_new ();
-
-    gtk_orientable_set_orientation (GTK_ORIENTABLE (grid),
-                                    GTK_ORIENTATION_VERTICAL);
-
-    acquire_client = gtk_button_new_with_label ("Acquire camera client");
-    gtk_container_add (GTK_CONTAINER (grid), acquire_client);
-
-    show_chooser = gtk_button_new_with_label ("Show chooser dialog");
-    gtk_widget_set_sensitive (show_chooser, FALSE);
-    gtk_container_add (GTK_CONTAINER (grid), show_chooser);
-
-    image = gtk_image_new_from_icon_name ("insert-image",
-                                          GTK_ICON_SIZE_DIALOG);
-    gtk_container_add (GTK_CONTAINER (grid), image);
-
-    g_signal_connect (acquire_client, "clicked",
-                      G_CALLBACK (on_acquire_client_clicked), show_chooser);
-    g_signal_connect (show_chooser, "clicked",
-                      G_CALLBACK (on_show_chooser_clicked), image);
-
-    gtk_container_add (GTK_CONTAINER (window), grid);
-
-    return window;
-}
-
-static void
-setup_manager_proxy (void)
-{
-    GError *error = NULL;
-
-    manager_proxy = gc_manager_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                                       G_DBUS_PROXY_FLAGS_NONE,
-                                                       "org.gnome.Camera",
-                                                       "/org/gnome/Camera/Manager",
-                                                       NULL,
-                                                       NULL);
-
-    if (error)
-    {
-        g_error ("error creating manager proxy: %s", error->message);
-    }
-}
-
-int
-main (int argc,
-      char *argv[])
-{
-    GtkWidget *window;
-
-    gtk_init (&argc, &argv);
-
-    window = create_window ();
-    setup_manager_proxy ();
-
-    gtk_widget_show_all (window);
-
-    gtk_main ();
-
-    return 0;
-}