From ce013dbdf025cb3005a0532e2e6678f0632741ef Mon Sep 17 00:00:00 2001 From: spenap Date: Wed, 28 Oct 2009 22:44:07 +0000 Subject: [PATCH] Changed source template from the C++ one, in esbox, to the C one. Added librest as a dependence in autoconf (configure.ac) Lots of work left, but this should be a good start. git-svn-id: file:///svnroot/maevies/trunk@5 a96798e0-47ce-444a-94a4-1d14e63744fc --- COPYING | 695 ++----------------------------------- Makefile.am | 57 +-- autogen.sh | 2 +- configure.ac | 71 ++-- data/Makefile.am | 23 ++ data/Makefile.in | 404 +++++++++++++++++++++ data/com.nokia.maevies.service.in | 3 + data/maevies.desktop.in | 12 + debian/changelog | 7 +- debian/compat | 2 +- debian/control | 11 +- debian/copyright | 8 +- debian/postinst | 3 + debian/rules | 59 ++-- examples/Makefile | 6 +- examples/README | 2 + examples/gtranslate.c | 41 +++ examples/gtranslate.cpp | 47 --- po/ChangeLog | 1 + po/LINGUAS | 2 - po/POTFILES.in | 3 +- po/en_GB.po | 25 -- po/pt_BR.po | 25 -- src/IMovieInfoProvider.h | 22 -- src/IMovieLocationProvider.h | 23 -- src/IMovieStingerProvider.h | 26 -- src/Makefile.am | 31 +- src/WATCProvider.cpp | 17 - src/WATCProvider.h | 20 -- src/localisation.h | 80 +++++ src/main.c | 114 ++++++ src/main.cpp | 68 ---- src/mywindow.cpp | 62 ---- src/mywindow.h | 50 --- 34 files changed, 830 insertions(+), 1192 deletions(-) create mode 100644 data/Makefile.am create mode 100644 data/Makefile.in create mode 100644 data/com.nokia.maevies.service.in create mode 100644 data/maevies.desktop.in create mode 100644 debian/postinst create mode 100644 examples/README create mode 100644 examples/gtranslate.c delete mode 100644 examples/gtranslate.cpp create mode 100644 po/ChangeLog delete mode 100644 po/LINGUAS delete mode 100644 po/en_GB.po delete mode 100644 po/pt_BR.po delete mode 100644 src/IMovieInfoProvider.h delete mode 100644 src/IMovieLocationProvider.h delete mode 100644 src/IMovieStingerProvider.h delete mode 100644 src/WATCProvider.cpp delete mode 100644 src/WATCProvider.h create mode 100644 src/localisation.h create mode 100644 src/main.c delete mode 100644 src/main.cpp delete mode 100644 src/mywindow.cpp delete mode 100644 src/mywindow.h diff --git a/COPYING b/COPYING index 94a9ed0..83af310 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. +The code examples copyrighted by Nokia Corporation that are included to +this material are licensed to you under following MIT-style License: + +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 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. diff --git a/Makefile.am b/Makefile.am index 98f3438..dbb2231 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,30 +1,37 @@ -# Copyright (c) 2007-2008 INdT, (c) 2009 Nokia. -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . +# List extras to package +EXTRA_DIST = \ + autogen.sh \ + debian/postinst \ + debian/copyright \ + debian/control \ + debian/rules \ + debian/changelog \ + debian/postinst \ + src/* -AUTOMAKE_OPTIONS = foreign +# Sub directories +SUBDIRS = data po -SUBDIRS = src po +# Includes +INCLUDES = $(DEPS_CFLAGS) $(HILDON_CFLAGS) $(OSSO_CFLAGS) -INTLTOOL_FILES = intltool-extract.in \ - intltool-merge.in \ - intltool-update.in +# Binary +bin_PROGRAMS = \ + maevies +# /Binary -EXTRA_DIST = $(INTLTOOL_FILES) \ - debian/changelog \ - debian/control \ - debian/copyright \ - debian/compat \ - debian/rules \ - src/* +# Sources +maevies_SOURCES = \ + src/main.c +# /Sources + +# LDADD +maevies_LDADD = \ + $(DEPS_LIBS) $(HILDON_LIBS) $(OSSO_LIBS) +# /LDADD +deb: dist + -mkdir $(top_builddir)/debian-build + cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz + cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot + rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) diff --git a/autogen.sh b/autogen.sh index 91c9d13..c0917f5 100644 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,4 @@ aclocal-1.8 autoconf autoheader automake-1.8 --add-missing --copy --foreign -./configure --enable-maintainer-mode \ No newline at end of file +./configure --enable-maintainer-mode diff --git a/configure.ac b/configure.ac index b19dec7..205c42a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,47 @@ -AC_INIT(helloworld-i18n, 0.1) -AC_PREREQ(2.59) +dnl Process this file with autoconf to produce a configure script. -AM_INIT_AUTOMAKE([1.7.9]) -AC_CONFIG_HEADERS([config.h]) +AC_INIT(maevies,0.1) +AM_CONFIG_HEADER(config.h) -AC_GNU_SOURCE -AC_CANONICAL_HOST -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([1.7.9]) +AC_PROG_CC +AC_STDC_HEADERS AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_CXX +dnl AC_PREFIX_DEFAULT(/var/lib/install/usr) +AC_PREFIX_DEFAULT(/usr) + +CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations" + +PKG_CHECK_MODULES(DEPS, gtk+-2.0 >= 2.2 glib-2.0 >= 2.2 gnome-vfs-2.0 >= 2.2 rest >= 0.6) +AC_SUBST(DEPS_CFLAGS) +AC_SUBST(DEPS_LIBS) + +PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.8.4 hildon-fm-2 >= 0.8.4) +AC_SUBST(HILDON_LIBS) +AC_SUBST(HILDON_CFLAGS) + +PKG_CHECK_MODULES(OSSO, libosso >= 0.8.4) +AC_SUBST(OSSO_LIBS) +AC_SUBST(OSSO_CFLAGS) + +PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.4) + +localedir=`$PKG_CONFIG osso-af-settings --variable=localedir` +hildondesktopentrydir=/usr/share/dbus-1/services +hildoncpdesktopentrydir=/usr/ +hildonstatusbarplugindir=`$PKG_CONFIG hildon-status-bar-lib --variable=pluginlibdir` +hildoncplibdir=`$PKG_CONFIG hildon-control-panel --variable=pluginlibdir` +hildoniconthemedir=$HOME/.icons/hicolor + +AC_SUBST(localedir) +AC_DEFINE_UNQUOTED(localedir,"$localedir",[localedir]) +AC_SUBST(desktopentrydir) +AC_SUBST(hildondesktopentrydir) +AC_SUBST(hildoncpdesktopentrydir) +AC_SUBST(hildonstatusbarplugindir) +AC_SUBST(hildoncplibdir) +AC_SUBST(hildoniconthemedir) IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE="$PACKAGE_NAME" @@ -19,19 +50,17 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [The domain to use with gettext]) AM_GLIB_GNU_GETTEXT -HELLOWORLD_LOCALEDIR=[${datadir}/locale] -AC_SUBST(HELLOWORLD_LOCALEDIR) - -AC_CONFIG_FILES([Makefile - src/Makefile - po/Makefile.in]) +USE_NLS=yes +AC_SUBST(USE_NLS) -PKG_CHECK_MODULES(LIBHILDONMM, hildonmm >= 0.9.6) -AC_SUBST(LIBHILDONMM_CFLAGS) -AC_SUBST(LIBHILDONMM_LIBS) -PKG_CHECK_MODULES(LIBOSSO, libosso >= 2.20) -AC_SUBST(LIBOSSO_CFLAGS) -AC_SUBST(LIBOSSO_LIBS) +AC_CONFIG_FILES([ + Makefile + src/Makefile + data/Makefile + po/Makefile.in + data/com.nokia.maevies.service + data/maevies.desktop +]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..33fe157 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,23 @@ +# This software is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA +# + +dbusdir=$(datadir)/dbus-1/services +dbus_DATA=com.nokia.maevies.service + +desktopdir=$(datadir)/applications/hildon +desktop_DATA = maevies.desktop + +EXTRA_DIST = $(dbus_DATA) $(desktop_DATA) diff --git a/data/Makefile.in b/data/Makefile.in new file mode 100644 index 0000000..3fbd248 --- /dev/null +++ b/data/Makefile.in @@ -0,0 +1,404 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This software is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License +# as published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA +# + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = data +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/com.nokia.maevies.service.in \ + $(srcdir)/maevies.desktop.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = com.nokia.maevies.service maevies.desktop +SOURCES = +DIST_SOURCES = +am__installdirs = "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(desktopdir)" +dbusDATA_INSTALL = $(INSTALL_DATA) +desktopDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dbus_DATA) $(desktop_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEPS_CFLAGS = @DEPS_CFLAGS@ +DEPS_LIBS = @DEPS_LIBS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HILDON_CFLAGS = @HILDON_CFLAGS@ +HILDON_LIBS = @HILDON_LIBS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +OSSOSETTINGS_CFLAGS = @OSSOSETTINGS_CFLAGS@ +OSSOSETTINGS_LIBS = @OSSOSETTINGS_LIBS@ +OSSO_CFLAGS = @OSSO_CFLAGS@ +OSSO_LIBS = @OSSO_LIBS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +ac_ct_CC = @ac_ct_CC@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build_alias = @build_alias@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopentrydir = @desktopentrydir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +hildoncpdesktopentrydir = @hildoncpdesktopentrydir@ +hildoncplibdir = @hildoncplibdir@ +hildondesktopentrydir = @hildondesktopentrydir@ +hildoniconthemedir = @hildoniconthemedir@ +hildonstatusbarplugindir = @hildonstatusbarplugindir@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +dbusdir = $(datadir)/dbus-1/services +dbus_DATA = com.nokia.maevies.service +desktopdir = $(datadir)/applications/hildon +desktop_DATA = maevies.desktop +EXTRA_DIST = $(dbus_DATA) $(desktop_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign data/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +com.nokia.maevies.service: $(top_builddir)/config.status $(srcdir)/com.nokia.maevies.service.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +maevies.desktop: $(top_builddir)/config.status $(srcdir)/maevies.desktop.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +uninstall-info-am: +install-dbusDATA: $(dbus_DATA) + @$(NORMAL_INSTALL) + test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)" + @list='$(dbus_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \ + $(dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \ + done + +uninstall-dbusDATA: + @$(NORMAL_UNINSTALL) + @list='$(dbus_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(dbusdir)/$$f'"; \ + rm -f "$(DESTDIR)$(dbusdir)/$$f"; \ + done +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)" + @list='$(desktop_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ + $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ + rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(desktopdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-dbusDATA install-desktopDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dbusDATA uninstall-desktopDATA \ + uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dbusDATA install-desktopDATA install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dbusDATA uninstall-desktopDATA uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/data/com.nokia.maevies.service.in b/data/com.nokia.maevies.service.in new file mode 100644 index 0000000..7739797 --- /dev/null +++ b/data/com.nokia.maevies.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=com.nokia.maevies +Exec=@prefix@/bin/maevies diff --git a/data/maevies.desktop.in b/data/maevies.desktop.in new file mode 100644 index 0000000..b112717 --- /dev/null +++ b/data/maevies.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Name=Maevies +Exec=@prefix@/bin/maevies +Icon=qgn_list_documents +X-Window-Icon=maemopad-window +X-Window-Icon-Dimmed=maemopad-window-dimmed +X-Osso-Service=maevies +X-Osso-Type=application/x-executable +X-HildonDesk-ShowInToolbar=true diff --git a/debian/changelog b/debian/changelog index 7ca6788..d51b420 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -maevies (0.1) unstable; urgency=low +maevies (1.0.0) unstable; urgency=low - * Initial release (Closes: #nnnn) - - -- Simón Pena Thu, 1 Jan 2009 00:00:00 -0000 + * Created from template. + -- Simón Pena Thu, 24 Apr 2008 17:22:00 -0600 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7813681 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +5 \ No newline at end of file diff --git a/debian/control b/debian/control index 351a373..4ef9976 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,12 @@ Source: maevies -Section: unknown -Priority: extra +Section: user/other +Priority: optional Maintainer: Simón Pena -Build-Depends: debhelper (>= 5), libhildonmm-dev ( >= 2.1.1 ), libosso-dev ( >= 2.21 ) +Build-Depends: debhelper (>= 5), intltool, hildon-base-lib-dev, hildon-libs-dev, hildon-fm-dev, + libgtk2.0-dev, libosso-gnomevfs2-dev, libglib2.0-dev, libdbus-glib-1-dev, libosso-dev Standards-Version: 3.7.2 Package: maevies Architecture: any -Depends: ${shlibs:Depends} ${misc:Depends} -Description: Maevies: a movie advisor for Maemo \ No newline at end of file +#Depends: maemo +Description: A movie advisor for Maemo diff --git a/debian/copyright b/debian/copyright index e384789..093d051 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,4 @@ -Copyright: (c) 2009 Nokia Corporation - -This package is licensed under the GNU LGPL license -For further information please refer to the COPYING file - +Copyright (c) 2007-2008 INdT, (c) 2009 Nokia. +This code example is licensed under a MIT-style license, +that can be found in the file called "COPYING" in the package diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..3e78d9a --- /dev/null +++ b/debian/postinst @@ -0,0 +1,3 @@ +#!/bin/sh +#update the icon cache +gtk-update-icon-cache -f /usr/share/icons/hicolor diff --git a/debian/rules b/debian/rules index 183465b..88fd184 100644 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,29 @@ #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + CFLAGS = -Wall -g +PACKAGENAME = maevies ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif - -CXXFLAGS = $(CFLAGS) +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif configure: configure-stamp configure-stamp: @@ -29,34 +35,34 @@ configure-stamp: build: build-stamp -build-stamp: configure-stamp +build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. $(MAKE) - #docbook-to-man debian/maevies.sgml > maevies.1 - - touch $@ + touch build-stamp clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp + rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + mv debian/rules debian/rules.save + -$(MAKE) distclean + mv debian/rules.save debian/rules - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_clean -k dh_installdirs - # Add here commands to install the package into debian/maevies. - $(MAKE) DESTDIR=$(CURDIR)/debian/maevies install - + # Add here commands to install the package into debian/$(PACKAGENAME) + $(MAKE) DESTDIR=$(CURDIR)/debian/$(PACKAGENAME) install + # Build architecture-independent files here. binary-indep: build install @@ -66,27 +72,10 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol @@ -94,4 +83,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install diff --git a/examples/Makefile b/examples/Makefile index 5ab5c43..136844d 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,4 +1,4 @@ -CC = g++ +CC = gcc LIBS = `pkg-config rest --libs` @@ -7,8 +7,8 @@ FLAGS = `pkg-config rest --cflags` gtranslate: gtranslate.o $(CC) -o gtranslate gtranslate.o $(LIBS) -gtranslate.o: gtranslate.cpp - $(CC) -c gtranslate.cpp $(FLAGS) +gtranslate.o: gtranslate.c + $(CC) -c gtranslate.c $(FLAGS) all: gtranslate diff --git a/examples/README b/examples/README new file mode 100644 index 0000000..c95ed1d --- /dev/null +++ b/examples/README @@ -0,0 +1,2 @@ +Librest samples on moblin's git: +http://git.moblin.org/cgit.cgi/librest/tree/examples diff --git a/examples/gtranslate.c b/examples/gtranslate.c new file mode 100644 index 0000000..c2ca8ef --- /dev/null +++ b/examples/gtranslate.c @@ -0,0 +1,41 @@ +#include +#include +#include +#include + +int main(int argc, char **argv) { + + RestProxy *proxy; + RestProxyCall *call; + const gchar *payload; + const char *text; + gssize len; + + g_thread_init(NULL); + g_type_init(); + + if (argc > 1) { + text = argv[1]; + } else { + text = "Hola Mundo"; + } + + proxy = rest_proxy_new( + "http://ajax.googleapis.com/ajax/services/language/translate", + FALSE); + call = rest_proxy_new_call(proxy); + + rest_proxy_call_add_params(call, + "v", "1.0", + "q", text, + "langpair","es|en", + NULL); + rest_proxy_call_run(call, NULL, NULL); + + payload = rest_proxy_call_get_payload(call); + len = rest_proxy_call_get_payload_length(call); + write(1, payload, len); + printf("\n"); + g_object_unref(call); + g_object_unref(proxy); +} diff --git a/examples/gtranslate.cpp b/examples/gtranslate.cpp deleted file mode 100644 index 68a2ab3..0000000 --- a/examples/gtranslate.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include -#include -#include - -using namespace std; - -int main(int argc, char **argv) -{ - GError *error = NULL; - RestProxy *proxy; - RestProxyCall *call; - GMainLoop *loop; - const gchar *payload; - const char *text; - gssize len; - - g_thread_init (NULL); - g_type_init (); - - if (argc>1) - { - text=argv[1]; - } - else - { - text="Hola Mundo"; - } - - proxy = rest_proxy_new ("http://ajax.googleapis.com/ajax/services/language/translate", FALSE); - call = rest_proxy_new_call (proxy); - - rest_proxy_call_add_params (call, - "v", "1.0", - "q", text, - "langpair", "es|en", - NULL); - rest_proxy_call_run (call, NULL, NULL); - - payload = rest_proxy_call_get_payload (call); - len = rest_proxy_call_get_payload_length (call); - write (1, payload, len); - cout << endl; - - g_object_unref (call); - g_object_unref (proxy); -} diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1 @@ + diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 4bfc21a..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -en_GB -pt_BR diff --git a/po/POTFILES.in b/po/POTFILES.in index 3b5652f..e723152 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,2 +1 @@ -src/main.cpp -src/mywindow.cpp +src/main.c diff --git a/po/en_GB.po b/po/en_GB.po deleted file mode 100644 index 75d7f4f..0000000 --- a/po/en_GB.po +++ /dev/null @@ -1,25 +0,0 @@ -# Maevies: a movie advisor for Maemo. -# Copyright (C) 2009 Simón Pena -# This file is distributed under the same license as the maevies package. -# Simón Pena , 2009. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: helloworld_i18n\n" -"Report-Msgid-Bugs-To: bulfaiter@gmail.com\n" -"POT-Creation-Date: 2009-09-01 12:00-0600\n" -"PO-Revision-Date: 2009-09-01 12:00-0600\n" -"Last-Translator: Simón Pena \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/mywindow.cpp:35 -msgid "Say Hello" -msgstr "" - -#. Create and show a "Hello World" dialog -#: ../src/mywindow.cpp:60 -msgid "Hello World!!!" -msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po deleted file mode 100644 index b96f144..0000000 --- a/po/pt_BR.po +++ /dev/null @@ -1,25 +0,0 @@ -# Maevies: a movie advisor for Maemo. -# Copyright (C) 2009 Simón Pena -# This file is distributed under the same license as the maevies package. -# Simón Pena , 2009. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: helloworld_i18n\n" -"Report-Msgid-Bugs-To: bulfaiter@gmail.com\n" -"POT-Creation-Date: 2009-09-01 12:00-0600\n" -"PO-Revision-Date: 2009-09-01 12:00-0600\n" -"Last-Translator: Simón Pena \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/mywindow.cpp:35 -msgid "Say Hello" -msgstr "Diga Alô" - -#. Create and show a "Hello World" dialog -#: ../src/mywindow.cpp:60 -msgid "Hello World!!!" -msgstr "" diff --git a/src/IMovieInfoProvider.h b/src/IMovieInfoProvider.h deleted file mode 100644 index 7a8bfcf..0000000 --- a/src/IMovieInfoProvider.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of Maevies - * Copyright (C) 2009 Simón Pena - * - * 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. - * - */ -#ifndef IMOVIEINFOPROVIDER_H -#define IMOVIEINFOPROVIDER_H - -class IMovieInfoProvider { -}; - -#endif diff --git a/src/IMovieLocationProvider.h b/src/IMovieLocationProvider.h deleted file mode 100644 index 996871b..0000000 --- a/src/IMovieLocationProvider.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of Maevies - * Copyright (C) 2009 Simón Pena - * - * 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. - * - */ -#ifndef IMOVIELOCATIONPROVIDER_H -#define IMOVIELOCATIONPROVIDER_H - -class IMovieLocationProvider -{ -}; - -#endif diff --git a/src/IMovieStingerProvider.h b/src/IMovieStingerProvider.h deleted file mode 100644 index d900f2d..0000000 --- a/src/IMovieStingerProvider.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of Maevies - * Copyright (C) 2009 Simón Pena - * - * 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. - * - */ -#ifndef IMOVIESTINGERPROVIDER_H -#define IMOVIESTINGERPROVIDER_H - -#include - -class IMovieStingerProvider { -public: - virtual gboolean hasStingers()=0; -}; - -#endif diff --git a/src/Makefile.am b/src/Makefile.am index 5be42e4..18de266 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,29 +1,2 @@ -# Copyright (c) 2007-2008 INdT. -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see . - -AUTOMAKE_OPTIONS = foreign - -bin_PROGRAMS = maevies - -maevies_SOURCES = main.cpp \ - mywindow.cpp \ - mywindow.h \ - WATCProvider.cpp \ - WATCProvider.h \ - IMovieStingerProvider.h - - - -maevies_LDADD = $(LIBHILDONMM_LIBS) $(LIBOSSO_LIBS) -maevies_CXXFLAGS = $(LIBHILDONMM_CFLAGS) $(LIBOSSO_CFLAGS) -DHELLOWORLD_LOCALEDIR=\"${HELLOWORLD_LOCALEDIR}\" +EXTRA_DIST = \ + main.c diff --git a/src/WATCProvider.cpp b/src/WATCProvider.cpp deleted file mode 100644 index f259cf7..0000000 --- a/src/WATCProvider.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* - * WATCProvider.cpp - * - * Created on: 26-oct-2009 - * Author: spenap - */ - -#include "WATCProvider.h" - -WATCProvider::WATCProvider() { - // TODO Auto-generated constructor stub - -} - -WATCProvider::~WATCProvider() { - // TODO Auto-generated destructor stub -} diff --git a/src/WATCProvider.h b/src/WATCProvider.h deleted file mode 100644 index 1b4b2c5..0000000 --- a/src/WATCProvider.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * WATCProvider.h - * - * Created on: 26-oct-2009 - * Author: spenap - */ - -#ifndef WATCPROVIDER_H_ -#define WATCPROVIDER_H_ - -#include "IMovieStingerProvider.h" -#include - -class WATCProvider: public IMovieStingerProvider { -public: - WATCProvider(); - virtual ~WATCProvider(); -}; - -#endif /* WATCPROVIDER_H_ */ diff --git a/src/localisation.h b/src/localisation.h new file mode 100644 index 0000000..719da34 --- /dev/null +++ b/src/localisation.h @@ -0,0 +1,80 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 INdT, (c) 2009 Nokia. + * + * This code example is licensed under a MIT-style license, + * that can be found in the file called "COPYING" in the package + * + */ + +/* + ============================================================================ + Name : localisation.h + Author : Simón Pena + Version : 0.1 + Description : Header with localization facilities + ============================================================================ + */ +#ifndef LOCALISATION_H +#define LOCALISATION_H + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#ifdef ENABLE_NLS +#include +#include +#define _(String) gettext(String) +#ifdef gettext_noop +#define N_(String) gettext_noop(String) +#else +#define N_(String) (String) +#endif +#define locale_init() setlocale(LC_ALL, "");\ + bindtextdomain(GETTEXT_PACKAGE, localedir);\ + textdomain(GETTEXT_PACKAGE); +#else /* NLS is disabled */ +#define locale_init() +#define _(String) (String) +#define N_(String) (String) +#define textdomain(String) (String) +#define gettext(String) (String) +#define dgettext(Domain,String) (String) +#define dcgettext(Domain,String,Type) (String) +#define bindtextdomain(Domain,Directory) (Domain) +#define bind_textdomain_codeset(Domain,Codeset) (Codeset) +#endif /* ENABLE_NLS */ + +#endif /* LOCALISATION_H */ +#ifndef LOCALISATION_H +#define LOCALISATION_H + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* HAVE_CONFIG_H */ + +#ifdef ENABLE_NLS +#include +#define _(String) gettext(String) +#ifdef gettext_noop +#define N_(String) gettext_noop(String) +#else +#define N_(String) (String) +#endif +#define locale_init() setlocale(LC_ALL, "");\ + bindtextdomain(GETTEXT_PACKAGE, localedir);\ + textdomain(GETTEXT_PACKAGE); +#else /* NLS is disabled */ +#define locale_init() +#define _(String) (String) +#define N_(String) (String) +#define textdomain(String) (String) +#define gettext(String) (String) +#define dgettext(Domain,String) (String) +#define dcgettext(Domain,String,Type) (String) +#define bindtextdomain(Domain,Directory) (Domain) +#define bind_textdomain_codeset(Domain,Codeset) (Codeset) +#endif /* ENABLE_NLS */ + +#endif /* LOCALISATION_H */ + diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..728f85c --- /dev/null +++ b/src/main.c @@ -0,0 +1,114 @@ +/******************************************************************************* + * Copyright (c) 2007-2008 INdT, (c) 2009 Nokia. + * + * This code example is licensed under a MIT-style license, + * that can be found in the file called "COPYING" in the package + * + */ + +/* + ============================================================================ + Name : main.c + Author : Simón Pena + Version : 0.1 + Description : Hildon GUI Application in C + ============================================================================ + */ +/* Includes */ +#include +#include +#include +#include +#include +#include + +#include "localisation.h" +/* Defines to add the application to dbus and keep it running + * Please do not modify "APP_NAME" (or other defines) to different name + */ +#define APP_NAME "maevies" +#define APP_VER "0.1" +#define APP_SERVICE "com.nokia.maevies" +#define APP_METHOD "/com/nokia/maevies" +/* end defines */ + +static void button_clicked (GtkButton* button, gpointer data) +{ + gtk_main_quit(); +} + +static gint +dbus_callback (const gchar *interface, const gchar *method, + GArray *arguments, gpointer data, + osso_rpc_t *retval) +{ + printf ("dbus: %s, %s\n", interface, method); + + if (!strcmp (method, "top_application")) + gtk_window_present (GTK_WINDOW (data)); + + return DBUS_TYPE_INVALID; +} + +int main( int argc, char* argv[] ) +{ + /* Create needed variables */ + HildonProgram *program; + HildonWindow *window; + GtkWidget *button; + osso_context_t *osso_cont; + osso_return_t ret; + + locale_init(); + + osso_cont = osso_initialize(APP_NAME, APP_VER, TRUE, NULL); + if (osso_cont == NULL) + { + fprintf (stderr, "osso_initialize failed.\n"); + exit (1); + } + + /* Initialize the GTK. */ + gtk_init( &argc, &argv ); + + /* Create the hildon program and setup the title */ + program = HILDON_PROGRAM(hildon_program_get_instance()); + g_set_application_name("Maevies"); + + /* Create HildonWindow and set it to HildonProgram */ + window = HILDON_WINDOW(hildon_window_new()); + hildon_program_add_window(program, window); + + /* Quit program when window is closed. */ + g_signal_connect (G_OBJECT (window), "delete_event", + G_CALLBACK (gtk_main_quit), NULL); + + /* Quit program when window is otherwise destroyed. */ + g_signal_connect (G_OBJECT (window), "destroy", + G_CALLBACK (gtk_main_quit), NULL); + + /* Create button and add it to main view */ + button = gtk_button_new_with_label(_("Hello World!!!")); + gtk_container_add(GTK_CONTAINER(window), + button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (button_clicked), NULL); + + ret = osso_rpc_set_cb_f (osso_cont, + APP_SERVICE, + APP_METHOD, + APP_SERVICE, + dbus_callback, GTK_WIDGET( window )); + if (ret != OSSO_OK) { + fprintf (stderr, "osso_rpc_set_cb_f failed: %d.\n", ret); + exit (1); + } + + /* Begin the main application */ + gtk_widget_show_all ( GTK_WIDGET ( window ) ); + gtk_main(); + + /* Exit */ + return 0; +} diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index 9a04591..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 INdT. - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - */ - -/* - ============================================================================ - Name : main.cc - Author : Simón Pena - Version : 0.1 - Description : CPP Hello World - ============================================================================ - */ - -#include "config.h" - -#include -#include -#include -#include /* Must be after */ - -#include "mywindow.h" - -int main(int argc, char *argv[]) -{ - /* i18n initialization */ - bindtextdomain(GETTEXT_PACKAGE, HELLOWORLD_LOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); - - /* Initialize gtkmm and checks the arguments passed to your application */ - Gtk::Main main_loop(&argc, &argv); - - /* Initialize the hildonmm libraries */ - Hildon::init(); - - /* Initialize libosso environment */ - osso_context_t* osso_context = osso_initialize("maevies", "0.1", TRUE, 0); - if(!osso_context) - std::cerr << "osso_initialize() failed." << std::endl; - - /* Set the application name */ - Glib::set_application_name(PACKAGE_STRING); - - /* Create an object for the main Window and attach it to the program */ - MyWindow window; - Hildon::Program::get_instance()->add_window(window); - - /* Begin the main application */ - main_loop.run(window); - - /* Clean the libosso environment */ - osso_deinitialize(osso_context); - - return 0; -} diff --git a/src/mywindow.cpp b/src/mywindow.cpp deleted file mode 100644 index aae07e7..0000000 --- a/src/mywindow.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 INdT. - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - */ - -/* - ============================================================================ - Name : mywindow.cpp - Author : Simón Pena - Version : 0.1 - Description : CPP Hello World - ============================================================================ - */ - -#include -#include -#include - -#include "mywindow.h" - -/* Class constructor */ -MyWindow::MyWindow() : - m_button_helloworld(_("Say Hello")) -{ - /* Set the menu for the application */ - Hildon::Program::get_instance()->set_common_app_menu(m_main); - - /* Add items to the menu */ - m_main.append(m_button_helloworld); - m_main.show_all(); - - /* Attach the callback function to signal handler */ - m_button_helloworld.signal_activate().connect( - sigc::mem_fun(*this, &MyWindow::on_menu_helloworld)); - - /* Make all menu widgets visible */ - show_all(); -} - -/* Class destructor */ -MyWindow::~MyWindow() -{ -} - -void MyWindow::on_menu_helloworld() -{ - /* Create and show a "Hello World" dialog */ - Hildon::Note helloworld_note(Hildon::NOTE_TYPE_INFORMATION, _("Hello World!!!")); - helloworld_note.run(); -} diff --git a/src/mywindow.h b/src/mywindow.h deleted file mode 100644 index 1e8c08c..0000000 --- a/src/mywindow.h +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 INdT. - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - */ - -/* - ============================================================================ - Name : mywindow.h - Author : Simón Pena - Version : 0.1 - Description : CPP Hello World I18n - ============================================================================ - */ - -#ifndef MYWINDOW_H -#define MYWINDOW_H - -#include -#include - -class MyWindow : public Hildon::Window -{ -public: - MyWindow(); - virtual ~MyWindow(); - -protected: - /* Signal handlers */ - void on_menu_helloworld(); - - /* Menu object */ - Hildon::AppMenu m_main; - - /* The menu buttons */ - Gtk::Button m_button_helloworld; -}; - -#endif /* MYWINDOW_H */ -- 1.7.9.5