diff options
56 files changed, 1050 insertions, 524 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf deleted file mode 100644 index 6c96a98..0000000 --- a/.bzr-builddeb/default.conf +++ /dev/null @@ -1,2 +0,0 @@ -[BUILDDEB] -split = True diff --git a/.bzrignore b/.bzrignore deleted file mode 100644 index 1163970..0000000 --- a/.bzrignore +++ /dev/null @@ -1,65 +0,0 @@ -Makefile -Makefile.in -Makefile.in.in -*.o -*.lo -*.la -*.pot -.deps -.libs -*.valid -stamp-* -*.gcno -*.gcda -*.stamp -*.gir -*.typelib - -/COPYING -/INSTALL -/compile -/libtool -/config.* -/configure -/aclocal.m4 -/ltmain.sh -/install-sh -/missing -/autom4te.cache -/depcomp -/mkinstalldirs -/coverage.info -/coveragereport -/gtk-doc.make -/indicator-messages-*.tar.gz - -/m4/* -/po/POTFILES -/data/indicator-messages.service -/src/indicator-messages-service -/src/indicator-messages-service.c -/src/indicator-messages-service.h - -/libmessaging-menu/messaging-menu.pc -/libmessaging-menu/indicator-messages-service.c -/libmessaging-menu/indicator-messages-service.h - -/doc/reference/html -/doc/reference/xml -/doc/reference/messaging-menu-decl-list.txt -/doc/reference/messaging-menu-decl.txt -/doc/reference/messaging-menu-docs.sgml -/doc/reference/messaging-menu-docs.xml -/doc/reference/messaging-menu-overrides.txt -/doc/reference/messaging-menu-sections.txt -/doc/reference/messaging-menu-undeclared.txt -/doc/reference/messaging-menu-undocumented.txt -/doc/reference/messaging-menu-unused.txt -/doc/reference/messaging-menu.args -/doc/reference/messaging-menu.hierarchy -/doc/reference/messaging-menu.interfaces -/doc/reference/messaging-menu.prerequisites -/doc/reference/messaging-menu.signals -/doc/reference/messaging-menu.types - -/test/test-gactionmuxer @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. @@ -1,2 +1 @@ -# Generated by Makefile diff --git a/MERGE-REVIEW b/MERGE-REVIEW deleted file mode 100644 index 3887066..0000000 --- a/MERGE-REVIEW +++ /dev/null @@ -1,19 +0,0 @@ - -This documents the expections that the project has on what both submitters -and reviewers should ensure that they've done for a merge into the project. - -== Submitter Responsibilities == - - * Ensure the project compiles and the test suite executes without error - * Ensure that non-obvious code has comments explaining it - * If the change works on specific profiles, please include those in the merge description. - -== Reviewer Responsibilities == - - * Did the Jenkins build compile? Pass? Run unit tests successfully? - * Are there appropriate tests to cover any new functionality? - * If the description says this effects the phone profile: - * Run tests indicator-messages/unity8* - * If the description says this effects the desktop profile: - * Run tests indicator-messages/unity7* - diff --git a/Makefile.am b/Makefile.am index a48804e..16a9a77 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ - SUBDIRS = \ common \ src \ @@ -15,40 +14,8 @@ SUBDIRS += \ tests # build src first -tests: src libmessaging-menu +tests: src libayatana-messaging-menu endif - - - -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations --enable-introspection --enable-gtk-doc - -dist-hook: - @if test -d "$(top_srcdir)/.bzr"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ - || (rm -f ChangeLog.tmp; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo Failed to generate ChangeLog: not a branch >&2; \ - fi - @if test -d "$(top_srcdir)/.bzr"; \ - then \ - echo Creating AUTHORS && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ - && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ - || (rm -f AUTHORS.tmp; \ - echo Failed to generate AUTHORS >&2 ); \ - else \ - echo Failed to generate AUTHORS: not a branch >&2; \ - fi - - include $(top_srcdir)/Makefile.am.coverage @@ -1,42 +0,0 @@ - -12.10.5 - -* fix crash caused by GError not being cleared (lp #1064314) -* fix crash when registering an app that was previously unregistered (lp #1065169) -* remove the icon if NULL is passed to source_set_icon (lp #1070421) -* call gtk-update-icon-cache (lp #1060618) - -12.10.4 - -* specify fallback icons for the ones with status emblem (lp #1056595) -* make icon size consistent with the other indicators (lp #1055966) -* libmessaging-menu: fix crash when receiving a invalid desktop id (lp #1058386) - - -12.10.3 - -* hide indicator when no application shows in the menu (lp #661059) -* remove apps as soon as they are uninstalled (lp #864545) -* make generated .gir compatible with vala (lp #104496) -* draw counts as lozenges (lp #1046331) -* show separators (lp #1048245) -* show chat presence in the panel (lp #859905) -* improve documentation - - -12.10.2 - -* libmessaging-menu: - - expand source documentation and add gtk-doc to the build system - - added new API: messaging_menu_app_set_source_{label,icon} - - fix bug: only one MessagingMenuApp was exported to the messaging menu - - -12.10.1 - -* presence icons are shown again -* the icon is changed when a source draws attention -* the time in source menu items is always kep current -* fixed all g-ir-scanner warnings -* libmessaging-menu now removes sources when they are activated -* fixed several bugs diff --git a/NEWS.Canonical b/NEWS.Canonical new file mode 100644 index 0000000..341594a --- /dev/null +++ b/NEWS.Canonical @@ -0,0 +1,42 @@ + +12.10.5 + +* fix crash caused by GError not being cleared (lp #1064314) +* fix crash when registering an app that was previously unregistered (lp #1065169) +* remove the icon if NULL is passed to source_set_icon (lp #1070421) +* call gtk-update-icon-cache (lp #1060618) + +12.10.4 + +* specify fallback icons for the ones with status emblem (lp #1056595) +* make icon size consistent with the other indicators (lp #1055966) +* libmessaging-menu: fix crash when receiving a invalid desktop id (lp #1058386) + + +12.10.3 + +* hide indicator when no application shows in the menu (lp #661059) +* remove apps as soon as they are uninstalled (lp #864545) +* make generated .gir compatible with vala (lp #104496) +* draw counts as lozenges (lp #1046331) +* show separators (lp #1048245) +* show chat presence in the panel (lp #859905) +* improve documentation + + +12.10.2 + +* libmessaging-menu: + - expand source documentation and add gtk-doc to the build system + - added new API: messaging_menu_app_set_source_{label,icon} + - fix bug: only one MessagingMenuApp was exported to the messaging menu + + +12.10.1 + +* presence icons are shown again +* the icon is changed when a source draws attention +* the time in source menu items is always kep current +* fixed all g-ir-scanner warnings +* libmessaging-menu now removes sources when they are activated +* fixed several bugs @@ -1,11 +1,10 @@ #!/bin/sh -PKG_NAME="indicator-messages" +PKG_NAME="ayatana-indicator-messages" -which gnome-autogen.sh || { - echo "You need gnome-common from GNOME SVN" +which mate-autogen || { + echo "You need mate-common from the MATE Desktop Environment" exit 1 } -USE_GNOME2_MACROS=1 \ -. gnome-autogen.sh +. mate-autogen diff --git a/common/Makefile.am b/common/Makefile.am index 0b8bad4..d1be198 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,17 +1,16 @@ - noinst_LTLIBRARIES = libmessaging-common.la -indicator-messages-service.c: com.canonical.indicator.messages.service.xml +indicator-messages-service.c: org.ayatana.indicator.messages.service.xml $(AM_V_GEN) gdbus-codegen \ - --interface-prefix com.canonical.indicator.messages. \ + --interface-prefix org.ayatana.indicator.messages. \ --generate-c-code indicator-messages-service \ --c-namespace IndicatorMessages \ $^ indicator-messages-service.h: indicator-messages-service.c -indicator-messages-application.c: com.canonical.indicator.messages.application.xml +indicator-messages-application.c: org.ayatana.indicator.messages.application.xml $(AM_V_GEN) gdbus-codegen \ - --interface-prefix com.canonical.indicator.messages. \ + --interface-prefix org.ayatana.indicator.messages. \ --generate-c-code indicator-messages-application \ --c-namespace IndicatorMessages \ $^ diff --git a/common/com.canonical.indicator.messages.application.xml b/common/org.ayatana.indicator.messages.application.xml index af2f1f6..12cd306 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/org.ayatana.indicator.messages.application.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <node name="/"> - <interface name="com.canonical.indicator.messages.application"> + <interface name="org.ayatana.indicator.messages.application"> <method name="ListSources"> <arg type="a(ssavuxsb)" name="sources" direction="out" /> </method> diff --git a/common/com.canonical.indicator.messages.service.xml b/common/org.ayatana.indicator.messages.service.xml index 3c3c779..68064f9 100644 --- a/common/com.canonical.indicator.messages.service.xml +++ b/common/org.ayatana.indicator.messages.service.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <node name="/"> - <interface name="com.canonical.indicator.messages.service"> + <interface name="org.ayatana.indicator.messages.service"> <method name="RegisterApplication"> <arg type="s" name="desktop_id" direction="in" /> diff --git a/configure.ac b/configure.ac index b9c8800..bf7a04e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-messages, 12.10.5) +AC_INIT(ayatana-indicator-messages, 12.10.5) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([check-news]) +AM_INIT_AUTOMAKE(subdir-objects) AM_MAINTAINER_MODE @@ -60,9 +60,9 @@ GTK_DOC_CHECK([1.18], [--flavour no-tmpl]) GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_REQUIRED_VERSION]) AC_ARG_WITH([indicator-dir], - [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], + [AS_HELP_STRING([--with-indicator-dir=DIR], [Ayatana Indicator directory [default=$datadir/ayatana/indicators]])], [], - [with_indicator_dir=$datadir/unity/indicators]) + [with_indicator_dir=$datadir/ayatana/indicators]) AC_SUBST([INDICATOR_DIR], [$with_indicator_dir]) ########################### @@ -139,7 +139,7 @@ AC_DEFUN([AC_DEFINE_PATH], [ # Internationalization ########################### -GETTEXT_PACKAGE=indicator-messages +GETTEXT_PACKAGE=ayatana-indicator-messages AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain]) AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory]) @@ -172,7 +172,6 @@ data/icons/48x48/status/Makefile data/icons/scalable/Makefile data/icons/scalable/status/Makefile data/icons/scalable/categories/Makefile -data/upstart/Makefile po/Makefile.in tests/Makefile libmessaging-menu/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index b991686..60dd839 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,26 +1,26 @@ -SUBDIRS = icons upstart +SUBDIRS = icons xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = indicator-messages.desktop +xdg_autostart_DATA = ayatana-indicator-messages.desktop %.desktop: %.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = indicator-messages.conf +upstart_jobs_DATA = ayatana-indicator-messages.conf %.conf: %.conf.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml +gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml @GSETTINGS_RULES@ indicatordir = $(INDICATOR_DIR) -dist_indicator_DATA = com.canonical.indicator.messages +dist_indicator_DATA = org.ayatana.indicator.messages EXTRA_DIST = \ - indicator-messages.desktop.in \ - indicator-messages.conf.in \ + ayatana-indicator-messages.desktop.in \ + ayatana-indicator-messages.conf.in \ $(gsettings_SCHEMAS) CLEANFILES = \ diff --git a/data/ayatana-indicator-messages.conf.in b/data/ayatana-indicator-messages.conf.in new file mode 100644 index 0000000..109d383 --- /dev/null +++ b/data/ayatana-indicator-messages.conf.in @@ -0,0 +1,9 @@ +description "Ayatana Indicator Messages Service" + +start on ayatana-indicator-services-start +stop on desktop-end or ayatana-indicator-services-end + +respawn +respawn limit 2 10 + +exec @pkglibexecdir@/ayatana-indicator-messages-service diff --git a/data/ayatana-indicator-messages.desktop.in b/data/ayatana-indicator-messages.desktop.in new file mode 100644 index 0000000..4434769 --- /dev/null +++ b/data/ayatana-indicator-messages.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Messages +Exec=@pkglibexecdir@/ayatana-indicator-messages-service +NoDisplay=true +StartupNotify=false +Terminal=false +OnlyShowIn=Unity;MATE; diff --git a/data/com.canonical.indicator.messages b/data/com.canonical.indicator.messages deleted file mode 100644 index 572a4a7..0000000 --- a/data/com.canonical.indicator.messages +++ /dev/null @@ -1,19 +0,0 @@ -[Indicator Service] -Name=indicator-messages -ObjectPath=/com/canonical/indicator/messages -Position=50 - -[desktop] -ObjectPath=/com/canonical/indicator/messages/desktop - -[desktop_greeter] -ObjectPath=/com/canonical/indicator/messages/desktop_greeter - -[phone] -ObjectPath=/com/canonical/indicator/messages/phone -Position=100 - -[phone_greeter] -ObjectPath=/com/canonical/indicator/messages/phone_greeter -Position=100 - diff --git a/data/indicator-messages.conf.in b/data/indicator-messages.conf.in deleted file mode 100644 index b300a57..0000000 --- a/data/indicator-messages.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -description "Indicator Messages Service" - -start on indicator-services-start -stop on desktop-end or indicator-services-end - -respawn -respawn limit 2 10 - -exec @pkglibexecdir@/indicator-messages-service - diff --git a/data/indicator-messages.desktop.in b/data/indicator-messages.desktop.in deleted file mode 100644 index 79c6a43..0000000 --- a/data/indicator-messages.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Messages -Exec=@pkglibexecdir@/indicator-messages-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity;GNOME; -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/org.ayatana.indicator.messages b/data/org.ayatana.indicator.messages new file mode 100644 index 0000000..23d6089 --- /dev/null +++ b/data/org.ayatana.indicator.messages @@ -0,0 +1,18 @@ +[Indicator Service] +Name=indicator-messages +ObjectPath=/org/ayatana/indicator/messages +Position=50 + +[desktop] +ObjectPath=/org/ayatana/indicator/messages/desktop + +[desktop_greeter] +ObjectPath=/org/ayatana/indicator/messages/desktop_greeter + +[phone] +ObjectPath=/org/ayatana/indicator/messages/phone +Position=100 + +[phone_greeter] +ObjectPath=/org/ayatana/indicator/messages/phone_greeter +Position=100 diff --git a/data/com.canonical.indicator.messages.gschema.xml b/data/org.ayatana.indicator.messages.gschema.xml index d9165cd..ea0f077 100644 --- a/data/com.canonical.indicator.messages.gschema.xml +++ b/data/org.ayatana.indicator.messages.gschema.xml @@ -1,5 +1,5 @@ <schemalist> - <schema id="com.canonical.indicator.messages" path="/com/canonical/indicator/messages/" gettext-domain="indicator-messages"> + <schema id="org.ayatana.indicator.messages" path="/org/ayatana/indicator/messages/" gettext-domain="ayatana-indicator-messages"> <key name="applications" type="as"> <summary>List of applications that are shown in the messaging menu</summary> <description> diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am deleted file mode 100644 index c182438..0000000 --- a/data/upstart/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -xdg_autostartdir = $(datadir)/upstart/xdg/autostart -xdg_autostart_DATA = indicator-messages.desktop - -%.desktop: %.desktop.in - $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -EXTRA_DIST = \ - indicator-messages.desktop.in - -CLEANFILES = \ - $(xdg_autostart_DATA) diff --git a/data/upstart/indicator-messages.desktop.in b/data/upstart/indicator-messages.desktop.in deleted file mode 100644 index dd0b1d6..0000000 --- a/data/upstart/indicator-messages.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Messages -Exec=@pkglibexecdir@/indicator-messages-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity; -Hidden=true diff --git a/debian/ayatana-indicator-messages.install b/debian/ayatana-indicator-messages.install new file mode 100644 index 0000000..8cf384a --- /dev/null +++ b/debian/ayatana-indicator-messages.install @@ -0,0 +1,7 @@ +usr/lib/*/ayatana-indicator-messages/ayatana-indicator-messages-service +usr/share/ayatana/indicators +usr/share/upstart +usr/share/glib-2.0 +usr/share/icons +usr/share/locale +etc/xdg/autostart diff --git a/debian/changelog b/debian/changelog index 2f8c347..0dd8b68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-indicator-messages (1:0.6.0-0) UNRELEASED; urgency=medium + + * Fork from Ubuntu's indicator-messages applet. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 16 Nov 2015 16:13:12 +0100 + indicator-messages (13.10.1+15.10.20150505-0ubuntu1) wily; urgency=medium [ Lars Uebernickel ] diff --git a/debian/control b/debian/control index eccb874..e163850 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,9 @@ -Source: indicator-messages +Source: ayatana-indicator-messages Section: gnome Priority: optional -Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org> -Uploaders: Evgeni Golov <evgeni@debian.org> +Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: debhelper (>= 9), dh-autoreconf, - dh-translations, gobject-introspection (>= 0.9.12-4~), gtk-doc-tools, intltool, @@ -14,39 +11,22 @@ Build-Depends: debhelper (>= 9), libdbustest1-dev, libgirepository1.0-dev (>= 0.9.12), libgtest-dev, + mate-common, python3-dbusmock, valac, -Standards-Version: 3.9.3 -Homepage: https://launchpad.net/indicator-messages -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk.13.04 -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-messages/trunk.13.04/files +Standards-Version: 4.0.0 +Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-messages +Vcs-Git: https://github.com/AyatanaIndicators/ayatana-indicator-messages +Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-messages -Package: indicator-messages +Package: ayatana-indicator-messages Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-applet | indicator-renderer -Replaces: libindicator-messages-status-provider1, - libindicator-messages-status-provider-dev, - indicator-status-provider-mc5, - indicator-status-provider-pidgin, - indicator-status-provider-telepathy, - indicator-status-provider-emesene, -Conflicts: libindicator-messages-status-provider1, - libindicator-messages-status-provider-dev, - indicator-status-provider-mc5, - indicator-status-provider-pidgin, - indicator-status-provider-telepathy, - indicator-status-provider-emesene, -Breaks: gwibber-services (<< 3.5.4-0ubuntu1~), - telepathy-indicator (<< 0.3.0-0ubuntu1~), - thunderbird (<< 15.0+build1-0ubuntu1~), - xchat-indicator (<< 0.3.11-0ubuntu2~), - xchat-gnome-indicator (<< 0.3.11-0ubuntu2~), -Description: indicator that collects messages that need a response +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Recommends: indicator-applet | indicator-renderer | mate-applet-indicator +Description: Ayatana Indicator that collects messages that need a response A place on the user's desktop that collects messages that need a response. + . This menu provides a condensed and collected view of all of those messages for quick access, but without making them annoying in times that you want to ignore them. @@ -58,6 +38,12 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, Description: Messaging Menu - shared library + A place on the user's desktop that collects messages that need a response. + . + This menu provides a condensed and collected view of all of those messages + for quick access, but without making them annoying in times that you want + to ignore them. + . This library contains information to build status providers to go into the messaging menu. @@ -70,8 +56,14 @@ Depends: ${shlibs:Depends}, libmessaging-menu0 (=${binary:Version}), libglib2.0-dev, Description: Messaging Menu - library development files - This library contains information to build status providers to go into - the messaging menu. + A place on the user's desktop that collects messages that need a response. + . + This menu provides a condensed and collected view of all of those messages + for quick access, but without making them annoying in times that you want + to ignore them. + . + This package provides development files for the Messaging Menu shared + library. Package: gir1.2-messagingmenu-1.0 Section: introspection @@ -79,6 +71,11 @@ Architecture: any Depends: ${misc:Depends}, ${gir:Depends}, Description: Messaging Menu - gir bindings + A place on the user's desktop that collects messages that need a response. + . + This menu provides a condensed and collected view of all of those messages + for quick access, but without making them annoying in times that you want + to ignore them. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. diff --git a/debian/gir1.2-messagingmenu-1.0.install b/debian/gir1.2-messagingmenu-1.0.install index cbe4832..49d71c9 100644 --- a/debian/gir1.2-messagingmenu-1.0.install +++ b/debian/gir1.2-messagingmenu-1.0.install @@ -1 +1 @@ -usr/lib/*/girepository-1.0 /usr/lib +usr/lib/*/girepository-1.0 diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install deleted file mode 100644 index 9ecb1e0..0000000 --- a/debian/indicator-messages.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/*/indicator-messages/indicator-messages-service -usr/share/upstart -usr/share/glib-2.0 -usr/share/icons -usr/share/unity/indicators -etc/xdg/autostart diff --git a/debian/libmessaging-menu-dev.install b/debian/libmessaging-menu-dev.install index 7aa453e..4c9f561 100644 --- a/debian/libmessaging-menu-dev.install +++ b/debian/libmessaging-menu-dev.install @@ -1,4 +1,4 @@ -usr/lib/*/libmessaging-menu.so +usr/lib/*/libmessaging-menu.so usr/lib/*/pkgconfig usr/include /usr/ usr/share/gir-1.0/ diff --git a/debian/libmessaging-menu0.symbols b/debian/libmessaging-menu0.symbols index 6a54911..567e0a8 100644 --- a/debian/libmessaging-menu0.symbols +++ b/debian/libmessaging-menu0.symbols @@ -1,38 +1,38 @@ libmessaging-menu.so.0 libmessaging-menu0 #MINVER# - messaging_menu_app_append_message@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_app_append_source@Base 12.10.0 - messaging_menu_app_append_source_with_count@Base 12.10.0 - messaging_menu_app_append_source_with_string@Base 12.10.0 - messaging_menu_app_append_source_with_time@Base 12.10.0 - messaging_menu_app_draw_attention@Base 12.10.0 - messaging_menu_app_get_message@Base 13.10.1+13.10.20130820 - messaging_menu_app_get_type@Base 12.10.0 - messaging_menu_app_has_source@Base 12.10.0 - messaging_menu_app_insert_source@Base 12.10.0 - messaging_menu_app_insert_source_with_count@Base 12.10.0 - messaging_menu_app_insert_source_with_string@Base 12.10.0 - messaging_menu_app_insert_source_with_time@Base 12.10.0 - messaging_menu_app_new@Base 12.10.0 - messaging_menu_app_register@Base 12.10.0 - messaging_menu_app_remove_attention@Base 12.10.0 - messaging_menu_app_remove_message@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_app_remove_message_by_id@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_app_remove_source@Base 12.10.0 - messaging_menu_app_set_source_count@Base 12.10.0 - messaging_menu_app_set_source_icon@Base 12.10.2 - messaging_menu_app_set_source_label@Base 12.10.2 - messaging_menu_app_set_source_string@Base 12.10.0 - messaging_menu_app_set_source_time@Base 12.10.0 - messaging_menu_app_set_status@Base 12.10.0 - messaging_menu_app_unregister@Base 12.10.0 - messaging_menu_message_add_action@Base 12.10.6-0ubuntu1phablet3 - messaging_menu_message_get_body@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_draws_attention@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_icon@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_id@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_subtitle@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_time@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_title@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_get_type@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_new@Base 12.10.6-0ubuntu1phablet1 - messaging_menu_message_set_draws_attention@Base 12.10.6-0ubuntu1phablet1 + messaging_menu_app_append_message@Base 0.6.0 + messaging_menu_app_append_source@Base 0.6.0 + messaging_menu_app_append_source_with_count@Base 0.6.0 + messaging_menu_app_append_source_with_string@Base 0.6.0 + messaging_menu_app_append_source_with_time@Base 0.6.0 + messaging_menu_app_draw_attention@Base 0.6.0 + messaging_menu_app_get_message@Base 0.6.0 + messaging_menu_app_get_type@Base 0.6.0 + messaging_menu_app_has_source@Base 0.6.0 + messaging_menu_app_insert_source@Base 0.6.0 + messaging_menu_app_insert_source_with_count@Base 0.6.0 + messaging_menu_app_insert_source_with_string@Base 0.6.0 + messaging_menu_app_insert_source_with_time@Base 0.6.0 + messaging_menu_app_new@Base 0.6.0 + messaging_menu_app_register@Base 0.6.0 + messaging_menu_app_remove_attention@Base 0.6.0 + messaging_menu_app_remove_message@Base 0.6.0 + messaging_menu_app_remove_message_by_id@Base 0.6.0 + messaging_menu_app_remove_source@Base 0.6.0 + messaging_menu_app_set_source_count@Base 0.6.0 + messaging_menu_app_set_source_icon@Base 0.6.0 + messaging_menu_app_set_source_label@Base 0.6.0 + messaging_menu_app_set_source_string@Base 0.6.0 + messaging_menu_app_set_source_time@Base 0.6.0 + messaging_menu_app_set_status@Base 0.6.0 + messaging_menu_app_unregister@Base 0.6.0 + messaging_menu_message_add_action@Base 0.6.0 + messaging_menu_message_get_body@Base 0.6.0 + messaging_menu_message_get_draws_attention@Base 0.6.0 + messaging_menu_message_get_icon@Base 0.6.0 + messaging_menu_message_get_id@Base 0.6.0 + messaging_menu_message_get_subtitle@Base 0.6.0 + messaging_menu_message_get_time@Base 0.6.0 + messaging_menu_message_get_title@Base 0.6.0 + messaging_menu_message_get_type@Base 0.6.0 + messaging_menu_message_new@Base 0.6.0 + messaging_menu_message_set_draws_attention@Base 0.6.0 diff --git a/debian/rules b/debian/rules index 2909daf..c0f70d7 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --with autoreconf,translations,gir + dh $@ --with autoreconf,gir override_dh_autoreconf: - NO_CONFIGURE=1 dh_autoreconf ./autogen.sh + NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_auto_configure: dh_auto_configure -- --enable-gtk-doc @@ -14,4 +14,3 @@ override_dh_auto_configure: override_dh_install: find debian/tmp/usr/lib -name *.la -delete dh_install --fail-missing - diff --git a/debian/watch b/debian/watch deleted file mode 100644 index a744070..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://launchpad.net/indicator-messages/+download .*/indicator-messages-([0-9.]+)\.tar\.gz diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 3993b41..1dfac8a 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -13,7 +13,7 @@ CFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.c IGNORE_HFILES= \ indicator-messages-service.h -INCLUDES=-I$(top_srcdir)/libmessaging-menu $(GIO_CFLAGS) +AM_CPPFLAGS=-I$(top_srcdir)/libmessaging-menu $(GIO_CFLAGS) GTKDOC_LIBS=$(top_builddir)/libmessaging-menu/libmessaging-menu.la include $(top_srcdir)/gtk-doc.make diff --git a/doc/reference/messaging-menu-docs.xml.in b/doc/reference/messaging-menu-docs.xml.in index 4c1cec1..9319875 100644 --- a/doc/reference/messaging-menu-docs.xml.in +++ b/doc/reference/messaging-menu-docs.xml.in @@ -8,7 +8,7 @@ <title>Messaging Menu Reference Manual</title> <bookinfo> <title>Messaging Menu Reference Manual</title> - <releaseinfo>for libmessaging-menu &version;</releaseinfo> + <releaseinfo>for libayatana-messaging-menu &version;</releaseinfo> <copyright> <year>2012</year> diff --git a/doc/reference/messaging-menu-overrides.txt b/doc/reference/messaging-menu-overrides.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/doc/reference/messaging-menu-overrides.txt diff --git a/doc/reference/messaging-menu-sections.txt b/doc/reference/messaging-menu-sections.txt new file mode 100644 index 0000000..5874791 --- /dev/null +++ b/doc/reference/messaging-menu-sections.txt @@ -0,0 +1,61 @@ +<SECTION> +<FILE>messaging-menu-app</FILE> +MessagingMenuStatus +MessagingMenuAppClass +messaging_menu_app_new +messaging_menu_app_register +messaging_menu_app_unregister +messaging_menu_app_set_status +messaging_menu_app_insert_source +messaging_menu_app_append_source +messaging_menu_app_insert_source_with_count +messaging_menu_app_append_source_with_count +messaging_menu_app_insert_source_with_time +messaging_menu_app_append_source_with_time +messaging_menu_app_append_source_with_string +messaging_menu_app_insert_source_with_string +messaging_menu_app_remove_source +messaging_menu_app_has_source +messaging_menu_app_set_source_label +messaging_menu_app_set_source_icon +messaging_menu_app_set_source_count +messaging_menu_app_set_source_time +messaging_menu_app_set_source_string +messaging_menu_app_draw_attention +messaging_menu_app_remove_attention +messaging_menu_app_append_message +messaging_menu_app_get_message +messaging_menu_app_remove_message +messaging_menu_app_remove_message_by_id +MessagingMenuApp +<SUBSECTION Standard> +MESSAGING_MENU_APP +MESSAGING_MENU_APP_CLASS +MESSAGING_MENU_IS_APP +MESSAGING_MENU_TYPE_APP +messaging_menu_app_get_type +</SECTION> + +<SECTION> +<FILE>messaging-menu-message</FILE> +messaging_menu_message_new +messaging_menu_message_get_id +messaging_menu_message_get_icon +messaging_menu_message_get_title +messaging_menu_message_get_subtitle +messaging_menu_message_get_body +messaging_menu_message_get_time +messaging_menu_message_get_draws_attention +messaging_menu_message_set_draws_attention +messaging_menu_message_add_action +MessagingMenuMessage +<SUBSECTION Standard> +MESSAGING_MENU_IS_MESSAGE +MESSAGING_MENU_IS_MESSAGE_CLASS +MESSAGING_MENU_MESSAGE +MESSAGING_MENU_MESSAGE_CLASS +MESSAGING_MENU_MESSAGE_GET_CLASS +MESSAGING_MENU_TYPE_MESSAGE +messaging_menu_message_get_type +</SECTION> + diff --git a/doc/reference/messaging-menu.types b/doc/reference/messaging-menu.types new file mode 100644 index 0000000..e34eb33 --- /dev/null +++ b/doc/reference/messaging-menu.types @@ -0,0 +1,2 @@ +messaging_menu_app_get_type +messaging_menu_message_get_type diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am index 1042d9f..2f178b5 100644 --- a/libmessaging-menu/Makefile.am +++ b/libmessaging-menu/Makefile.am @@ -1,4 +1,3 @@ - lib_LTLIBRARIES = libmessaging-menu.la libmessaging_menu_ladir = $(includedir)/messaging-menu diff --git a/libmessaging-menu/messaging-menu-app.c b/libmessaging-menu/messaging-menu-app.c index 83dfb41..1215ad3 100644 --- a/libmessaging-menu/messaging-menu-app.c +++ b/libmessaging-menu/messaging-menu-app.c @@ -203,7 +203,7 @@ messaging_menu_app_get_dbus_object_path (MessagingMenuApp *app) if (!app->appinfo) return NULL; - path = g_strconcat ("/com/canonical/indicator/messages/", + path = g_strconcat ("/org/ayatana/indicator/messages/", g_app_info_get_id (G_APP_INFO (app->appinfo)), NULL); @@ -432,8 +432,8 @@ indicator_messages_appeared (GDBusConnection *bus, indicator_messages_service_proxy_new (bus, G_DBUS_PROXY_FLAGS_NONE, - "com.canonical.indicator.messages", - "/com/canonical/indicator/messages/service", + "org.ayatana.indicator.messages", + "/org/ayatana/indicator/messages/service", app->cancellable, created_messages_service, app); @@ -641,7 +641,7 @@ messaging_menu_app_init (MessagingMenuApp *app) app->messages = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); app->watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, - "com.canonical.indicator.messages", + "org.ayatana.indicator.messages", G_BUS_NAME_WATCHER_FLAGS_NONE, indicator_messages_appeared, indicator_messages_vanished, diff --git a/libmessaging-menu/messaging-menu.pc.in b/libmessaging-menu/messaging-menu.pc.in index 486300f..612e0de 100644 --- a/libmessaging-menu/messaging-menu.pc.in +++ b/libmessaging-menu/messaging-menu.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/messaging-menu +includedir=@includedir@/ayatana-messaging-menu -Name: Messaging Menu Library -Description: Messaging Menu client library +Name: Ayatana Messaging Menu Library +Description: Ayatana Messaging Menu client library Version: @VERSION@ Requires: gio-unix-2.0 -Libs: -L${libdir} -lmessaging-menu +Libs: -L${libdir} -layatana-messaging-menu Cflags: -I${includedir} diff --git a/m4/gtest.m4 b/m4/gtest.m4 index 2de334c..6598ba7 100644 --- a/m4/gtest.m4 +++ b/m4/gtest.m4 @@ -1,63 +1,74 @@ -# Copyright (C) 2012 Canonical, Ltd. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -# Checks whether the gtest source is available on the system. Allows for -# adjusting the include and source path. Sets have_gtest=yes if the source is -# present. Sets GTEST_CPPFLAGS and GTEST_SOURCE to the preprocessor flags and -# source location respectively. -AC_DEFUN([CHECK_GTEST], +dnl GTEST_LIB_CHECK([minimum version [, +dnl action if found [,action if not found]]]) +dnl +dnl Check for the presence of the Google Test library, optionally at a minimum +dnl version, and indicate a viable version with the HAVE_GTEST flag. It defines +dnl standard variables for substitution including GTEST_CPPFLAGS, +dnl GTEST_CXXFLAGS, GTEST_LDFLAGS, and GTEST_LIBS. It also defines +dnl GTEST_VERSION as the version of Google Test found. Finally, it provides +dnl optional custom action slots in the event GTEST is found or not. +AC_DEFUN([GTEST_LIB_CHECK], [ - AC_ARG_WITH([gtest-include-path], - [AS_HELP_STRING([--with-gtest-include-path], - [location of the Google test headers])], - [GTEST_CPPFLAGS="-I$withval"]) - - AC_ARG_WITH([gtest-source-path], - [AS_HELP_STRING([--with-gtest-source-path], - [location of the Google test sources, defaults to /usr/src/gtest])], - [GTEST_SOURCE="$withval"], - [GTEST_SOURCE="/usr/src/gtest"]) - - GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE" - - AC_LANG_PUSH([C++]) - - tmp_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS" - - AC_CHECK_HEADER([gtest/gtest.h]) - - CPPFLAGS="$tmp_CPPFLAGS" - - AC_LANG_POP - - AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc] - [$GTEST_SOURCE/src/gtest_main.cc], - [have_gtest_source=yes], - [have_gtest_source=no]) - - AS_IF([test "x$ac_cv_header_gtest_gtest_h" = xyes -a \ - "x$have_gtest_source" = xyes], - [have_gtest=yes] - [AC_SUBST(GTEST_CPPFLAGS)] - [AC_SUBST(GTEST_SOURCE)], - [have_gtest=no]) -]) # CHECK_GTEST +dnl Provide a flag to enable or disable Google Test usage. +AC_ARG_ENABLE([gtest], + [AS_HELP_STRING([--enable-gtest], + [Enable tests using the Google C++ Testing Framework. + (Default is enabled.)])], + [], + [enable_gtest=]) +AC_ARG_VAR([GTEST_CONFIG], + [The exact path of Google Test's 'gtest-config' script.]) +AC_ARG_VAR([GTEST_CPPFLAGS], + [C-like preprocessor flags for Google Test.]) +AC_ARG_VAR([GTEST_CXXFLAGS], + [C++ compile flags for Google Test.]) +AC_ARG_VAR([GTEST_LDFLAGS], + [Linker path and option flags for Google Test.]) +AC_ARG_VAR([GTEST_LIBS], + [Library linking flags for Google Test.]) +AC_ARG_VAR([GTEST_VERSION], + [The version of Google Test available.]) +HAVE_GTEST="no" +AS_IF([test "x${enable_gtest}" != "xno"], + [AC_MSG_CHECKING([for 'gtest-config']) + AS_IF([test "x${enable_gtest}" != "xyes"], + [AS_IF([test -x "${enable_gtest}/scripts/gtest-config"], + [GTEST_CONFIG="${enable_gtest}/scripts/gtest-config"], + [GTEST_CONFIG="${enable_gtest}/bin/gtest-config"]) + AS_IF([test -x "${GTEST_CONFIG}"], [], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([dnl +Unable to locate either a built or installed Google Test. +The specific location '${enable_gtest}' was provided for a built or installed +Google Test, but no 'gtest-config' script could be found at this location.]) + ])], + [AC_PATH_PROG([GTEST_CONFIG], [gtest-config])]) + AS_IF([test -x "${GTEST_CONFIG}"], + [AC_MSG_RESULT([${GTEST_CONFIG}]) + m4_ifval([$1], + [_gtest_min_version="--min-version=$1" + AC_MSG_CHECKING([for Google Test at least version >= $1])], + [_gtest_min_version="--min-version=0" + AC_MSG_CHECKING([for Google Test])]) + AS_IF([${GTEST_CONFIG} ${_gtest_min_version}], + [AC_MSG_RESULT([yes]) + HAVE_GTEST='yes'], + [AC_MSG_RESULT([no])])], + [AC_MSG_RESULT([no])]) + AS_IF([test "x${HAVE_GTEST}" = "xyes"], + [GTEST_CPPFLAGS=`${GTEST_CONFIG} --cppflags` + GTEST_CXXFLAGS=`${GTEST_CONFIG} --cxxflags` + GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` + GTEST_LIBS=`${GTEST_CONFIG} --libs` + GTEST_VERSION=`${GTEST_CONFIG} --version` + AC_DEFINE([HAVE_GTEST],[1],[Defined when Google Test is available.])], + [AS_IF([test "x${enable_gtest}" = "xyes"], + [AC_MSG_ERROR([dnl +Google Test was enabled, but no viable version could be found.]) + ])])]) +AC_SUBST([HAVE_GTEST]) +AM_CONDITIONAL([HAVE_GTEST],[test "x$HAVE_GTEST" = "xyes"]) +AS_IF([test "x$HAVE_GTEST" = "xyes"], + [m4_ifval([$2], [$2])], + [m4_ifval([$3], [$3])]) +]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 7501530..c2d6633 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,5 +9,5 @@ src/im-menu.c src/im-phone-menu.c src/indicator-desktop-shortcuts.c src/messages-service.c -libayatana-messaging-menu/messaging-menu-message.c -libayatana-messaging-menu/messaging-menu-app.c +libmessaging-menu/messaging-menu-message.c +libmessaging-menu/messaging-menu-app.c diff --git a/po/ayatana-indicator-messages.pot b/po/ayatana-indicator-messages.pot deleted file mode 100644 index a3e0074..0000000 --- a/po/ayatana-indicator-messages.pot +++ /dev/null @@ -1,69 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-12 07:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../data/org.ayatana.indicator.messages.gschema.xml.h:1 -msgid "List of applications that are shown in the messaging menu" -msgstr "" - -#: ../data/org.ayatana.indicator.messages.gschema.xml.h:2 -msgid "" -"Applications corresponding to the desktop file ids in this list are shown in " -"the messaging menu." -msgstr "" - -#: ../src/im-application-list.c:231 -msgid "New Messages" -msgstr "" - -#: ../src/im-application-list.c:235 -msgid "Messages" -msgstr "" - -#. title -#: ../src/im-application-list.c:258 -msgid "Notifications" -msgstr "" - -#: ../src/im-desktop-menu.c:67 -msgid "Available" -msgstr "" - -#: ../src/im-desktop-menu.c:68 -msgid "Away" -msgstr "" - -#: ../src/im-desktop-menu.c:69 -msgid "Busy" -msgstr "" - -#: ../src/im-desktop-menu.c:70 -msgid "Invisible" -msgstr "" - -#: ../src/im-desktop-menu.c:71 -msgid "Offline" -msgstr "" - -#: ../src/im-desktop-menu.c:367 -msgid "Clear" -msgstr "" - -#: ../src/im-phone-menu.c:76 -msgid "Clear All" -msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 36e6a93..408d934 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,8 @@ - EXTRA_DIST = -pkglibexec_PROGRAMS = indicator-messages-service +pkglibexec_PROGRAMS = ayatana-indicator-messages-service -indicator_messages_service_SOURCES = \ +ayatana_indicator_messages_service_SOURCES = \ messages-service.c \ dbus-data.h \ gactionmuxer.c \ @@ -23,7 +22,7 @@ indicator_messages_service_SOURCES = \ indicator-desktop-shortcuts.c \ indicator-desktop-shortcuts.h -indicator_messages_service_CFLAGS = \ +ayatana_indicator_messages_service_CFLAGS = \ $(APPLET_CFLAGS) \ $(COVERAGE_CFLAGS) \ -I$(top_builddir)/common \ @@ -32,14 +31,14 @@ indicator_messages_service_CFLAGS = \ -Wl,-z,defs \ -Wl,--as-needed \ -Werror -Wno-error=deprecated-declarations \ - -DG_LOG_DOMAIN=\"Indicator-Messages\" + -DG_LOG_DOMAIN=\"Ayatana-Indicator-Messages\" -indicator_messages_service_LDADD = \ +ayatana_indicator_messages_service_LDADD = \ $(top_builddir)/common/libmessaging-common.la \ $(APPLET_LIBS) -indicator_messages_service_LDFLAGS = \ +ayatana_indicator_messages_service_LDFLAGS = \ $(COVERAGE_LDFLAGS) EXTRA_DIST += \ - messages-service.xml + ayatana-messages-service.xml diff --git a/src/dbus-data.h b/src/dbus-data.h index 59bd305..1ac4183 100644 --- a/src/dbus-data.h +++ b/src/dbus-data.h @@ -17,10 +17,10 @@ #ifndef __DBUS_DATA_H__ #define __DBUS_DATA_H__ 1 -#define INDICATOR_MESSAGES_DBUS_NAME "com.canonical.indicator.messages" -#define INDICATOR_MESSAGES_DBUS_OBJECT "/com/canonical/indicator/messages" +#define INDICATOR_MESSAGES_DBUS_NAME "org.ayatana.indicator.messages" +#define INDICATOR_MESSAGES_DBUS_OBJECT "/org/ayatana/indicator/messages" -#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/com/canonical/indicator/messages/service" -#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "com.canonical.indicator.messages.service" +#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/org/ayatana/indicator/messages/service" +#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "org.ayatana.indicator.messages.service" #endif /* __DBUS_DATA_H__ */ diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index c762735..9c56d6b 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -114,7 +114,7 @@ im_desktop_menu_app_added (ImApplicationList *applist, GVariant *icon; item = g_menu_item_new (g_app_info_get_name (G_APP_INFO (app_info)), "launch"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.application"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.application"); icon = g_icon_serialize (g_app_info_get_icon (G_APP_INFO (app_info))); if (icon) @@ -146,7 +146,7 @@ im_desktop_menu_app_added (ImApplicationList *applist, label = indicator_desktop_shortcuts_nick_get_name (shortcuts, *nicks); item = g_menu_item_new (label, *nicks); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.application"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.application"); g_menu_append_item (app_section, item); g_free (label); @@ -209,7 +209,7 @@ im_desktop_menu_source_section_insert_source (GMenu *source_section, action = g_strconcat ("src.", source_id, NULL); item = g_menu_item_new (label, NULL); g_menu_item_set_action_and_target_value (item, action, NULL); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.source"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.source"); if (serialized_icon) g_menu_item_set_attribute_value (item, "icon", serialized_icon); diff --git a/src/im-menu.c b/src/im-menu.c index 0c39b97..0b98512 100644 --- a/src/im-menu.c +++ b/src/im-menu.c @@ -131,7 +131,7 @@ im_menu_init (ImMenu *menu) priv->as = im_accounts_service_ref_default(); root = g_menu_item_new (NULL, "indicator.messages"); - g_menu_item_set_attribute (root, "x-canonical-type", "s", "com.canonical.indicator.root"); + g_menu_item_set_attribute (root, "x-canonical-type", "s", "org.ayatana.indicator.root"); g_menu_item_set_attribute (root, "action-namespace", "s", "indicator"); g_menu_item_set_submenu (root, G_MENU_MODEL (priv->menu)); g_menu_append_item (priv->toplevel_menu, root); diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c index 58a23ff..01d25bb 100644 --- a/src/im-phone-menu.c +++ b/src/im-phone-menu.c @@ -74,7 +74,7 @@ im_phone_menu_update_clear_section (ImPhoneMenu *menu) GMenuItem *item; item = g_menu_item_new (_("Clear All"), "remove-all"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.button"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.button"); g_menu_append_item (menu->clear_section, item); g_object_unref (item); @@ -191,7 +191,7 @@ im_phone_menu_add_message (ImPhoneMenu *menu, item = g_menu_item_new (title, NULL); g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE)); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.messageitem"); g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id); if (show_data) g_menu_item_set_attribute (item, "x-canonical-subtitle", "s", subtitle); @@ -262,7 +262,7 @@ im_phone_menu_add_source (ImPhoneMenu *menu, item = g_menu_item_new (label, NULL); g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE)); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.sourceitem"); if (iconstr) g_menu_item_set_attribute (item, "x-canonical-icon", "s", iconstr); diff --git a/src/messages-service.c b/src/messages-service.c index d2c7e92..572597c 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -244,7 +244,7 @@ main (int argc, char ** argv) if (argc >= 2 && g_str_equal (argv[1], "--replace")) flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE; - g_bus_own_name (G_BUS_TYPE_SESSION, "com.canonical.indicator.messages", flags, + g_bus_own_name (G_BUS_TYPE_SESSION, "org.ayatana.indicator.messages", flags, on_bus_acquired, NULL, on_name_lost, mainloop, NULL); g_signal_connect (messages_service, "handle-register-application", @@ -260,7 +260,7 @@ main (int argc, char ** argv) g_signal_connect (applications, "status-set", G_CALLBACK (status_set_by_user), NULL); - settings = g_settings_new ("com.canonical.indicator.messages"); + settings = g_settings_new ("org.ayatana.indicator.messages"); { gchar **app_ids; gchar **id; diff --git a/tests/Makefile.am b/tests/Makefile.am index bd559fd..7e23adc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,3 @@ - CLEANFILES= check_LTLIBRARIES = libgtest.la check_PROGRAMS = test-gactionmuxer @@ -47,7 +46,7 @@ indicator_test_SOURCES = \ indicator-test.cpp indicator_test_CPPFLAGS = \ - -DINDICATOR_MESSAGES_SERVICE_BINARY="\"$(abs_top_builddir)/src/indicator-messages-service\"" \ + -DINDICATOR_MESSAGES_SERVICE_BINARY="\"$(abs_top_builddir)/src/ayatana-indicator-messages-service\"" \ -DSCHEMA_DIR="\"$(SCHEMA_COMPILED_DIR)\"" \ -DXDG_DATA_DIRS="\"$(abs_srcdir)/\"" \ -I$(top_srcdir)/libmessaging-menu \ @@ -91,7 +90,7 @@ libindicator_messages_service_la_SOURCES = \ $(top_srcdir)/src/dbus-data.h libindicator_messages_service_ladir = \ - $(includedir)/libindicator-messages-service/ + $(includedir)/libayatana-indicator-messages-service/ libindicator_messages_service_la_CFLAGS = \ $(APPLET_CFLAGS) \ @@ -103,7 +102,7 @@ libindicator_messages_service_la_CFLAGS = \ -Wl,-z,defs \ -Wl,--as-needed \ -Werror -Wno-error=deprecated-declarations \ - -DG_LOG_DOMAIN=\"Indicator-Messages\" + -DG_LOG_DOMAIN=\"Ayatana-Indicator-Messages\" libindicator_messages_service_la_LIBADD = \ $(APPLET_LIBS) diff --git a/tests/accounts-service-mock.h b/tests/accounts-service-mock.h index 301fcd4..268183a 100644 --- a/tests/accounts-service-mock.h +++ b/tests/accounts-service-mock.h @@ -60,7 +60,7 @@ class AccountsServiceMock "SetXHasMessages", G_VARIANT_TYPE_BOOLEAN, nullptr, "", NULL); - soundobj = dbus_test_dbus_mock_get_object(mock, "/user", "com.canonical.indicator.sound.AccountsService", NULL); + soundobj = dbus_test_dbus_mock_get_object(mock, "/user", "org.ayatana.indicator.sound.AccountsService", NULL); dbus_test_dbus_mock_object_add_property(mock, soundobj, "Timestamp", G_VARIANT_TYPE_UINT64, g_variant_new_uint64(0), NULL); diff --git a/tests/indicator-test.cpp b/tests/indicator-test.cpp index 0991db5..6c256fb 100644 --- a/tests/indicator-test.cpp +++ b/tests/indicator-test.cpp @@ -30,7 +30,7 @@ class IndicatorTest : public IndicatorFixture { protected: IndicatorTest (void) : - IndicatorFixture(INDICATOR_MESSAGES_SERVICE_BINARY, "com.canonical.indicator.messages") + IndicatorFixture(INDICATOR_MESSAGES_SERVICE_BINARY, "org.ayatana.indicator.messages") { } @@ -60,7 +60,7 @@ protected: TEST_F(IndicatorTest, RootAction) { - setActions("/com/canonical/indicator/messages"); + setActions("/org/ayatana/indicator/messages"); EXPECT_EVENTUALLY_ACTION_EXISTS("messages"); EXPECT_ACTION_STATE_TYPE("messages", G_VARIANT_TYPE("a{sv}")); @@ -68,7 +68,7 @@ TEST_F(IndicatorTest, RootAction) { } TEST_F(IndicatorTest, SingleMessage) { - setActions("/com/canonical/indicator/messages"); + setActions("/org/ayatana/indicator/messages"); auto app = std::shared_ptr<MessagingMenuApp>(messaging_menu_app_new("test.desktop"), [](MessagingMenuApp * app) { g_clear_object(&app); }); ASSERT_NE(nullptr, app); @@ -87,9 +87,9 @@ TEST_F(IndicatorTest, SingleMessage) { EXPECT_EVENTUALLY_ACTION_EXISTS("test.msg.testid"); - setMenu("/com/canonical/indicator/messages/phone"); + setMenu("/org/ayatana/indicator/messages/phone"); - EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "x-canonical-type", "com.canonical.indicator.messages.messageitem"); + EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "x-canonical-type", "org.ayatana.indicator.messages.messageitem"); EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Test Title"); EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "x-canonical-message-id", "testid"); EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "x-canonical-subtitle", "A subtitle too"); @@ -103,7 +103,7 @@ messageReplyActivate (GObject * obj, gchar * name, GVariant * value, gpointer us } TEST_F(IndicatorTest, MessageReply) { - setActions("/com/canonical/indicator/messages"); + setActions("/org/ayatana/indicator/messages"); auto app = std::shared_ptr<MessagingMenuApp>(messaging_menu_app_new("test.desktop"), [](MessagingMenuApp * app) { g_clear_object(&app); }); ASSERT_NE(nullptr, app); @@ -131,9 +131,9 @@ TEST_F(IndicatorTest, MessageReply) { EXPECT_ACTION_ENABLED("remove-all", true); - setMenu("/com/canonical/indicator/messages/phone"); + setMenu("/org/ayatana/indicator/messages/phone"); - EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "x-canonical-type", "com.canonical.indicator.messages.messageitem"); + EXPECT_EVENTUALLY_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "x-canonical-type", "org.ayatana.indicator.messages.messageitem"); std::string activateResponse; g_signal_connect(msg.get(), "activate", G_CALLBACK(messageReplyActivate), &activateResponse); @@ -149,7 +149,7 @@ TEST_F(IndicatorTest, IconNotification) { auto normalicon = std::shared_ptr<GVariant>(g_variant_ref_sink(g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-offline', 'indicator-messages', 'indicator']>)>, 'title': <'Notifications'>, 'accessible-desc': <'Messages'>, 'visible': <true>}")), [](GVariant *var) {if (var != nullptr) g_variant_unref(var); }); auto blueicon = std::shared_ptr<GVariant>(g_variant_ref_sink(g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-new-offline', 'indicator-messages-new', 'indicator-messages', 'indicator']>)>, 'title': <'Notifications'>, 'accessible-desc': <'New Messages'>, 'visible': <true>}")), [](GVariant *var) {if (var != nullptr) g_variant_unref(var); }); - setActions("/com/canonical/indicator/messages"); + setActions("/org/ayatana/indicator/messages"); auto app = std::shared_ptr<MessagingMenuApp>(messaging_menu_app_new("test.desktop"), [](MessagingMenuApp * app) { g_clear_object(&app); }); ASSERT_NE(nullptr, app); diff --git a/tests/test-client.py b/tests/test-client.py index 0dbf868..5baa795 100755 --- a/tests/test-client.py +++ b/tests/test-client.py @@ -16,9 +16,9 @@ class MessagingMenuTest(dbusmock.DBusTestCase): klass.bus = klass.get_dbus(False) def setUp(self): - name = 'com.canonical.indicator.messages' - obj_path = '/com/canonical/indicator/messages/service' - iface = 'com.canonical.indicator.messages.service' + name = 'org.ayatana.indicator.messages' + obj_path = '/org/ayatana/indicator/messages/service' + iface = 'org.ayatana.indicator.messages.service' self.messaging_service = self.spawn_server(name, obj_path, iface, stdout=subprocess.PIPE) self.mock = dbus.Interface(self.bus.get_object(name, obj_path), dbusmock.MOCK_IFACE) diff --git a/tests/test-gactionmuxer.cpp b/tests/test-gactionmuxer.cpp index 5c98c90..f11f50d 100644 --- a/tests/test-gactionmuxer.cpp +++ b/tests/test-gactionmuxer.cpp @@ -46,11 +46,11 @@ TEST(GActionMuxerTest, Sanity) { g_type_init (); #endif - g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*G_IS_ACTION_MUXER*"); + g_test_expect_message ("Ayatana-Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*G_IS_ACTION_MUXER*"); g_action_muxer_insert (NULL, NULL, NULL); g_test_assert_expected_messages (); - g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*G_IS_ACTION_MUXER*"); + g_test_expect_message ("Ayatana-Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*G_IS_ACTION_MUXER*"); g_action_muxer_remove (NULL, NULL); g_test_assert_expected_messages (); @@ -59,15 +59,15 @@ TEST(GActionMuxerTest, Sanity) { g_action_muxer_insert (muxer, NULL, NULL); g_action_muxer_remove (muxer, NULL); - g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); + g_test_expect_message ("Ayatana-Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); EXPECT_FALSE (g_action_group_has_action (G_ACTION_GROUP (muxer), NULL)); g_test_assert_expected_messages (); - g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); + g_test_expect_message ("Ayatana-Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); EXPECT_FALSE (g_action_group_get_action_enabled (G_ACTION_GROUP (muxer), NULL)); g_test_assert_expected_messages (); - g_test_expect_message ("Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); + g_test_expect_message ("Ayatana-Indicator-Messages", G_LOG_LEVEL_CRITICAL, "*NULL*"); EXPECT_FALSE (g_action_group_query_action (G_ACTION_GROUP (muxer), NULL, NULL, NULL, NULL, NULL, NULL)); g_test_assert_expected_messages (); diff --git a/update-po.sh b/update-po.sh index 4a2ca82..11c5e2a 100755 --- a/update-po.sh +++ b/update-po.sh @@ -15,9 +15,6 @@ set -x # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/> -# -# On Debian systems, the complete text of the GNU General -# Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". GETTEXT_DOMAIN=$(cat configure.ac | grep -E "^GETTEXT_PACKAGE=" | sed -e 's/GETTEXT_PACKAGE=//') diff --git a/update-pot.sh b/update-pot.sh index 990fe45..7e5868c 100755 --- a/update-pot.sh +++ b/update-pot.sh @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/> -# -# On Debian systems, the complete text of the GNU General -# Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". GETTEXT_DOMAIN=$(cat configure.ac | grep -E "^GETTEXT_PACKAGE=" | sed -e 's/GETTEXT_PACKAGE=//') |