diff options
| -rw-r--r-- | COPYING | 827 | ||||
| -rw-r--r-- | COPYING.LGPL.3 | 165 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 67 | ||||
| -rw-r--r-- | data/Makefile.am | 17 | ||||
| -rw-r--r-- | data/indicator-application.service.in | 3 | ||||
| -rw-r--r-- | data/ordering-override.keyfile | 5 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 4 | ||||
| -rw-r--r-- | example/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 58 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 1305 | ||||
| -rw-r--r-- | src/application-service-appstore.h | 73 | ||||
| -rw-r--r-- | src/application-service-watcher.c | 302 | ||||
| -rw-r--r-- | src/application-service-watcher.h | 61 | ||||
| -rw-r--r-- | src/application-service.c | 78 | ||||
| -rw-r--r-- | src/application-service.xml | 59 | ||||
| -rw-r--r-- | src/dbus-properties.xml | 23 | ||||
| -rw-r--r-- | src/indicator-application.c | 879 | ||||
| -rw-r--r-- | src/notification-approver.xml | 29 | ||||
| -rw-r--r-- | tests/Makefile.am | 60 | ||||
| -rw-r--r-- | tests/test-approver.c | 179 |
22 files changed, 201 insertions, 4004 deletions
@@ -1,674 +1,165 @@ - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - 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>. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/COPYING.LGPL.3 b/COPYING.LGPL.3 deleted file mode 100644 index fc8a5de..0000000 --- a/COPYING.LGPL.3 +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/Makefile.am b/Makefile.am index 98e4a88..0de0f59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = data \ - src \ +SUBDIRS = \ + src \ bindings \ example \ tests \ @@ -12,7 +12,6 @@ EXTRA_DIST = \ xmldocs.make \ autogen.sh \ COPYING.LGPL.2.1 \ - COPYING.LGPL.3 \ ChangeLog DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall --enable-introspection @@ -1,6 +1,6 @@ #!/bin/sh -PKG_NAME="indicator-application" +PKG_NAME="liappindicator" which gnome-autogen.sh || { echo "You need gnome-common from GNOME SVN" diff --git a/configure.ac b/configure.ac index 9c3f61f..03eeae4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.9, ted@canonical.com) +AC_INIT(libappindicator, 0.2.90, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.9) +AM_INIT_AUTOMAKE(libappindicator, 0.2.90) AM_MAINTAINER_MODE @@ -41,7 +41,6 @@ GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=2.91 INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 -JSON_GLIB_REQUIRED_VERSION=0.7.6 DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], @@ -50,36 +49,26 @@ AC_ARG_WITH([gtk], [], [with_gtk=2]) AS_IF([test "x$with_gtk" = x3], - [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(INDICATOR_CFLAGS) - AC_SUBST(INDICATOR_LIBS) + [PKG_CHECK_MODULES(LIBRARAY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) + AC_SUBST(LIBRARY_CFLAGS) + AC_SUBST(LIBRARY_LIBS) AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], [test "x$with_gtk" = x2], - [PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(INDICATOR_CFLAGS) - AC_SUBST(INDICATOR_LIBS) + [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) + AC_SUBST(LIBRARY_CFLAGS) + AC_SUBST(LIBRARY_LIBS) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) -PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) - -AC_SUBST(LIBRARY_CFLAGS) -AC_SUBST(LIBRARY_LIBS) - ########################### # GObject Introspection ########################### @@ -164,31 +153,6 @@ with_localinstall="no" AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) ########################### -# Indicator Info -########################### - -if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/2/" - INDICATORICONSDIR="${datadir}/libindicate/icons/" -else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` -fi -AC_SUBST(INDICATORDIR) -AC_SUBST(INDICATORICONSDIR) - -########################### -# DBus Service Info -########################### - -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi -AC_SUBST(DBUSSERVICEDIR) - -########################### # Python ########################### @@ -233,7 +197,6 @@ bindings/mono/appindicator-sharp-0.1.pc bindings/mono/examples/Makefile bindings/mono/examples/indicator-example bindings/python/Makefile -data/Makefile tests/Makefile example/Makefile docs/Makefile @@ -248,7 +211,7 @@ docs/reference/libappindicator-docs.sgml AC_MSG_NOTICE([ -Application Indicator Configuration: +Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index c142c4e..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -dbus_servicesdir = $(DBUSSERVICEDIR) -dbus_services_DATA = indicator-application.service - -%.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - -overridedir = $(pkgdatadir) -override_DATA = ordering-override.keyfile - -EXTRA_DIST = \ - indicator-application.service.in \ - ordering-override.keyfile - -CLEANFILES = \ - indicator-application.service - diff --git a/data/indicator-application.service.in b/data/indicator-application.service.in deleted file mode 100644 index 83e430a..0000000 --- a/data/indicator-application.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.ayatana.indicator.application -Exec=@libexecdir@/indicator-application-service diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile deleted file mode 100644 index 71d7c1a..0000000 --- a/data/ordering-override.keyfile +++ /dev/null @@ -1,5 +0,0 @@ -[Ordering Index Overrides] -gnome-power-manager=1 -gst-keyboard-xkb=2 -gsd-keyboard-xkb=3 -ibus=4 diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 63606f9..b6b0289 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -90,8 +90,8 @@ expand_content_files= # signals and properties. # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS) +GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS) +GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(LIBRARY_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make diff --git a/example/Makefile.am b/example/Makefile.am index f4f2ab2..ae468f7 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -10,10 +10,10 @@ simple_client_SOURCES = \ simple-client.c simple_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src simple_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la diff --git a/src/Makefile.am b/src/Makefile.am index e89aa84..073fc41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,60 +22,12 @@ include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal ################################## -# Indicator +# Marshallers ################################## -applicationlibdir = $(INDICATORDIR) -applicationlib_LTLIBRARIES = libapplication.la -libapplication_la_SOURCES = \ - application-service-marshal.c \ - dbus-shared.h \ - indicator-application.c -libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \ - -Wall \ - -Wl,-Bsymbolic-functions \ - -Wl,-z,defs \ - -Wl,--as-needed \ - -Werror \ - -DG_LOG_DOMAIN=\"Indicator-Application\" -libapplication_la_LIBADD = $(INDICATOR_LIBS) -libapplication_la_LDFLAGS = -module -avoid-version - -################################## -# Service -################################## - -libexec_PROGRAMS = indicator-application-service - BUILT_SOURCES += \ - application-service-server.h \ application-service-marshal.h \ - application-service-marshal.c \ - dbus-properties-client.h \ - notification-item-client.h \ - notification-watcher-server.h - -indicator_application_service_SOURCES = \ - application-service.c \ - application-service-appstore.h \ - application-service-appstore.c \ - application-service-marshal.c \ - application-service-watcher.h \ - application-service-watcher.c \ - app-indicator-enum-types.c \ - dbus-shared.h \ - generate-id.h \ - generate-id.c - -indicator_application_service_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -DDATADIR="\"$(pkgdatadir)\"" \ - -Wall -Werror \ - -DG_LOG_DOMAIN=\"indicator-application-service\" - -indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) \ - libappindicator$(VER).la + application-service-marshal.c glib_marshal_list = application-service-marshal.list glib_marshal_prefix = _application_service_marshal @@ -111,6 +63,7 @@ libappindicator_la_SOURCES = \ app-indicator-enum-types.c \ app-indicator.c \ application-service-marshal.c \ + dbus-shared.h \ generate-id.h \ generate-id.c @@ -143,9 +96,6 @@ libappindicator3_la_LIBADD = $(libappindicator_la_LIBADD) ################################## DBUS_SPECS = \ - dbus-properties.xml \ - application-service.xml \ - notification-approver.xml \ notification-item.xml \ notification-watcher.xml @@ -202,7 +152,7 @@ AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la AppIndicator_0_1_gir_INCLUDES = \ GObject-2.0 \ $(GTKGIR) -AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src +AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la AppIndicator_0_1_gir_FILES = $(introspection_sources) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c deleted file mode 100644 index e3befff..0000000 --- a/src/application-service-appstore.c +++ /dev/null @@ -1,1305 +0,0 @@ -/* -An object that stores the registration of all the application -indicators. It also communicates this to the indicator visualization. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <dbus/dbus-glib.h> -#include "app-indicator.h" -#include "app-indicator-enum-types.h" -#include "application-service-appstore.h" -#include "application-service-marshal.h" -#include "dbus-properties-client.h" -#include "dbus-shared.h" -#include "notification-approver-client.h" -#include "generate-id.h" - -/* DBus Prototypes */ -static gboolean _application_service_server_get_applications (ApplicationServiceAppstore * appstore, GPtrArray ** apps, GError ** error); - -#include "application-service-server.h" - -#define NOTIFICATION_ITEM_PROP_ID "Id" -#define NOTIFICATION_ITEM_PROP_CATEGORY "Category" -#define NOTIFICATION_ITEM_PROP_STATUS "Status" -#define NOTIFICATION_ITEM_PROP_ICON_NAME "IconName" -#define NOTIFICATION_ITEM_PROP_AICON_NAME "AttentionIconName" -#define NOTIFICATION_ITEM_PROP_ICON_THEME_PATH "IconThemePath" -#define NOTIFICATION_ITEM_PROP_MENU "Menu" -#define NOTIFICATION_ITEM_PROP_LABEL "XAyatanaLabel" -#define NOTIFICATION_ITEM_PROP_LABEL_GUIDE "XAyatanaLabelGuide" -#define NOTIFICATION_ITEM_PROP_ORDERING_INDEX "XAyatanaOrderingIndex" - -#define NOTIFICATION_ITEM_SIG_NEW_ICON "NewIcon" -#define NOTIFICATION_ITEM_SIG_NEW_AICON "NewAttentionIcon" -#define NOTIFICATION_ITEM_SIG_NEW_STATUS "NewStatus" -#define NOTIFICATION_ITEM_SIG_NEW_LABEL "XAyatanaNewLabel" -#define NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH "NewIconThemePath" - -#define OVERRIDE_GROUP_NAME "Ordering Index Overrides" -#define OVERRIDE_FILE_NAME "ordering-override.keyfile" - -/* Private Stuff */ -struct _ApplicationServiceAppstorePrivate { - DBusGConnection * bus; - GList * applications; - GList * approvers; - GHashTable * ordering_overrides; -}; - -typedef enum { - VISIBLE_STATE_HIDDEN, - VISIBLE_STATE_SHOWN -} visible_state_t; - -#define STATE2STRING(x) ((x) == VISIBLE_STATE_HIDDEN ? "hidden" : "visible") - -typedef struct _Approver Approver; -struct _Approver { - DBusGProxy * proxy; - gboolean destroy_by_proxy; -}; - -typedef struct _Application Application; -struct _Application { - gchar * id; - gchar * category; - gchar * dbus_name; - gchar * dbus_object; - ApplicationServiceAppstore * appstore; /* not ref'd */ - DBusGProxy * dbus_proxy; - DBusGProxy * prop_proxy; - gboolean validated; /* Whether we've gotten all the parameters and they look good. */ - AppIndicatorStatus status; - gchar * icon; - gchar * aicon; - gchar * menu; - gchar * icon_theme_path; - gchar * label; - gchar * guide; - gboolean currently_free; - guint ordering_index; - GList * approved_by; - visible_state_t visible_state; -}; - -#define APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstorePrivate)) - -/* Signals Stuff */ -enum { - APPLICATION_ADDED, - APPLICATION_REMOVED, - APPLICATION_ICON_CHANGED, - APPLICATION_LABEL_CHANGED, - APPLICATION_ICON_THEME_PATH_CHANGED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -/* GObject stuff */ -static void application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass); -static void application_service_appstore_init (ApplicationServiceAppstore *self); -static void application_service_appstore_dispose (GObject *object); -static void application_service_appstore_finalize (GObject *object); -static gint app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata); -static void load_override_file (GHashTable * hash, const gchar * filename); -static AppIndicatorStatus string_to_status(const gchar * status_string); -static void apply_status (Application * app); -static AppIndicatorCategory string_to_cat(const gchar * cat_string); -static void approver_free (gpointer papprover, gpointer user_data); -static void check_with_new_approver (gpointer papp, gpointer papprove); -static void check_with_old_approver (gpointer papprove, gpointer papp); -static Application * find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object); - -G_DEFINE_TYPE (ApplicationServiceAppstore, application_service_appstore, G_TYPE_OBJECT); - -static void -application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (ApplicationServiceAppstorePrivate)); - - object_class->dispose = application_service_appstore_dispose; - object_class->finalize = application_service_appstore_finalize; - - signals[APPLICATION_ADDED] = g_signal_new ("application-added", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_added), - NULL, NULL, - _application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING, - G_TYPE_NONE, 7, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE); - signals[APPLICATION_REMOVED] = g_signal_new ("application-removed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_removed), - NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, 1, G_TYPE_INT, G_TYPE_NONE); - signals[APPLICATION_ICON_CHANGED] = g_signal_new ("application-icon-changed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_changed), - NULL, NULL, - _application_service_marshal_VOID__INT_STRING, - G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE); - signals[APPLICATION_ICON_THEME_PATH_CHANGED] = g_signal_new ("application-icon-theme-path-changed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_icon_theme_path_changed), - NULL, NULL, - _application_service_marshal_VOID__INT_STRING, - G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING, G_TYPE_NONE); - signals[APPLICATION_LABEL_CHANGED] = g_signal_new ("application-label-changed", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceAppstoreClass, application_label_changed), - NULL, NULL, - _application_service_marshal_VOID__INT_STRING_STRING, - G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE); - - dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_STRING, - G_TYPE_NONE, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_object_register_marshaller(_application_service_marshal_VOID__BOOLEAN_STRING_OBJECT, - G_TYPE_NONE, - G_TYPE_BOOLEAN, - G_TYPE_STRING, - G_TYPE_OBJECT, - G_TYPE_INVALID); - - dbus_g_object_type_install_info(APPLICATION_SERVICE_APPSTORE_TYPE, - &dbus_glib__application_service_server_object_info); - - return; -} - -static void -application_service_appstore_init (ApplicationServiceAppstore *self) -{ - - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (self); - - priv->applications = NULL; - priv->approvers = NULL; - - priv->ordering_overrides = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - - load_override_file(priv->ordering_overrides, DATADIR "/" OVERRIDE_FILE_NAME); - gchar * userfile = g_build_filename(g_get_user_data_dir(), "indicators", "application", OVERRIDE_FILE_NAME, NULL); - load_override_file(priv->ordering_overrides, userfile); - g_free(userfile); - - GError * error = NULL; - priv->bus = dbus_g_bus_get(DBUS_BUS_STARTER, &error); - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - g_error_free(error); - return; - } - - dbus_g_connection_register_g_object(priv->bus, - INDICATOR_APPLICATION_DBUS_OBJ, - G_OBJECT(self)); - - self->priv = priv; - - return; -} - -static void -application_service_appstore_dispose (GObject *object) -{ - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE(object)->priv; - - while (priv->applications != NULL) { - application_service_appstore_application_remove(APPLICATION_SERVICE_APPSTORE(object), - ((Application *)priv->applications->data)->dbus_name, - ((Application *)priv->applications->data)->dbus_object); - } - - if (priv->approvers != NULL) { - g_list_foreach(priv->approvers, approver_free, object); - g_list_free(priv->approvers); - priv->approvers = NULL; - } - - G_OBJECT_CLASS (application_service_appstore_parent_class)->dispose (object); - return; -} - -static void -application_service_appstore_finalize (GObject *object) -{ - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE(object)->priv; - - if (priv->ordering_overrides != NULL) { - g_hash_table_destroy(priv->ordering_overrides); - priv->ordering_overrides = NULL; - } - - G_OBJECT_CLASS (application_service_appstore_parent_class)->finalize (object); - return; -} - -/* Loads the file and adds the override entries to the table - of overrides */ -static void -load_override_file (GHashTable * hash, const gchar * filename) -{ - g_return_if_fail(hash != NULL); - g_return_if_fail(filename != NULL); - - if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { - return; - } - - g_debug("Loading overrides from: '%s'", filename); - - GError * error = NULL; - GKeyFile * keyfile = g_key_file_new(); - g_key_file_load_from_file(keyfile, filename, G_KEY_FILE_NONE, &error); - - if (error != NULL) { - g_warning("Unable to load keyfile '%s' because: %s", filename, error->message); - g_error_free(error); - g_key_file_free(keyfile); - return; - } - - gchar ** keys = g_key_file_get_keys(keyfile, OVERRIDE_GROUP_NAME, NULL, &error); - if (error != NULL) { - g_warning("Unable to get keys from keyfile '%s' because: %s", filename, error->message); - g_error_free(error); - g_key_file_free(keyfile); - return; - } - - gchar * key = keys[0]; - gint i; - - for (i = 0; (key = keys[i]) != NULL; i++) { - GError * valerror = NULL; - gint val = g_key_file_get_integer(keyfile, OVERRIDE_GROUP_NAME, key, &valerror); - - if (valerror != NULL) { - g_warning("Unable to get key '%s' out of file '%s' because: %s", key, filename, valerror->message); - g_error_free(valerror); - continue; - } - g_debug("%s: override '%s' with value '%d'", filename, key, val); - - g_hash_table_insert(hash, g_strdup(key), GINT_TO_POINTER(val)); - } - g_strfreev(keys); - g_key_file_free(keyfile); - - return; -} - -/* Return from getting the properties from the item. We're looking at those - and making sure we have everythign that we need. If we do, then we'll - move on up to sending this onto the indicator. */ -static void -get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data) -{ - if (error != NULL) { - g_warning("Unable to get properties: %s", error->message); - /* TODO: We need to free all the application data here */ - return; - } - - Application * app = (Application *)data; - - if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS) == NULL || - g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME) == NULL) { - g_warning("Notification Item on object %s of %s doesn't have enough properties.", app->dbus_object, app->dbus_name); - g_free(app); // Need to do more than this, but it gives the idea of the flow we're going for. - return; - } - - app->validated = TRUE; - - app->id = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID)); - app->category = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY)); - app->status = string_to_status(g_value_get_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS))); - - ApplicationServiceAppstorePrivate * priv = app->appstore->priv; - - app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME)); - - GValue * menuval = (GValue *)g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU); - if (G_VALUE_TYPE(menuval) == G_TYPE_STRING) { - /* This is here to support an older version where we - were using strings instea of object paths. */ - app->menu = g_value_dup_string(menuval); - } else { - app->menu = g_strdup((gchar *)g_value_get_boxed(menuval)); - } - - if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) { - app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME)); - } - - gpointer icon_theme_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_THEME_PATH); - if (icon_theme_path_data != NULL) { - app->icon_theme_path = g_value_dup_string((GValue *)icon_theme_path_data); - } else { - app->icon_theme_path = g_strdup(""); - } - - gpointer ordering_index_over = g_hash_table_lookup(priv->ordering_overrides, app->id); - if (ordering_index_over == NULL) { - gpointer ordering_index_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ORDERING_INDEX); - if (ordering_index_data == NULL || g_value_get_uint(ordering_index_data) == 0) { - app->ordering_index = generate_id(string_to_cat(app->category), app->id); - } else { - app->ordering_index = g_value_get_uint(ordering_index_data); - } - } else { - app->ordering_index = GPOINTER_TO_UINT(ordering_index_over); - } - g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index); - - gpointer label_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_LABEL); - if (label_data != NULL) { - app->label = g_value_dup_string((GValue *)label_data); - } else { - app->label = g_strdup(""); - } - - gpointer guide_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_LABEL_GUIDE); - if (guide_data != NULL) { - app->guide = g_value_dup_string((GValue *)guide_data); - } else { - app->guide = g_strdup(""); - } - - priv->applications = g_list_insert_sorted_with_data (priv->applications, app, app_sort_func, NULL); - g_list_foreach(priv->approvers, check_with_old_approver, app); - - apply_status(app); - - return; -} - -/* Check the application against an approver */ -static void -check_with_old_approver (gpointer papprove, gpointer papp) -{ - /* Funny the parallels, eh? */ - check_with_new_approver(papp, papprove); - return; -} - -/* Simple translation function -- could be optimized */ -static AppIndicatorStatus -string_to_status(const gchar * status_string) -{ - GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_STATUS)); - g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE); - - AppIndicatorStatus retval = APP_INDICATOR_STATUS_PASSIVE; - - GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); - if (val == NULL) { - g_warning("Unrecognized status '%s' assuming passive.", status_string); - } else { - retval = (AppIndicatorStatus)val->value; - } - - g_type_class_unref(klass); - - return retval; -} - -/* Simple translation function -- could be optimized */ -static AppIndicatorCategory -string_to_cat(const gchar * cat_string) -{ - GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_CATEGORY)); - g_return_val_if_fail(klass != NULL, APP_INDICATOR_CATEGORY_OTHER); - - AppIndicatorCategory retval = APP_INDICATOR_CATEGORY_OTHER; - - GEnumValue * val = g_enum_get_value_by_nick(klass, cat_string); - if (val == NULL) { - g_warning("Unrecognized status '%s' assuming other.", cat_string); - } else { - retval = (AppIndicatorCategory)val->value; - } - - g_type_class_unref(klass); - - return retval; -} - - -/* A small helper function to get the position of an application - in the app list of the applications that are visible. */ -static gint -get_position (Application * app) { - ApplicationServiceAppstore * appstore = app->appstore; - ApplicationServiceAppstorePrivate * priv = appstore->priv; - - GList * lapp; - gint count; - - /* Go through the list and try to find ours */ - for (lapp = priv->applications, count = 0; lapp != NULL; lapp = g_list_next(lapp), count++) { - if (lapp->data == app) { - break; - } - - /* If the selected app isn't visible let's not - count it's position */ - Application * thisapp = (Application *)(lapp->data); - if (thisapp->visible_state == VISIBLE_STATE_HIDDEN) { - count--; - } - } - - if (lapp == NULL) { - g_warning("Unable to find position for app '%s'", app->id); - return -1; - } - - return count; -} - -/* A simple global function for dealing with freeing the information - in an Application structure */ -static void -application_free (Application * app) -{ - if (app == NULL) return; - g_debug("Application free '%s'", app->id); - - /* Handle the case where this could be called by unref'ing one of - the proxy objects. */ - if (app->currently_free) return; - app->currently_free = TRUE; - - if (app->dbus_proxy) { - g_object_unref(app->dbus_proxy); - } - if (app->prop_proxy) { - g_object_unref(app->prop_proxy); - } - - if (app->id != NULL) { - g_free(app->id); - } - if (app->category != NULL) { - g_free(app->category); - } - if (app->dbus_name != NULL) { - g_free(app->dbus_name); - } - if (app->dbus_object != NULL) { - g_free(app->dbus_object); - } - if (app->icon != NULL) { - g_free(app->icon); - } - if (app->aicon != NULL) { - g_free(app->aicon); - } - if (app->menu != NULL) { - g_free(app->menu); - } - if (app->icon_theme_path != NULL) { - g_free(app->icon_theme_path); - } - if (app->label != NULL) { - g_free(app->label); - } - if (app->guide != NULL) { - g_free(app->guide); - } - if (app->approved_by != NULL) { - g_list_free(app->approved_by); - } - - g_free(app); - return; -} - -/* Gets called when the proxy is destroyed, which is usually when it - drops off of the bus. */ -static void -application_removed_cb (DBusGProxy * proxy, gpointer userdata) -{ - Application * app = (Application *)userdata; - g_debug("Application proxy destroyed '%s'", app->id); - - /* Remove from the panel */ - app->status = APP_INDICATOR_STATUS_PASSIVE; - apply_status(app); - - /* Remove from the application list */ - app->appstore->priv->applications = g_list_remove(app->appstore->priv->applications, app); - - /* Destroy the data */ - application_free(app); - return; -} - -/* This function takes two Application structure - pointers and uses their ordering index to compare them. */ -static gint -app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata) -{ - Application * appa = (Application *)a; - Application * appb = (Application *)b; - return (appb->ordering_index/2) - (appa->ordering_index/2); -} - -/* Change the status of the application. If we're going passive - it removes it from the panel. If we're coming online, then - it add it to the panel. Otherwise it changes the icon. */ -static void -apply_status (Application * app) -{ - ApplicationServiceAppstore * appstore = app->appstore; - ApplicationServiceAppstorePrivate * priv = appstore->priv; - - /* g_debug("Applying status. Status: %d Approved by: %d Approvers: %d Visible: %d", app->status, g_list_length(app->approved_by), g_list_length(priv->approvers), app->visible_state); */ - - visible_state_t goal_state = VISIBLE_STATE_HIDDEN; - - if (app->status != APP_INDICATOR_STATUS_PASSIVE && - g_list_length(app->approved_by) >= g_list_length(priv->approvers)) { - goal_state = VISIBLE_STATE_SHOWN; - } - - /* Nothing needs to change, we're good */ - if (app->visible_state == goal_state /* ) { */ - && goal_state == VISIBLE_STATE_HIDDEN) { - /* TODO: Uhg, this is a little wrong in that we're going to - send an icon every time the status changes and the indicator - is visible even though it might not be updating. But, at - this point we need a small patch that is harmless. In the - future we need to track which icon is shown and remove the - duplicate message. */ - return; - } - - g_debug("Changing app '%s' state from %s to %s", app->id, STATE2STRING(app->visible_state), STATE2STRING(goal_state)); - - /* This means we're going off line */ - if (goal_state == VISIBLE_STATE_HIDDEN) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(appstore), - signals[APPLICATION_REMOVED], 0, - position, TRUE); - } else { - /* Figure out which icon we should be using */ - gchar * newicon = app->icon; - if (app->status == APP_INDICATOR_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') { - newicon = app->aicon; - } - - /* Determine whether we're already shown or not */ - if (app->visible_state == VISIBLE_STATE_HIDDEN) { - /* Put on panel */ - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ADDED], 0, - newicon, - get_position(app), /* Position */ - app->dbus_name, - app->menu, - app->icon_theme_path, - app->label, - app->guide, - TRUE); - } else { - /* Icon update */ - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(appstore), - signals[APPLICATION_ICON_CHANGED], 0, - position, newicon, TRUE); - } - } - - app->visible_state = goal_state; - - return; -} - -/* Gets the data back on an updated icon signal. Hopefully - a new fun icon. */ -static void -new_icon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata) -{ - /* Check for errors */ - if (error != NULL) { - g_warning("Unable to get updated icon name: %s", error->message); - return; - } - - /* Grab the icon and make sure we have one */ - const gchar * newicon = g_value_get_string(&value); - if (newicon == NULL) { - g_warning("Bad new icon :("); - return; - } - - Application * app = (Application *) userdata; - - if (g_strcmp0(newicon, app->icon)) { - /* If the new icon is actually a new icon */ - if (app->icon != NULL) g_free(app->icon); - app->icon = g_strdup(newicon); - - if (app->visible_state == VISIBLE_STATE_SHOWN && app->status == APP_INDICATOR_STATUS_ACTIVE) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ICON_CHANGED], 0, - position, newicon, TRUE); - } - } - - return; -} - -/* Gets the data back on an updated aicon signal. Hopefully - a new fun icon. */ -static void -new_aicon_cb (DBusGProxy * proxy, GValue value, GError * error, gpointer userdata) -{ - /* Check for errors */ - if (error != NULL) { - g_warning("Unable to get updated icon name: %s", error->message); - return; - } - - /* Grab the icon and make sure we have one */ - const gchar * newicon = g_value_get_string(&value); - if (newicon == NULL) { - g_warning("Bad new icon :("); - return; - } - - Application * app = (Application *) userdata; - - if (g_strcmp0(newicon, app->aicon)) { - /* If the new icon is actually a new icon */ - if (app->aicon != NULL) g_free(app->aicon); - app->aicon = g_strdup(newicon); - - if (app->visible_state == VISIBLE_STATE_SHOWN && app->status == APP_INDICATOR_STATUS_ATTENTION) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ICON_CHANGED], 0, - position, newicon, TRUE); - } - } - - return; -} - -/* Called when the Notification Item signals that it - has a new icon. */ -static void -new_icon (DBusGProxy * proxy, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - org_freedesktop_DBus_Properties_get_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - NOTIFICATION_ITEM_PROP_ICON_NAME, - new_icon_cb, - app); - return; -} - -/* Called when the Notification Item signals that it - has a new attention icon. */ -static void -new_aicon (DBusGProxy * proxy, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - org_freedesktop_DBus_Properties_get_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - NOTIFICATION_ITEM_PROP_AICON_NAME, - new_aicon_cb, - app); - - return; -} - -/* Called when the Notification Item signals that it - has a new status. */ -static void -new_status (DBusGProxy * proxy, const gchar * status, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - app->status = string_to_status(status); - apply_status(app); - - return; -} - -/* Called when the Notification Item signals that it - has a new icon theme path. */ -static void -new_icon_theme_path (DBusGProxy * proxy, const gchar * icon_theme_path, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - if (g_strcmp0(icon_theme_path, app->icon_theme_path)) { - /* If the new icon theme path is actually a new icon theme path */ - if (app->icon_theme_path != NULL) g_free(app->icon_theme_path); - app->icon_theme_path = g_strdup(icon_theme_path); - - if (app->visible_state != VISIBLE_STATE_HIDDEN) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(G_OBJECT(app->appstore), - signals[APPLICATION_ICON_THEME_PATH_CHANGED], 0, - position, app->icon_theme_path, TRUE); - } - } - - return; -} - -/* Called when the Notification Item signals that it - has a new label. */ -static void -new_label (DBusGProxy * proxy, const gchar * label, const gchar * guide, gpointer data) -{ - Application * app = (Application *)data; - if (!app->validated) return; - - gboolean changed = FALSE; - - if (g_strcmp0(app->label, label) != 0) { - changed = TRUE; - if (app->label != NULL) { - g_free(app->label); - app->label = NULL; - } - app->label = g_strdup(label); - } - - if (g_strcmp0(app->guide, guide) != 0) { - changed = TRUE; - if (app->guide != NULL) { - g_free(app->guide); - app->guide = NULL; - } - app->guide = g_strdup(guide); - } - - if (changed) { - gint position = get_position(app); - if (position == -1) return; - - g_signal_emit(app->appstore, signals[APPLICATION_LABEL_CHANGED], 0, - position, - app->label != NULL ? app->label : "", - app->guide != NULL ? app->guide : "", - TRUE); - } - - return; -} - -/* Adding a new NotificationItem object from DBus in to the - appstore. First, we need to get the information on it - though. */ -void -application_service_appstore_application_add (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object) -{ - g_debug("Adding new application: %s:%s", dbus_name, dbus_object); - - /* Make sure we got a sensible request */ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore)); - g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0'); - g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0'); - ApplicationServiceAppstorePrivate * priv = appstore->priv; - Application * app = find_application(appstore, dbus_name, dbus_object); - - if (app != NULL) { - g_warning("Application already exists! Rerequesting properties."); - org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - get_all_properties_cb, - app); - return; - } - - /* Build the application entry. This will be carried - along until we're sure we've got everything. */ - app = g_new0(Application, 1); - - app->validated = FALSE; - app->dbus_name = g_strdup(dbus_name); - app->dbus_object = g_strdup(dbus_object); - app->appstore = appstore; - app->status = APP_INDICATOR_STATUS_PASSIVE; - app->icon = NULL; - app->aicon = NULL; - app->menu = NULL; - app->icon_theme_path = NULL; - app->label = NULL; - app->guide = NULL; - app->currently_free = FALSE; - app->ordering_index = 0; - app->approved_by = NULL; - app->visible_state = VISIBLE_STATE_HIDDEN; - - /* Get the DBus proxy for the NotificationItem interface */ - GError * error = NULL; - app->dbus_proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - app->dbus_name, - app->dbus_object, - NOTIFICATION_ITEM_DBUS_IFACE, - &error); - - if (error != NULL) { - g_warning("Unable to get notification item proxy for object '%s' on host '%s': %s", dbus_object, dbus_name, error->message); - g_error_free(error); - g_free(app); - return; - } - - /* We've got it, let's watch it for destruction */ - g_signal_connect(G_OBJECT(app->dbus_proxy), "destroy", G_CALLBACK(application_removed_cb), app); - - /* Grab the property proxy interface */ - app->prop_proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - app->dbus_name, - app->dbus_object, - DBUS_INTERFACE_PROPERTIES, - &error); - - if (error != NULL) { - g_warning("Unable to get property proxy for object '%s' on host '%s': %s", dbus_object, dbus_name, error->message); - g_error_free(error); - g_object_unref(app->dbus_proxy); - g_free(app); - return; - } - - /* Connect to signals */ - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_AICON, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_STATUS, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_LABEL, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON, - G_CALLBACK(new_icon), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_AICON, - G_CALLBACK(new_aicon), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_STATUS, - G_CALLBACK(new_status), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_ICON_THEME_PATH, - G_CALLBACK(new_icon_theme_path), - app, - NULL); - dbus_g_proxy_connect_signal(app->dbus_proxy, - NOTIFICATION_ITEM_SIG_NEW_LABEL, - G_CALLBACK(new_label), - app, - NULL); - - /* Get all the propertiees */ - org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy, - NOTIFICATION_ITEM_DBUS_IFACE, - get_all_properties_cb, - app); - - /* We're returning, nothing is yet added until the properties - come back and give us more info. */ - return; -} - -/* Looks for an application in the list of applications */ -static Application * -find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object) -{ - ApplicationServiceAppstorePrivate * priv = appstore->priv; - GList * listpntr; - - for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) { - Application * app = (Application *)listpntr->data; - - if (!g_strcmp0(app->dbus_name, address) && !g_strcmp0(app->dbus_object, object)) { - return app; - } - } - - return NULL; -} - -/* Removes an application. Currently only works for the apps - that are shown. */ -void -application_service_appstore_application_remove (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object) -{ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore)); - g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0'); - g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0'); - - Application * app = find_application(appstore, dbus_name, dbus_object); - if (app != NULL) { - application_removed_cb(NULL, app); - } else { - g_warning("Unable to find application %s:%s", dbus_name, dbus_object); - } - - return; -} - -gchar** -application_service_appstore_application_get_list (ApplicationServiceAppstore * appstore) -{ - ApplicationServiceAppstorePrivate * priv = appstore->priv; - gchar ** out; - gchar ** outpntr; - GList * listpntr; - - out = g_new(gchar*, g_list_length(priv->applications) + 1); - - for (listpntr = priv->applications, outpntr = out; listpntr != NULL; listpntr = g_list_next(listpntr), ++outpntr) { - Application * app = (Application *)listpntr->data; - *outpntr = g_strdup_printf("%s%s", app->dbus_name, app->dbus_object); - } - *outpntr = 0; - return out; -} - -/* Creates a basic appstore object and attaches the - LRU file object to it. */ -ApplicationServiceAppstore * -application_service_appstore_new (void) -{ - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL)); - return appstore; -} - -/* DBus Interface */ -static gboolean -_application_service_server_get_applications (ApplicationServiceAppstore * appstore, GPtrArray ** apps, GError ** error) -{ - ApplicationServiceAppstorePrivate * priv = appstore->priv; - - *apps = g_ptr_array_new(); - GList * listpntr; - gint position = 0; - - for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) { - Application * app = (Application *)listpntr->data; - if (app->visible_state == VISIBLE_STATE_HIDDEN) { - continue; - } - - GValueArray * values = g_value_array_new(5); - - GValue value = {0}; - - /* Icon name */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->icon); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Position */ - g_value_init(&value, G_TYPE_INT); - g_value_set_int(&value, position++); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* DBus Address */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->dbus_name); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* DBus Object */ - g_value_init(&value, DBUS_TYPE_G_OBJECT_PATH); - g_value_set_static_boxed(&value, app->menu); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Icon path */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->icon_theme_path); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Label */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->label); - g_value_array_append(values, &value); - g_value_unset(&value); - - /* Guide */ - g_value_init(&value, G_TYPE_STRING); - g_value_set_string(&value, app->guide); - g_value_array_append(values, &value); - g_value_unset(&value); - - g_ptr_array_add(*apps, values); - } - - return TRUE; -} - -/* Removes and approver from our list of approvers and - then sees if that changes our status. Most likely this - could make us visible if this approver rejected us. */ -static void -remove_approver (gpointer papp, gpointer pproxy) -{ - Application * app = (Application *)papp; - app->approved_by = g_list_remove(app->approved_by, pproxy); - apply_status(app); - return; -} - -/* Frees the data associated with an approver */ -static void -approver_free (gpointer papprover, gpointer user_data) -{ - Approver * approver = (Approver *)papprover; - g_return_if_fail(approver != NULL); - - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(user_data); - g_list_foreach(appstore->priv->applications, remove_approver, approver->proxy); - - if (approver->proxy != NULL) { - if (!approver->destroy_by_proxy) { - g_object_unref(approver->proxy); - } - approver->proxy = NULL; - } - - g_free(approver); - return; -} - -/* What did the approver tell us? */ -static void -approver_request_cb (DBusGProxy *proxy, gboolean OUT_approved, GError *error, gpointer userdata) -{ - if (error == NULL) { - g_debug("Approver responded: %s", OUT_approved ? "approve" : "rejected"); - } else { - g_debug("Approver responded error: %s", error->message); - } - - Application * app = (Application *)userdata; - - if (OUT_approved || error != NULL) { - app->approved_by = g_list_prepend(app->approved_by, proxy); - } else { - app->approved_by = g_list_remove(app->approved_by, proxy); - } - - apply_status(app); - return; -} - -/* Run the applications through the new approver */ -static void -check_with_new_approver (gpointer papp, gpointer papprove) -{ - Application * app = (Application *)papp; - Approver * approver = (Approver *)papprove; - - org_ayatana_StatusNotifierApprover_approve_item_async(approver->proxy, - app->id, - app->category, - 0, - app->dbus_name, - app->dbus_object, - approver_request_cb, - app); - - return; -} - -/* Look through all the approvers and find the one with a given - proxy. */ -static gint -approver_find_by_proxy (gconstpointer papprover, gconstpointer pproxy) -{ - Approver * approver = (Approver *)papprover; - - if (approver->proxy == pproxy) { - return 0; - } - - return -1; -} - -/* Tracks when a proxy gets destroyed so that we know that the - approver has dropped off the bus. */ -static void -approver_destroyed (gpointer pproxy, gpointer pappstore) -{ - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(pappstore); - - GList * lapprover = g_list_find_custom(appstore->priv->approvers, pproxy, approver_find_by_proxy); - if (lapprover == NULL) { - g_warning("Approver proxy died, but we don't seem to have that approver."); - return; - } - - Approver * approver = (Approver *)lapprover->data; - approver->destroy_by_proxy = TRUE; - - appstore->priv->approvers = g_list_remove(appstore->priv->approvers, approver); - approver_free(approver, appstore); - - return; -} - -/* A signal when an approver changes the why that it thinks about - a particular indicator. */ -void -approver_revise_judgement (DBusGProxy * proxy, gboolean new_status, gchar * address, DBusGProxy * get_path, gpointer user_data) -{ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(user_data)); - g_return_if_fail(address != NULL && address[0] != '\0'); - g_return_if_fail(get_path != NULL); - const gchar * path = dbus_g_proxy_get_path(get_path); - g_return_if_fail(path != NULL && path[0] != '\0'); - - ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(user_data); - - Application * app = find_application(appstore, address, path); - - if (app == NULL) { - g_warning("Unable to update approver status of application (%s:%s) as it was not found", address, path); - return; - } - - if (new_status) { - app->approved_by = g_list_prepend(app->approved_by, proxy); - } else { - app->approved_by = g_list_remove(app->approved_by, proxy); - } - apply_status(app); - - return; -} - -/* Adds a new approver to the app store */ -void -application_service_appstore_approver_add (ApplicationServiceAppstore * appstore, const gchar * dbus_name, const gchar * dbus_object) -{ - g_return_if_fail(IS_APPLICATION_SERVICE_APPSTORE(appstore)); - g_return_if_fail(dbus_name != NULL); - g_return_if_fail(dbus_object != NULL); - ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (appstore); - - Approver * approver = g_new0(Approver, 1); - approver->destroy_by_proxy = FALSE; - - GError * error = NULL; - approver->proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - dbus_name, - dbus_object, - NOTIFICATION_APPROVER_DBUS_IFACE, - &error); - if (error != NULL) { - g_warning("Unable to get approver interface on '%s:%s' : %s", dbus_name, dbus_object, error->message); - g_error_free(error); - g_free(approver); - return; - } - - g_signal_connect(G_OBJECT(approver->proxy), "destroy", G_CALLBACK(approver_destroyed), appstore); - - dbus_g_proxy_add_signal(approver->proxy, - "ReviseJudgement", - G_TYPE_BOOLEAN, - G_TYPE_STRING, - DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal(approver->proxy, - "ReviseJudgement", - G_CALLBACK(approver_revise_judgement), - appstore, - NULL); - - priv->approvers = g_list_prepend(priv->approvers, approver); - - g_list_foreach(priv->applications, check_with_new_approver, approver); - - return; -} - diff --git a/src/application-service-appstore.h b/src/application-service-appstore.h deleted file mode 100644 index aa2824b..0000000 --- a/src/application-service-appstore.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -An object that stores the registration of all the application -indicators. It also communicates this to the indicator visualization. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef __APPLICATION_SERVICE_APPSTORE_H__ -#define __APPLICATION_SERVICE_APPSTORE_H__ - -#include <glib.h> -#include <glib-object.h> - -G_BEGIN_DECLS - -#define APPLICATION_SERVICE_APPSTORE_TYPE (application_service_appstore_get_type ()) -#define APPLICATION_SERVICE_APPSTORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstore)) -#define APPLICATION_SERVICE_APPSTORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstoreClass)) -#define IS_APPLICATION_SERVICE_APPSTORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLICATION_SERVICE_APPSTORE_TYPE)) -#define IS_APPLICATION_SERVICE_APPSTORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLICATION_SERVICE_APPSTORE_TYPE)) -#define APPLICATION_SERVICE_APPSTORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLICATION_SERVICE_APPSTORE_TYPE, ApplicationServiceAppstoreClass)) - -typedef struct _ApplicationServiceAppstore ApplicationServiceAppstore; -typedef struct _ApplicationServiceAppstoreClass ApplicationServiceAppstoreClass; -typedef struct _ApplicationServiceAppstorePrivate ApplicationServiceAppstorePrivate; - -struct _ApplicationServiceAppstoreClass { - GObjectClass parent_class; - - void (*application_added) (ApplicationServiceAppstore * appstore, gchar *, gint, gchar *, gchar *, gpointer); - void (*application_removed) (ApplicationServiceAppstore * appstore, gint, gpointer); - void (*application_icon_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer); - void (*application_icon_theme_path_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, gpointer); - void (*application_label_changed)(ApplicationServiceAppstore * appstore, gint, const gchar *, const gchar *, gpointer); -}; - -struct _ApplicationServiceAppstore { - GObject parent; - - ApplicationServiceAppstorePrivate * priv; -}; - -ApplicationServiceAppstore * application_service_appstore_new (void); -GType application_service_appstore_get_type (void); -void application_service_appstore_application_add (ApplicationServiceAppstore * appstore, - const gchar * dbus_name, - const gchar * dbus_object); -void application_service_appstore_application_remove (ApplicationServiceAppstore * appstore, - const gchar * dbus_name, - const gchar * dbus_object); -void application_service_appstore_approver_add (ApplicationServiceAppstore * appstore, - const gchar * dbus_name, - const gchar * dbus_object); -gchar** application_service_appstore_application_get_list (ApplicationServiceAppstore * appstore); - -G_END_DECLS - -#endif diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c deleted file mode 100644 index 50b0be9..0000000 --- a/src/application-service-watcher.c +++ /dev/null @@ -1,302 +0,0 @@ -/* -An object implementing the NotificationWatcher interface and passes -the information into the app-store. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-lowlevel.h> -#include <dbus/dbus-glib-bindings.h> -#include "application-service-watcher.h" -#include "dbus-shared.h" - -/* Enum for the properties so that they can be quickly - found and looked up. */ -enum { - PROP_0, - PROP_PROTOCOL_VERSION, - PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED, - PROP_REGISTERED_STATUS_NOTIFIER_ITEMS -}; - -/* The strings so that they can be slowly looked up. */ -#define PROP_PROTOCOL_VERSION_S "protocol-version" -#define PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED_S "is-status-notifier-host-registered" -#define PROP_REGISTERED_STATUS_NOTIFIER_ITEMS_S "registered-status-notifier-items" - -#define CURRENT_PROTOCOL_VERSION 0 - -static gboolean _notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method); -static gboolean _notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host); -static gboolean _notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method); -static void get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data); - -#include "notification-watcher-server.h" - -/* Private Stuff */ -typedef struct _ApplicationServiceWatcherPrivate ApplicationServiceWatcherPrivate; -struct _ApplicationServiceWatcherPrivate { - ApplicationServiceAppstore * appstore; - DBusGProxy * dbus_proxy; -}; - -#define APPLICATION_SERVICE_WATCHER_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherPrivate)) - -/* Signals Stuff */ -enum { - STATUS_NOTIFIER_ITEM_REGISTERED, - STATUS_NOTIFIER_ITEM_UNREGISTERED, - STATUS_NOTIFIER_HOST_REGISTERED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -/* GObject stuff */ -static void application_service_watcher_class_init (ApplicationServiceWatcherClass *klass); -static void application_service_watcher_init (ApplicationServiceWatcher *self); -static void application_service_watcher_dispose (GObject *object); -static void application_service_watcher_finalize (GObject *object); -static void application_service_watcher_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void application_service_watcher_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); - -G_DEFINE_TYPE (ApplicationServiceWatcher, application_service_watcher, G_TYPE_OBJECT); - -static void -application_service_watcher_class_init (ApplicationServiceWatcherClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (ApplicationServiceWatcherPrivate)); - - object_class->dispose = application_service_watcher_dispose; - object_class->finalize = application_service_watcher_finalize; - - /* Property funcs */ - object_class->set_property = application_service_watcher_set_property; - object_class->get_property = application_service_watcher_get_property; - - /* Properties */ - g_object_class_install_property (object_class, - PROP_PROTOCOL_VERSION, - g_param_spec_int(PROP_PROTOCOL_VERSION_S, - "Protocol Version", - "Which version of the StatusNotifierProtocol this watcher implements", - 0, G_MAXINT, - CURRENT_PROTOCOL_VERSION, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (object_class, - PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED, - g_param_spec_boolean(PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED_S, - "Is StatusNotifierHost Registered", - "True if there is at least one StatusNotifierHost registered", - FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (object_class, - PROP_REGISTERED_STATUS_NOTIFIER_ITEMS, - g_param_spec_boxed(PROP_REGISTERED_STATUS_NOTIFIER_ITEMS_S, - "Registered StatusNotifierItems", - "The list of StatusNotifierItems registered to this watcher", - G_TYPE_STRV, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /* Signals */ - signals[STATUS_NOTIFIER_ITEM_REGISTERED] = g_signal_new ("status-notifier-item-registered", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_registered), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE); - signals[STATUS_NOTIFIER_ITEM_UNREGISTERED] = g_signal_new ("status-notifier-item-unregistered", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_unregistered), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE); - signals[STATUS_NOTIFIER_HOST_REGISTERED] = g_signal_new ("status-notifier-host-registered", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_host_registered), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0, G_TYPE_NONE); - - dbus_g_object_type_install_info(APPLICATION_SERVICE_WATCHER_TYPE, - &dbus_glib__notification_watcher_server_object_info); - - return; -} - -static void -application_service_watcher_init (ApplicationServiceWatcher *self) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(self); - - priv->appstore = NULL; - - GError * error = NULL; - DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - g_error_free(error); - return; - } - - dbus_g_connection_register_g_object(session_bus, - NOTIFICATION_WATCHER_DBUS_OBJ, - G_OBJECT(self)); - - priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(session_bus, - DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS, - &error); - if (error != NULL) { - g_error("Ah, can't get proxy to dbus: %s", error->message); - g_error_free(error); - return; - } - - org_freedesktop_DBus_request_name_async(priv->dbus_proxy, - NOTIFICATION_WATCHER_DBUS_ADDR, - DBUS_NAME_FLAG_DO_NOT_QUEUE, - get_name_cb, - self); - - return; -} - -static void -application_service_watcher_dispose (GObject *object) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(object); - - if (priv->appstore != NULL) { - g_object_unref(G_OBJECT(priv->appstore)); - priv->appstore = NULL; - } - - G_OBJECT_CLASS (application_service_watcher_parent_class)->dispose (object); - return; -} - -static void -application_service_watcher_finalize (GObject *object) -{ - - G_OBJECT_CLASS (application_service_watcher_parent_class)->finalize (object); - return; -} - -static void -application_service_watcher_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) -{ - /* There are no writable properties for now */ -} - -static void -application_service_watcher_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(object); - switch (prop_id) { - case PROP_PROTOCOL_VERSION: - g_value_set_int (value, CURRENT_PROTOCOL_VERSION); - break; - case PROP_IS_STATUS_NOTIFIER_HOST_REGISTERED: - g_value_set_boolean (value, TRUE); - break; - case PROP_REGISTERED_STATUS_NOTIFIER_ITEMS: - g_value_set_boxed (value, application_service_appstore_application_get_list(priv->appstore)); - break; - } -} - -ApplicationServiceWatcher * -application_service_watcher_new (ApplicationServiceAppstore * appstore) -{ - GObject * obj = g_object_new(APPLICATION_SERVICE_WATCHER_TYPE, NULL); - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(obj); - priv->appstore = appstore; - g_object_ref(G_OBJECT(priv->appstore)); - return APPLICATION_SERVICE_WATCHER(obj); -} - -static gboolean -_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); - - if (service[0] == '/') { - application_service_appstore_application_add(priv->appstore, - dbus_g_method_get_sender(method), - service); - } else { - application_service_appstore_application_add(priv->appstore, - service, - NOTIFICATION_ITEM_DEFAULT_OBJ); - } - - dbus_g_method_return(method, G_TYPE_NONE); - return TRUE; -} - -static gboolean -_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host) -{ - - return FALSE; -} - -/* Function to handle the return of the get name. There isn't a whole - lot that can be done, but we're atleast going to tell people. */ -static void -get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data) -{ - if (error != NULL) { - g_warning("Unable to get watcher name '%s' because: %s", NOTIFICATION_WATCHER_DBUS_ADDR, error->message); - return; - } - - if (status != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER && - status != DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER) { - g_warning("Unable to get watcher name '%s'", NOTIFICATION_WATCHER_DBUS_ADDR); - return; - } - - return; -} - -static gboolean -_notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method) -{ - ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); - - application_service_appstore_approver_add(priv->appstore, - dbus_g_method_get_sender(method), - path); - - dbus_g_method_return(method, G_TYPE_NONE); - return TRUE; -} diff --git a/src/application-service-watcher.h b/src/application-service-watcher.h deleted file mode 100644 index 6c430db..0000000 --- a/src/application-service-watcher.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -An object implementing the NotificationWatcher interface and passes -the information into the app-store. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef __APPLICATION_SERVICE_WATCHER_H__ -#define __APPLICATION_SERVICE_WATCHER_H__ - -#include <glib.h> -#include <glib-object.h> - -#include "application-service-appstore.h" - -G_BEGIN_DECLS - -#define APPLICATION_SERVICE_WATCHER_TYPE (application_service_watcher_get_type ()) -#define APPLICATION_SERVICE_WATCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcher)) -#define APPLICATION_SERVICE_WATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherClass)) -#define IS_APPLICATION_SERVICE_WATCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLICATION_SERVICE_WATCHER_TYPE)) -#define IS_APPLICATION_SERVICE_WATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLICATION_SERVICE_WATCHER_TYPE)) -#define APPLICATION_SERVICE_WATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLICATION_SERVICE_WATCHER_TYPE, ApplicationServiceWatcherClass)) - -typedef struct _ApplicationServiceWatcher ApplicationServiceWatcher; -typedef struct _ApplicationServiceWatcherClass ApplicationServiceWatcherClass; - -struct _ApplicationServiceWatcherClass { - GObjectClass parent_class; - - /* Signals */ - void (*status_notifier_item_registered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data); - void (*status_notifier_item_unregistered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data); - void (*status_notifier_host_registered) (ApplicationServiceWatcher * watcher, gpointer data); -}; - -struct _ApplicationServiceWatcher { - GObject parent; -}; - -GType application_service_watcher_get_type (void); -ApplicationServiceWatcher * application_service_watcher_new (ApplicationServiceAppstore * appstore); - -G_END_DECLS - -#endif diff --git a/src/application-service.c b/src/application-service.c deleted file mode 100644 index 94e7d2e..0000000 --- a/src/application-service.c +++ /dev/null @@ -1,78 +0,0 @@ -/* -The core file for the service that starts up all the objects we need -and houses our main loop. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - - -#include "libindicator/indicator-service.h" -#include "notification-item-client.h" -#include "application-service-appstore.h" -#include "application-service-watcher.h" -#include "dbus-shared.h" - -/* The base main loop */ -static GMainLoop * mainloop = NULL; -/* Where the application registry lives */ -static ApplicationServiceAppstore * appstore = NULL; -/* Interface for applications */ -static ApplicationServiceWatcher * watcher = NULL; -/* The service management interface */ -static IndicatorService * service = NULL; - -/* Recieves the disonnection signal from the service - object and closes the mainloop. */ -static void -service_disconnected (IndicatorService * service, gpointer data) -{ - g_debug("Service disconnected"); - if (mainloop != NULL) { - g_main_loop_quit(mainloop); - } - return; -} - -/* Builds up the core objects and puts us spinning into - a main loop. */ -int -main (int argc, char ** argv) -{ - g_type_init(); - - /* Bring us up as a basic indicator service */ - service = indicator_service_new(INDICATOR_APPLICATION_DBUS_ADDR); - g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL); - - /* Building our app store */ - appstore = application_service_appstore_new(); - - /* Adding a watcher for the Apps coming up */ - watcher = application_service_watcher_new(appstore); - - /* Building and executing our main loop */ - mainloop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(mainloop); - - /* Unref'ing all the objects */ - g_object_unref(G_OBJECT(watcher)); - g_object_unref(G_OBJECT(appstore)); - g_object_unref(G_OBJECT(service)); - - return 0; -} diff --git a/src/application-service.xml b/src/application-service.xml deleted file mode 100644 index 031bf68..0000000 --- a/src/application-service.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -An interface for communication between the service and indicator. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. ---> -<node name="/"> - <interface name="org.ayatana.indicator.application.service"> -<!-- Properties --> - <!-- None currently --> - -<!-- Methods --> - <method name="GetApplications"> - <arg type="a(sisosss)" name="applications" direction="out" /> - </method> - -<!-- Signals --> - <signal name="ApplicationAdded"> - <arg type="s" name="iconname" direction="out" /> - <arg type="i" name="position" direction="out" /> - <arg type="s" name="dbusaddress" direction="out" /> - <arg type="o" name="dbusobject" direction="out" /> - <arg type="s" name="iconpath" direction="out" /> - <arg type="s" name="label" direction="out" /> - <arg type="s" name="labelguide" direction="out" /> - </signal> - <signal name="ApplicationRemoved"> - <arg type="i" name="position" direction="out" /> - </signal> - <signal name="ApplicationIconChanged"> - <arg type="i" name="position" direction="out" /> - <arg type="s" name="icon_name" direction="out" /> - </signal> - <signal name="ApplicationIconThemePathChanged"> - <arg type="i" name="position" direction="out" /> - <arg type="s" name="icon_theme_path" direction="out" /> - </signal> - <signal name="ApplicationLabelChanged"> - <arg type="i" name="position" direction="out" /> - <arg type="s" name="label" direction="out" /> - <arg type="s" name="guide" direction="out" /> - </signal> - </interface> -</node> diff --git a/src/dbus-properties.xml b/src/dbus-properties.xml deleted file mode 100644 index c172895..0000000 --- a/src/dbus-properties.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<node name="/"> - <interface name="org.freedesktop.DBus.Properties"> - - <method name="Get"> - <arg direction="in" type="s" name="Interface_Name"/> - <arg direction="in" type="s" name="Property_Name"/> - <arg direction="out" type="v" name="Value"/> - </method> - - <method name="Set"> - <arg direction="in" type="s" name="Interface_Name"/> - <arg direction="in" type="s" name="Property_Name"/> - <arg direction="in" type="v" name="Value"/> - </method> - - <method name="GetAll"> - <arg direction="in" type="s" name="Interface_Name"/> - <arg direction="out" type="a{sv}" name="Properties"/> - </method> - - </interface> -</node> diff --git a/src/indicator-application.c b/src/indicator-application.c deleted file mode 100644 index ecf19e8..0000000 --- a/src/indicator-application.c +++ /dev/null @@ -1,879 +0,0 @@ -/* -The indicator application visualization object. It takes the information -given by the service and turns it into real-world pixels that users can -actually use. Well, GTK does that, but this asks nicely. - -Copyright 2009 Canonical Ltd. - -Authors: - Ted Gould <ted@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -/* G Stuff */ -#include <glib.h> -#include <glib-object.h> -#include <gtk/gtk.h> - -/* DBus Stuff */ -#include <dbus/dbus-glib.h> -#ifdef HAVE_GTK3 -#include <libdbusmenu-gtk3/menu.h> -#else -#include <libdbusmenu-gtk/menu.h> -#endif - -/* Indicator Stuff */ -#include <libindicator/indicator.h> -#include <libindicator/indicator-object.h> -#include <libindicator/indicator-service-manager.h> -#include <libindicator/indicator-image-helper.h> - -/* Local Stuff */ -#include "dbus-shared.h" -#include "application-service-client.h" -#include "application-service-marshal.h" - -#define PANEL_ICON_SUFFIX "panel" - -#define INDICATOR_APPLICATION_TYPE (indicator_application_get_type ()) -#define INDICATOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplication)) -#define INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass)) -#define IS_INDICATOR_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_APPLICATION_TYPE)) -#define IS_INDICATOR_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_APPLICATION_TYPE)) -#define INDICATOR_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_APPLICATION_TYPE, IndicatorApplicationClass)) - -typedef struct _IndicatorApplication IndicatorApplication; -typedef struct _IndicatorApplicationClass IndicatorApplicationClass; - -struct _IndicatorApplicationClass { - IndicatorObjectClass parent_class; -}; - -struct _IndicatorApplication { - IndicatorObject parent; -}; - -GType indicator_application_get_type (void); - -INDICATOR_SET_VERSION -INDICATOR_SET_TYPE(INDICATOR_APPLICATION_TYPE) - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -typedef struct _IndicatorApplicationPrivate IndicatorApplicationPrivate; -struct _IndicatorApplicationPrivate { - IndicatorServiceManager * sm; - DBusGConnection * bus; - DBusGProxy * service_proxy; - GList * applications; - GHashTable * theme_dirs; - guint disconnect_kill; -}; - -typedef struct _ApplicationEntry ApplicationEntry; -struct _ApplicationEntry { - IndicatorObjectEntry entry; - gchar * icon_theme_path; - gboolean old_service; - gchar * dbusobject; - gchar * dbusaddress; - gchar * guide; - gchar * longname; -}; - -#define INDICATOR_APPLICATION_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_APPLICATION_TYPE, IndicatorApplicationPrivate)) - -static void indicator_application_class_init (IndicatorApplicationClass *klass); -static void indicator_application_init (IndicatorApplication *self); -static void indicator_application_dispose (GObject *object); -static void indicator_application_finalize (GObject *object); -static GList * get_entries (IndicatorObject * io); -static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry); -void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application); -static void connected (IndicatorApplication * application); -static void disconnected (IndicatorApplication * application); -static void disconnected_helper (gpointer data, gpointer user_data); -static gboolean disconnected_kill (gpointer user_data); -static void disconnected_kill_helper (gpointer data, gpointer user_data); -static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application); -static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application); -static void application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application); -static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application); -static void application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application); -static void get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata); -static void get_applications_helper (gpointer data, gpointer user_data); -static void theme_dir_unref(IndicatorApplication * ia, const gchar * dir); -static void theme_dir_ref(IndicatorApplication * ia, const gchar * dir); - -G_DEFINE_TYPE (IndicatorApplication, indicator_application, INDICATOR_OBJECT_TYPE); - -static void -indicator_application_class_init (IndicatorApplicationClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (IndicatorApplicationPrivate)); - - object_class->dispose = indicator_application_dispose; - object_class->finalize = indicator_application_finalize; - - IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); - - io_class->get_entries = get_entries; - io_class->get_location = get_location; - - dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING, - G_TYPE_NONE, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING, - G_TYPE_NONE, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_object_register_marshaller(_application_service_marshal_VOID__INT_STRING_STRING, - G_TYPE_NONE, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - - return; -} - -static void -indicator_application_init (IndicatorApplication *self) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(self); - - /* These are built in the connection phase */ - priv->bus = NULL; - priv->service_proxy = NULL; - priv->theme_dirs = NULL; - priv->disconnect_kill = 0; - - priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR); - g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self); - - priv->applications = NULL; - - priv->theme_dirs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); - - return; -} - -static void -indicator_application_dispose (GObject *object) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(object); - - if (priv->disconnect_kill != 0) { - g_source_remove(priv->disconnect_kill); - } - - while (priv->applications != NULL) { - application_removed(priv->service_proxy, - 0, - INDICATOR_APPLICATION(object)); - } - - if (priv->sm != NULL) { - g_object_unref(priv->sm); - priv->sm = NULL; - } - - if (priv->bus != NULL) { - /* We're not incrementing the ref count on this one. */ - priv->bus = NULL; - } - - if (priv->service_proxy != NULL) { - g_object_unref(G_OBJECT(priv->service_proxy)); - priv->service_proxy = NULL; - } - - if (priv->theme_dirs != NULL) { - while (g_hash_table_size(priv->theme_dirs)) { - GList * keys = g_hash_table_get_keys(priv->theme_dirs); - theme_dir_unref(INDICATOR_APPLICATION(object), (gchar *)keys->data); - } - g_hash_table_destroy(priv->theme_dirs); - priv->theme_dirs = NULL; - } - - G_OBJECT_CLASS (indicator_application_parent_class)->dispose (object); - return; -} - -static void -indicator_application_finalize (GObject *object) -{ - - G_OBJECT_CLASS (indicator_application_parent_class)->finalize (object); - return; -} - -/* Responds to connection change event from the service manager and - splits it into two. */ -void -connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(application)); - if (connect) { - connected(application); - } else { - disconnected(application); - } - return; -} - -/* Brings up the connection to a service that has just come onto the - bus, or is atleast new to us. */ -void -connected (IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - g_debug("Connected to Application Indicator Service."); - - GError * error = NULL; - - /* Grab the session bus */ - if (priv->bus == NULL) { - priv->bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - - if (error != NULL) { - g_error("Unable to get session bus: %s", error->message); - g_error_free(error); - return; - } - } - - if (priv->service_proxy == NULL) { - /* Build the service proxy */ - priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus, - INDICATOR_APPLICATION_DBUS_ADDR, - INDICATOR_APPLICATION_DBUS_OBJ, - INDICATOR_APPLICATION_DBUS_IFACE); - - /* Set up proxy signals */ - g_debug("Setup proxy signals"); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationAdded", - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationRemoved", - G_TYPE_INT, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationIconChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationIconThemePathChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationLabelChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - - /* Connect to them */ - g_debug("Connect to them."); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationAdded", - G_CALLBACK(application_added), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationRemoved", - G_CALLBACK(application_removed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationIconChanged", - G_CALLBACK(application_icon_changed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationIconThemePathChanged", - G_CALLBACK(application_icon_theme_path_changed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationLabelChanged", - G_CALLBACK(application_label_changed), - application, - NULL /* Disconnection Signal */); - } - - /* Query it for existing applications */ - g_debug("Request current apps"); - org_ayatana_indicator_application_service_get_applications_async(priv->service_proxy, - get_applications, - application); - - return; -} - -/* Marks every current application as belonging to the old - service so that we can delete it if it doesn't come back. - Also, sets up a timeout on comming back. */ -static void -disconnected (IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - g_list_foreach(priv->applications, disconnected_helper, application); - /* I'll like this to be a little shorter, but it's a bit - inpractical to make it so. This means that the user will - probably notice a visible glitch. Though, if applications - are disappearing there isn't much we can do. */ - priv->disconnect_kill = g_timeout_add(250, disconnected_kill, application); - return; -} - -/* Marks an entry as being from the old service */ -static void -disconnected_helper (gpointer data, gpointer user_data) -{ - ApplicationEntry * entry = (ApplicationEntry *)data; - entry->old_service = TRUE; - return; -} - -/* Makes sure the old applications that don't come back - get dropped. */ -static gboolean -disconnected_kill (gpointer user_data) -{ - g_return_val_if_fail(IS_INDICATOR_APPLICATION(user_data), FALSE); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); - priv->disconnect_kill = 0; - g_list_foreach(priv->applications, disconnected_kill_helper, user_data); - return FALSE; -} - -/* Looks for entries that are still associated with the - old service and removes them. */ -static void -disconnected_kill_helper (gpointer data, gpointer user_data) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(user_data)); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); - ApplicationEntry * entry = (ApplicationEntry *)data; - if (entry->old_service) { - application_removed(NULL, g_list_index(priv->applications, data), INDICATOR_APPLICATION(user_data)); - } - return; -} - -/* Goes through the list of applications that we're maintaining and - pulls out the IndicatorObjectEntry and returns that in a list - for the caller. */ -static GList * -get_entries (IndicatorObject * io) -{ - g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), NULL); - - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io); - GList * retval = NULL; - GList * apppointer = NULL; - - for (apppointer = priv->applications; apppointer != NULL; apppointer = g_list_next(apppointer)) { - IndicatorObjectEntry * entry = &(((ApplicationEntry *)apppointer->data)->entry); - retval = g_list_prepend(retval, entry); - } - - if (retval != NULL) { - retval = g_list_reverse(retval); - } - - return retval; -} - -/* Finds the location of a specific entry */ -static guint -get_location (IndicatorObject * io, IndicatorObjectEntry * entry) -{ - g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), 0); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io); - return g_list_index(priv->applications, entry); -} - -/* Searching for ApplicationEntries where the dbusobject and - address are the same. */ -static gint -application_added_search (gconstpointer a, gconstpointer b) -{ - ApplicationEntry * appa = (ApplicationEntry *)a; - ApplicationEntry * appb = (ApplicationEntry *)b; - - if (g_strcmp0(appa->dbusaddress, appb->dbusaddress) == 0 && - g_strcmp0(appa->dbusobject, appb->dbusobject) == 0) { - return 0; - } - - return -1; -} - -/* Does a quick meausre of how big the string is in - pixels with a Pango layout */ -static gint -measure_string (GtkStyle * style, PangoContext * context, const gchar * string) -{ - PangoLayout * layout = pango_layout_new(context); - pango_layout_set_text(layout, string, -1); - pango_layout_set_font_description(layout, style->font_desc); - - gint width; - pango_layout_get_pixel_size(layout, &width, NULL); - g_object_unref(layout); - return width; -} - -/* Try to get a good guess at what a maximum width of the entire - string would be. */ -static void -guess_label_size (ApplicationEntry * app) -{ - /* This is during startup. */ - if (app->entry.label == NULL) return; - - GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(app->entry.label)); - PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(app->entry.label)); - - gint length = measure_string(style, context, gtk_label_get_text(app->entry.label)); - - if (app->guide != NULL) { - gint guidelen = measure_string(style, context, app->guide); - if (guidelen > length) { - length = guidelen; - } - } - - gtk_widget_set_size_request(GTK_WIDGET(app->entry.label), length, -1); - - return; -} - -/* Here we respond to new applications by building up the - ApplicationEntry and signaling the indicator host that - we've got a new indicator. */ -static void -application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, IndicatorApplication * application) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(application)); - g_debug("Building new application entry: %s with icon: %s", dbusaddress, iconname); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - - /* First search to see if we already have this entry */ - ApplicationEntry searchapp; - searchapp.dbusaddress = (gchar *)dbusaddress; /* Casting off const, but it's okay, we're not changing it */ - searchapp.dbusobject = (gchar *)dbusobject; /* Casting off const, but it's okay, we're not changing it */ - - GList * searchpointer = g_list_find_custom(priv->applications, &searchapp, application_added_search); - if (searchpointer != NULL) { - g_debug("\t...Already have that one."); - ApplicationEntry * app = (ApplicationEntry *)searchpointer->data; - app->old_service = FALSE; - return; - } - - ApplicationEntry * app = g_new(ApplicationEntry, 1); - - app->old_service = FALSE; - app->icon_theme_path = NULL; - if (icon_theme_path != NULL && icon_theme_path[0] != '\0') { - app->icon_theme_path = g_strdup(icon_theme_path); - theme_dir_ref(application, icon_theme_path); - } - - app->dbusaddress = g_strdup(dbusaddress); - app->dbusobject = g_strdup(dbusobject); - app->guide = NULL; - - /* We make a long name using the suffix, and if that - icon is available we want to use it. Otherwise we'll - just use the name we were given. */ - app->longname = NULL; - if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) { - app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); - } else { - app->longname = g_strdup(iconname); - } - app->entry.image = indicator_image_helper(app->longname); - - if (label == NULL || label[0] == '\0') { - app->entry.label = NULL; - } else { - app->entry.label = GTK_LABEL(gtk_label_new(label)); - g_object_ref(G_OBJECT(app->entry.label)); - gtk_widget_show(GTK_WIDGET(app->entry.label)); - - if (app->guide != NULL) { - g_free(app->guide); - app->guide = NULL; - } - - if (guide != NULL) { - app->guide = g_strdup(guide); - } - - guess_label_size(app); - } - - app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject)); - - /* Keep copies of these for ourself, just in case. */ - g_object_ref(app->entry.image); - g_object_ref(app->entry.menu); - - gtk_widget_show(GTK_WIDGET(app->entry.image)); - - priv->applications = g_list_insert(priv->applications, app, position); - - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE); - return; -} - -/* This removes the application from the list and free's all - of the memory associated with it. */ -static void -application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * application) -{ - g_return_if_fail(IS_INDICATOR_APPLICATION(application)); - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - priv->applications = g_list_remove(priv->applications, app); - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE); - - if (app->icon_theme_path != NULL) { - theme_dir_unref(application, app->icon_theme_path); - g_free(app->icon_theme_path); - } - if (app->dbusaddress != NULL) { - g_free(app->dbusaddress); - } - if (app->dbusobject != NULL) { - g_free(app->dbusobject); - } - if (app->guide != NULL) { - g_free(app->guide); - } - if (app->longname != NULL) { - g_free(app->longname); - } - if (app->entry.image != NULL) { - g_object_unref(G_OBJECT(app->entry.image)); - } - if (app->entry.label != NULL) { - g_object_unref(G_OBJECT(app->entry.label)); - } - if (app->entry.menu != NULL) { - g_object_unref(G_OBJECT(app->entry.menu)); - } - g_free(app); - - return; -} - -/* The callback for the signal that the label for an application - has changed. */ -static void -application_label_changed (DBusGProxy * proxy, gint position, const gchar * label, const gchar * guide, IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - gboolean signal_reload = FALSE; - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - if (label == NULL || label[0] == '\0') { - /* No label, let's see if we need to delete the old one */ - if (app->entry.label != NULL) { - g_object_unref(G_OBJECT(app->entry.label)); - app->entry.label = NULL; - - signal_reload = TRUE; - } - } else { - /* We've got a label, is this just an update or is - it a new thing. */ - if (app->entry.label != NULL) { - gtk_label_set_text(app->entry.label, label); - } else { - app->entry.label = GTK_LABEL(gtk_label_new(label)); - g_object_ref(G_OBJECT(app->entry.label)); - gtk_widget_show(GTK_WIDGET(app->entry.label)); - - signal_reload = TRUE; - } - } - - /* Copy the guide if we have one */ - if (app->guide != NULL) { - g_free(app->guide); - app->guide = NULL; - } - - if (guide != NULL && guide[0] != '\0') { - app->guide = g_strdup(guide); - } - - /* Protected against not having a label */ - guess_label_size(app); - - if (signal_reload) { - /* Telling the listener that this has been removed, and then - readded to make it reparse the entry. */ - if (app->entry.label != NULL) { - gtk_widget_hide(GTK_WIDGET(app->entry.label)); - } - - if (app->entry.image != NULL) { - gtk_widget_hide(GTK_WIDGET(app->entry.image)); - } - - if (app->entry.menu != NULL) { - gtk_menu_detach(app->entry.menu); - } - - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, &(app->entry), TRUE); - - if (app->entry.label != NULL) { - gtk_widget_show(GTK_WIDGET(app->entry.label)); - } - - if (app->entry.image != NULL) { - indicator_image_helper_update(app->entry.image, app->longname); - gtk_widget_show(GTK_WIDGET(app->entry.image)); - } - - g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, &(app->entry), TRUE); - } - - return; -} - -/* The callback for the signal that the icon for an application - has changed. */ -static void -application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - /* We make a long name using the suffix, and if that - icon is available we want to use it. Otherwise we'll - just use the name we were given. */ - if (app->longname != NULL) { - g_free(app->longname); - app->longname = NULL; - } - if (!g_str_has_suffix(iconname, PANEL_ICON_SUFFIX)) { - app->longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX); - } else { - app->longname = g_strdup(iconname); - } - indicator_image_helper_update(app->entry.image, app->longname); - - return; -} - -/* The callback for the signal that the icon theme path for an application - has changed. */ -static void -application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gchar * icon_theme_path, IndicatorApplication * application) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); - - if (app == NULL) { - g_warning("Unable to find application at position: %d", position); - return; - } - - if (g_strcmp0(icon_theme_path, app->icon_theme_path) != 0) { - if(app->icon_theme_path != NULL) { - theme_dir_unref(application, app->icon_theme_path); - g_free(app->icon_theme_path); - app->icon_theme_path = NULL; - } - if (icon_theme_path != NULL && icon_theme_path[0] != '\0') { - app->icon_theme_path = g_strdup(icon_theme_path); - theme_dir_ref(application, app->icon_theme_path); - } - indicator_image_helper_update(app->entry.image, app->longname); - } - - return; -} - -/* This repsonds to the list of applications that the service - has and calls application_added on each one of them. */ -static void -get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, gpointer userdata) -{ - if (error != NULL) { - g_warning("Unable to get application list: %s", error->message); - return; - } - g_ptr_array_foreach(OUT_applications, get_applications_helper, userdata); - - return; -} - -/* A little helper that takes apart the DBus structure and calls - application_added on every entry in the list. */ -static void -get_applications_helper (gpointer data, gpointer user_data) -{ - GValueArray * array = (GValueArray *)data; - - g_return_if_fail(array->n_values == 7); - - const gchar * icon_name = g_value_get_string(g_value_array_get_nth(array, 0)); - gint position = g_value_get_int(g_value_array_get_nth(array, 1)); - const gchar * dbus_address = g_value_get_string(g_value_array_get_nth(array, 2)); - const gchar * dbus_object = g_value_get_boxed(g_value_array_get_nth(array, 3)); - const gchar * icon_theme_path = g_value_get_string(g_value_array_get_nth(array, 4)); - const gchar * label = g_value_get_string(g_value_array_get_nth(array, 5)); - const gchar * guide = g_value_get_string(g_value_array_get_nth(array, 6)); - - return application_added(NULL, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, user_data); -} - -/* Unrefs a theme directory. This may involve removing it from - the search path. */ -static void -theme_dir_unref(IndicatorApplication * ia, const gchar * dir) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia); - - /* Grab the count for this dir */ - int count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir)); - - /* Is this a simple deprecation, if so, we can just lower the - number and move on. */ - if (count > 1) { - count--; - g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count)); - return; - } - - /* Try to remove it from the hash table, this makes sure - that it existed */ - if (!g_hash_table_remove(priv->theme_dirs, dir)) { - g_warning("Unref'd a directory that wasn't in the theme dir hash table."); - return; - } - - GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); - gchar ** paths; - gint path_count; - - gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); - - gint i; - gboolean found = FALSE; - for (i = 0; i < path_count; i++) { - if (found) { - /* If we've already found the right entry */ - paths[i - 1] = paths[i]; - } else { - /* We're still looking, is this the one? */ - if (!g_strcmp0(paths[i], dir)) { - found = TRUE; - /* We're freeing this here as it won't be captured by the - g_strfreev() below as it's out of the array. */ - g_free(paths[i]); - } - } - } - - /* If we found one we need to reset the path to - accomidate the changes */ - if (found) { - paths[path_count - 1] = NULL; /* Clear the last one */ - gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, path_count - 1); - } - - g_strfreev(paths); - - return; -} - -/* Refs a theme directory, and it may add it to the search - path */ -static void -theme_dir_ref(IndicatorApplication * ia, const gchar * dir) -{ - IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(ia); - - int count = 0; - if ((count = GPOINTER_TO_INT(g_hash_table_lookup(priv->theme_dirs, dir))) != 0) { - /* It exists so what we need to do is increase the ref - count of this dir. */ - count++; - } else { - /* It doesn't exist, so we need to add it to the table - and to the search path. */ - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), dir); - g_debug("\tAppending search path: %s", dir); - count = 1; - } - - g_hash_table_insert(priv->theme_dirs, g_strdup(dir), GINT_TO_POINTER(count)); - - return; -} - diff --git a/src/notification-approver.xml b/src/notification-approver.xml deleted file mode 100644 index 4a8e39b..0000000 --- a/src/notification-approver.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<node name="/"> - <interface name="org.ayatana.StatusNotifierApprover"> - -<!-- Methods --> - <method name="ApproveItem"> - <!-- KSNI ID --> - <arg type="s" name="id" direction="in" /> - <!-- KSNI Category --> - <arg type="s" name="category" direction="in" /> - <!-- Application PID --> - <arg type="u" name="pid" direction="in" /> - <!-- Application DBus Address --> - <arg type="s" name="address" direction="in" /> - <!-- Application DBus Path for KSNI interface --> - <arg type="o" name="path" direction="in" /> - <!-- So, what do you think? --> - <arg type="b" name="approved" direction="out" /> - </method> - -<!-- Signals --> - <signal name="ReviseJudgement"> - <arg type="b" name="approved" direction="out" /> - <arg type="s" name="address" direction="out" /> - <arg type="o" name="path" direction="out" /> - </signal> - - </interface> -</node> diff --git a/tests/Makefile.am b/tests/Makefile.am index 9cecd5e..15e477e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,5 @@ check_PROGRAMS = \ - test-approver \ test-libappindicator \ test-libappindicator-dbus-client \ test-libappindicator-dbus-server \ @@ -25,13 +24,13 @@ test_libappindicator_SOURCES = \ test-libappindicator.c test_libappindicator_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -DSRCDIR="\"$(srcdir)\"" \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -43,12 +42,12 @@ test_libappindicator_dbus_client_SOURCES = \ test-libappindicator-dbus-client.c test_libappindicator_dbus_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -60,12 +59,12 @@ test_libappindicator_dbus_server_SOURCES = \ test-libappindicator-dbus-server.c test_libappindicator_dbus_server_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_dbus_server_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -77,12 +76,12 @@ test_libappindicator_status_client_SOURCES = \ test-libappindicator-status-client.c test_libappindicator_status_client_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_client_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### @@ -94,42 +93,15 @@ test_libappindicator_status_server_SOURCES = \ test-libappindicator-status-server.c test_libappindicator_status_server_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_status_server_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la ######################################### -## test-approver -######################################### - -test_approver_SOURCES = \ - test-approver.c - -test_approver_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -Wall -Werror \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src - -test_approver_LDADD = \ - $(INDICATOR_LIBS) \ - $(top_builddir)/src/libappindicator.la - -test-approver-tester: test-approver Makefile.am - @echo "#!/bin/bash" > $@ - @echo export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=1000 >> $@ - @echo . $(srcdir)/run-xvfb.sh >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@ - @chmod +x $@ - -TESTS += test-approver-tester - - -######################################### ## test-libappindicator-fallback ######################################### @@ -137,24 +109,24 @@ test_libappindicator_fallback_watcher_SOURCES = \ test-libappindicator-fallback-watcher.c test_libappindicator_fallback_watcher_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_watcher_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test_libappindicator_fallback_item_SOURCES = \ test-libappindicator-fallback-item.c test_libappindicator_fallback_item_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_libappindicator_fallback_item_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am @@ -213,11 +185,11 @@ test_simple_app_SOURCES = \ test-simple-app.c test_simple_app_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -I$(top_srcdir)/src test_simple_app_LDADD = \ - $(INDICATOR_LIBS) \ + $(LIBRARY_LIBS) \ $(top_builddir)/src/libappindicator.la diff --git a/tests/test-approver.c b/tests/test-approver.c deleted file mode 100644 index 2665505..0000000 --- a/tests/test-approver.c +++ /dev/null @@ -1,179 +0,0 @@ -#include <glib.h> -#include <glib-object.h> - -#include <dbus/dbus-glib-bindings.h> - -#include "notification-watcher-client.h" -#include "dbus-shared.h" -#include "app-indicator.h" - -#define APPROVER_PATH "/my/approver" - -#define INDICATOR_ID "test-indicator-id" -#define INDICATOR_ICON "test-indicator-icon-name" -#define INDICATOR_CATEGORY APP_INDICATOR_CATEGORY_APPLICATION_STATUS - -#define TEST_APPROVER_TYPE (test_approver_get_type ()) -#define TEST_APPROVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_APPROVER_TYPE, TestApprover)) -#define TEST_APPROVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_APPROVER_TYPE, TestApproverClass)) -#define IS_TEST_APPROVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_APPROVER_TYPE)) -#define IS_TEST_APPROVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_APPROVER_TYPE)) -#define TEST_APPROVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_APPROVER_TYPE, TestApproverClass)) - -typedef struct _TestApprover TestApprover; -typedef struct _TestApproverClass TestApproverClass; - -struct _TestApproverClass { - GObjectClass parent_class; -}; - -struct _TestApprover { - GObject parent; -}; - -GType test_approver_get_type (void); - -static void test_approver_class_init (TestApproverClass *klass); -static void test_approver_init (TestApprover *self); -static gboolean _notification_approver_server_approve_item (TestApprover * ta, const gchar * id, const gchar * category, guint pid, const gchar * address, const gchar * path, gboolean * approved, GError ** error); - -#include "../src/notification-approver-server.h" - -GMainLoop * main_loop = NULL; -DBusGConnection * session_bus = NULL; -DBusGProxy * bus_proxy = NULL; -AppIndicator * app_indicator = NULL; -gboolean passed = FALSE; - -G_DEFINE_TYPE (TestApprover, test_approver, G_TYPE_OBJECT); - -static void -test_approver_class_init (TestApproverClass *klass) -{ - dbus_g_object_type_install_info(TEST_APPROVER_TYPE, - &dbus_glib__notification_approver_server_object_info); - - return; -} - -static void -test_approver_init (TestApprover *self) -{ - dbus_g_connection_register_g_object(session_bus, - APPROVER_PATH, - G_OBJECT(self)); - - return; -} - -static gboolean -_notification_approver_server_approve_item (TestApprover * ta, const gchar * id, const gchar * category, guint pid, const gchar * address, const gchar * path, gboolean * approved, GError ** error) -{ - *approved = TRUE; - g_debug("Asked to approve indicator"); - - if (g_strcmp0(id, INDICATOR_ID) == 0) { - passed = TRUE; - } - - g_main_loop_quit(main_loop); - - return TRUE; -} - -static void -register_cb (DBusGProxy * proxy, GError * error, gpointer user_data) -{ - if (error != NULL) { - g_warning("Unable to register approver: %s", error->message); - g_error_free(error); - g_main_loop_quit(main_loop); - return; - } - - g_debug("Building App Indicator"); - app_indicator = app_indicator_new(INDICATOR_ID, INDICATOR_ICON, INDICATOR_CATEGORY); - - GtkWidget * menu = gtk_menu_new(); - GtkWidget * mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); - - app_indicator_set_menu(app_indicator, GTK_MENU(menu)); - - return; -} - -gint owner_count = 0; -gboolean -check_for_service (gpointer user_data) -{ - g_debug("Checking for Watcher"); - - if (owner_count > 100) { - g_warning("Couldn't find watcher after 100 tries."); - g_main_loop_quit(main_loop); - return FALSE; - } - - owner_count++; - - gboolean has_owner = FALSE; - org_freedesktop_DBus_name_has_owner(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, &has_owner, NULL); - - if (has_owner) { - const char * cats = NULL; - DBusGProxy * proxy = dbus_g_proxy_new_for_name(session_bus, - NOTIFICATION_WATCHER_DBUS_ADDR, - NOTIFICATION_WATCHER_DBUS_OBJ, - NOTIFICATION_WATCHER_DBUS_IFACE); - - g_debug("Registering Approver"); - org_kde_StatusNotifierWatcher_x_ayatana_register_notification_approver_async (proxy, APPROVER_PATH, &cats, register_cb, NULL); - - return FALSE; - } - - return TRUE; -} - -gboolean -fail_timeout (gpointer user_data) -{ - g_debug("Failure timeout initiated."); - g_main_loop_quit(main_loop); - return FALSE; -} - -int -main (int argc, char ** argv) -{ - GError * error = NULL; - - gtk_init(&argc, &argv); - g_debug("Initing"); - - session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); - if (error != NULL) { - g_warning("Unable to get session bus: %s", error->message); - g_error_free(error); - return -1; - } - - TestApprover * approver = g_object_new(TEST_APPROVER_TYPE, NULL); - - bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); - - g_timeout_add(100, check_for_service, NULL); - g_timeout_add_seconds(2, fail_timeout, NULL); - - main_loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(main_loop); - - g_object_unref(approver); - - if (!passed) { - return -1; - } - - return 0; -} |