From: Andrea Zagli Date: Tue, 4 Nov 2014 20:45:43 +0000 (+0100) Subject: Migrated to libgda5. X-Git-Tag: v0.5.0~1 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=bd58781a5c8c07944b2958267de5f244463b56c8;p=zakconfi%2Flibzakconfi Migrated to libgda5. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b16b44f --- /dev/null +++ b/.gitignore @@ -0,0 +1,54 @@ +compile +*~ +*.rpath +*.pot +*.mo +*.gmo +*.o +*.lo +*.la +*.bak +*.stamp +*.tar.gz +*.pc +*.sed +*.sin +*.header +.libs +.deps +ABOUT-NLS +INSTALL +Makefile +Makefile.in +Makefile.in.in +Makevars +aclocal.m4 +autom4te.cache/ +config.guess +config.log +config.sub +config.h.in +configure +depcomp +gtk-doc.make +install-sh +ltmain.sh +m4/ +missing +config.h +config.status +docs/reference/version.xml +docs/reference/html/ +docs/reference/xml/ +libtool +stamp-h1 +tests/test +POTFILES +mkinstalldirs +stamp-it +intltool-* +Rules-quot +*.exe +tests/test +*.csv +gtk-doc.m4 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + 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 +. diff --git a/autogen.sh b/autogen.sh index 0aae42d..5f56e03 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,98 +1,23 @@ -#!/bin/sh +#!/bin/bash # Run this to generate all the initial makefiles, etc. srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir -PROJECT=libconfi -TEST_TYPE=-f -FILE=configure.ac +PKG_NAME="libconfi" -DIE=0 - -have_libtool=false -if libtoolize --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - case $libtool_version in - 1.4*|1.5*) - have_libtool=true - ;; - esac -fi -if $have_libtool ; then : ; else - echo - echo "You must have libtool 1.4 installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" - DIE=1 -fi - -(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have gtk-doc installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - DIE=1 +(test -f $srcdir/configure.ac \ + && test -d $srcdir/src \ + && test -f $srcdir/src/libconfi.h) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level libconfi directory" + exit 1 } -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" - DIE=1 +which gnome-autogen.sh || { + echo "You need to install gnome-common from GNOME and make" + echo "sure the gnome-autogen.sh script is in your \$PATH." + exit 1 } -if automake --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake - ACLOCAL=aclocal -else - echo - echo "You must have automake 1.7.x installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" - DIE=1 -fi - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$AUTOGEN_SUBDIR_MODE"; then - if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." - fi -fi - -rm -rf autom4te.cache - -# README and INSTALL are required by automake, but may be deleted by clean -# up rules. to get automake to work, simply touch these here, they will be -# regenerated from their corresponding *.in files by ./configure anyway. -touch README INSTALL - -$ACLOCAL || exit $? - -libtoolize --force || exit $? -gtkdocize || exit $? - -autoheader || exit $? - -$AUTOMAKE --add-missing || exit $? -autoconf || exit $? -cd $ORIGDIR || exit $? - -if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? - - echo - echo "Now type 'make' to compile $PROJECT." -fi +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.ac b/configure.ac index 2b4adbe..8d6388b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,14 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libconfi], [0.0.2], [azagli@inwind.it]) +AC_INIT([libconfi], [0.5.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/libconfi.c]) AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE() +AM_INIT_AUTOMAKE(-Wall) + +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AM_MAINTAINER_MODE() AC_CANONICAL_SYSTEM @@ -19,8 +22,7 @@ AC_PROG_LIBTOOL GTK_DOC_CHECK(1.0) # Checks for libraries. -PKG_CHECK_MODULES(LIBCONFI, [glib-2.0 >= 2.8.0 - libgdaobj >= 0.0.2]) +PKG_CHECK_MODULES(LIBCONFI, [libgdaex >= 0.5.0]) AC_SUBST(LIBCONFI_CFLAGS) AC_SUBST(LIBCONFI_LIBS) diff --git a/src/libconfi.c b/src/libconfi.c index 798fcc3..ceea107 100644 --- a/src/libconfi.c +++ b/src/libconfi.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2014 Andrea Zagli * * 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 @@ -57,7 +57,7 @@ static gboolean confi_remove_path_traverse_func (GNode *node, gpointer data); typedef struct _ConfiPrivate ConfiPrivate; struct _ConfiPrivate { - GdaO *gdao; + GdaEx *gdaex; gint id_config; gchar *name, *description, @@ -67,33 +67,7 @@ struct _ConfiPrivate gchar chrquot; }; -GType -confi_get_type (void) -{ - static GType confi_type = 0; - - if (!confi_type) - { - static const GTypeInfo confi_info = - { - sizeof (ConfiClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) confi_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (Confi), - 0, /* n_preallocs */ - (GInstanceInitFunc) confi_init, - NULL - }; - - confi_type = g_type_register_static (G_TYPE_OBJECT, "Confi", - &confi_info, 0); - } - - return confi_type; -} +G_DEFINE_TYPE (Confi, confi, G_TYPE_OBJECT) static void confi_class_init (ConfiClass *klass) @@ -138,8 +112,6 @@ confi_init (Confi *confi) /** * confi_new: - * @gda_client: a #GdaClient. If it's NULL, it will be created a new one. - * @provider_id: the provider id to connect. * @cnc_string: the connection string to use to connect to database that * contains configuration. * @name: configuration's name. @@ -149,9 +121,7 @@ confi_init (Confi *confi) * Returns: the newly created #Confi object, or NULL if it fails. */ Confi -*confi_new (GdaClient *gda_client, - const gchar *provider_id, - const gchar *cnc_string, +*confi_new (const gchar *cnc_string, const gchar *name, const gchar *root, gboolean create) @@ -166,35 +136,40 @@ Confi ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - priv->gdao = gdao_new_from_string (gda_client, provider_id, cnc_string); - if (priv->gdao == NULL) + priv->gdaex = gdaex_new_from_string (cnc_string); + if (priv->gdaex == NULL) { /* TO DO */ return NULL; } - priv->chrquot = gdao_get_chr_quoting (priv->gdao); + priv->chrquot = gdaex_get_chr_quoting (priv->gdaex); /* check if config exists */ sql = g_strdup_printf ("SELECT id, name FROM configs WHERE name = '%s'", - gdao_strescape (name, NULL)); - dm = gdao_query (priv->gdao, sql); + gdaex_strescape (name, NULL)); + dm = gdaex_query (priv->gdaex, sql); if (dm == NULL || gda_data_model_get_n_rows (dm) == 0) { if (create) { /* saving a new config into database */ - dm = gdao_query (priv->gdao, "SELECT MAX(id) FROM configs"); if (dm != NULL) { - id = gdao_data_model_get_value_integer_at (dm, 0, 0); + g_object_unref (dm); + } + + dm = gdaex_query (priv->gdaex, "SELECT MAX(id) FROM configs"); + if (dm != NULL) + { + id = gdaex_data_model_get_value_integer_at (dm, 0, 0); } id++; - if (gdao_execute (priv->gdao, g_strdup_printf ("INSERT INTO configs " + if (gdaex_execute (priv->gdaex, g_strdup_printf ("INSERT INTO configs " "(id, name, description) " - "VALUES (%d, '%s', '')", - id, gdao_strescape (name, NULL))) == -1) + "VALUES (%d, '%s', '')", + id, gdaex_strescape (name, NULL))) == -1) { return NULL; } @@ -207,7 +182,7 @@ Confi } else { - id = gdao_data_model_get_value_integer_at (dm, 0, 0); + id = gdaex_data_model_get_value_integer_at (dm, 0, 0); } g_object_set (G_OBJECT (confi), @@ -217,13 +192,16 @@ Confi priv->id_config = id; priv->values = g_hash_table_new (g_str_hash, g_str_equal); + if (dm != NULL) + { + g_object_unref (dm); + } + return confi; } /** * confi_get_configs_list: - * @gda_client: a #GdaClient. If it's NULL, it will be created a new one. - * @provider_id: the provider id to connect. * @cnc_string: the connection string to use to connect to database that * contains configuration. * @filter: @@ -232,17 +210,15 @@ Confi * #GList but with a unique NULL element. */ GList -*confi_get_configs_list (GdaClient *gda_client, - const gchar *provider_id, - const gchar *cnc_string, +*confi_get_configs_list (const gchar *cnc_string, const gchar *filter) { GList *lst = NULL; gchar *sql, *where = ""; - GdaO *gdao = gdao_new_from_string (gda_client, provider_id, cnc_string); + GdaEx *gdaex = gdaex_new_from_string (cnc_string); - if (gdao == NULL) + if (gdaex == NULL) { return NULL; } @@ -254,7 +230,7 @@ GList sql = g_strdup_printf ("SELECT * FROM configs%s", where); - GdaDataModel *dmConfigs = gdao_query (gdao, sql); + GdaDataModel *dmConfigs = gdaex_query (gdaex, sql); if (dmConfigs != NULL) { gint row, id, @@ -266,16 +242,16 @@ GList { for (row = 0; row < rows; row++) { - confi = confi_new (gda_client, provider_id, cnc_string, - gdao_data_model_get_field_value_stringify_at (dmConfigs, row, "name"), - NULL, FALSE); + confi = confi_new (cnc_string, + gdaex_data_model_get_field_value_stringify_at (dmConfigs, row, "name"), + NULL, FALSE); priv = CONFI_GET_PRIVATE (confi); - priv->id_config = gdao_data_model_get_field_value_integer_at (dmConfigs, row, "id"); + priv->id_config = gdaex_data_model_get_field_value_integer_at (dmConfigs, row, "id"); g_object_set (G_OBJECT (confi), - "description", gdao_data_model_get_field_value_stringify_at (dmConfigs, row, "description"), - NULL); + "description", gdaex_data_model_get_field_value_stringify_at (dmConfigs, row, "description"), + NULL); lst = g_list_append (lst, confi); } @@ -286,7 +262,7 @@ GList } } - gdao_free (gdao); + gdaex_free (gdaex); return lst; } @@ -392,7 +368,7 @@ ConfiKey } else { - id_parent = gdao_data_model_get_field_value_integer_at (dmParent, 0, "id"); + id_parent = gdaex_data_model_get_field_value_integer_at (dmParent, 0, "id"); } } @@ -407,10 +383,11 @@ ConfiKey "WHERE id_configs = %d ", priv->chrquot, priv->chrquot, priv->id_config); - dm = gdao_query (priv->gdao, sql); + dm = gdaex_query (priv->gdaex, sql); if (dm != NULL) { - id = gdao_data_model_get_value_integer_at (dm, 0, 0); + id = gdaex_data_model_get_value_integer_at (dm, 0, 0); + g_object_unref (dm); } id++; @@ -422,9 +399,9 @@ ConfiKey priv->id_config, id, id_parent, - gdao_strescape (key_, NULL), + gdaex_strescape (key_, NULL), ""); - if (gdao_execute (priv->gdao, sql) == -1) + if (gdaex_execute (priv->gdaex, sql) == -1) { /* TO DO */ return NULL; @@ -509,13 +486,13 @@ confi_key_set_key (Confi *confi, "AND id = %d", priv->chrquot, priv->chrquot, priv->chrquot, priv->chrquot, - gdao_strescape (ck->key, NULL), - gdao_strescape (ck->value, NULL), - gdao_strescape (ck->description, NULL), + gdaex_strescape (ck->key, NULL), + gdaex_strescape (ck->value, NULL), + gdaex_strescape (ck->description, NULL), priv->id_config, ck->id); - ret = (gdao_execute (priv->gdao, sql) >= 0); + ret = (gdaex_execute (priv->gdaex, sql) >= 0); return ret; } @@ -543,7 +520,7 @@ confi_remove_path (Confi *confi, const gchar *path) /* removing every child key */ GNode *node, *root; - gint id = gdao_data_model_get_field_value_integer_at (dm, 0, "id"); + gint id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); node = g_node_new (path_); get_children (confi, node, id, path_); @@ -562,6 +539,10 @@ confi_remove_path (Confi *confi, const gchar *path) { g_warning ("Path %s doesn't exists.", path); } + if (dm != NULL) + { + g_object_unref (dm); + } return ret; } @@ -634,15 +615,19 @@ confi_path_set_value (Confi *confi, const gchar *path, const gchar *value) "WHERE id_configs = %d " "AND id = %d ", priv->chrquot, priv->chrquot, - gdao_strescape (value, NULL), + gdaex_strescape (value, NULL), priv->id_config, - gdao_data_model_get_field_value_integer_at (dm, 0, "id")); - ret = (gdao_execute (priv->gdao, sql) >= 0); + gdaex_data_model_get_field_value_integer_at (dm, 0, "id")); + ret = (gdaex_execute (priv->gdaex, sql) >= 0); } else { g_warning ("Path %s doesn't exists.", path); } + if (dm != NULL) + { + g_object_unref (dm); + } return ret; } @@ -672,11 +657,11 @@ confi_path_move (Confi *confi, const gchar *path, const gchar *parent) "WHERE id_configs = %d " "AND id = %d", priv->chrquot, priv->chrquot, - gdao_data_model_get_field_value_integer_at (dmParent, 0, "id"), + gdaex_data_model_get_field_value_integer_at (dmParent, 0, "id"), priv->id_config, - gdao_data_model_get_field_value_integer_at (dmPath, 0, "id")); + gdaex_data_model_get_field_value_integer_at (dmPath, 0, "id")); - ret = (gdao_execute (priv->gdao, sql) >= 0); + ret = (gdaex_execute (priv->gdaex, sql) >= 0); return ret; } @@ -708,14 +693,19 @@ ConfiKey } ck = (ConfiKey *)g_malloc0 (sizeof (ConfiKey)); - ck->id_config = gdao_data_model_get_field_value_integer_at (dm, 0, "id_configs"); - ck->id = gdao_data_model_get_field_value_integer_at (dm, 0, "id"); - ck->id_parent = gdao_data_model_get_field_value_integer_at (dm, 0, "id_parent"); - ck->key = gdao_data_model_get_field_value_stringify_at (dm, 0, "key"); - ck->value = gdao_data_model_get_field_value_stringify_at (dm, 0, "value"); - ck->description = gdao_data_model_get_field_value_stringify_at (dm, 0, "description"); + ck->id_config = gdaex_data_model_get_field_value_integer_at (dm, 0, "id_configs"); + ck->id = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); + ck->id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id_parent"); + ck->key = gdaex_data_model_get_field_value_stringify_at (dm, 0, "key"); + ck->value = gdaex_data_model_get_field_value_stringify_at (dm, 0, "value"); + ck->description = gdaex_data_model_get_field_value_stringify_at (dm, 0, "description"); ck->path = g_strdup (path_); + if (dm != NULL) + { + g_object_unref (dm); + } + return ck; } @@ -732,8 +722,8 @@ confi_remove (Confi *confi) ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - if (gdao_execute (priv->gdao, - g_strdup_printf ("DELETE FROM %cvalues%c WHERE id_configs = %d", + if (gdaex_execute (priv->gdaex, + g_strdup_printf ("DELETE FROM %cvalues%c WHERE id_configs = %d", priv->chrquot, priv->chrquot, priv->id_config)) == -1) { @@ -741,9 +731,9 @@ confi_remove (Confi *confi) } else { - if (gdao_execute (priv->gdao, - g_strdup_printf ("DELETE FROM configs WHERE id = %d", - priv->id_config)) == -1) + if (gdaex_execute (priv->gdaex, + g_strdup_printf ("DELETE FROM configs WHERE id = %d", + priv->id_config)) == -1) { ret = FALSE; } @@ -767,7 +757,7 @@ confi_destroy (Confi *confi) { ConfiPrivate *priv = CONFI_GET_PRIVATE (confi); - gdao_free (priv->gdao); + gdaex_free (priv->gdaex); g_hash_table_destroy (priv->values); g_free (priv->name); g_free (priv->description); @@ -843,10 +833,10 @@ static GdaDataModel "AND %ckey%c = '%s'", priv->chrquot, priv->chrquot, priv->id_config, - id_parent, + id_parent, priv->chrquot, priv->chrquot, - gdao_strescape (token, NULL)); - dm = gdao_query (priv->gdao, sql); + gdaex_strescape (token, NULL)); + dm = gdaex_query (priv->gdaex, sql); if (dm == NULL || gda_data_model_get_n_rows (dm) != 1) { /* TO DO */ @@ -854,7 +844,7 @@ static GdaDataModel dm = NULL; break; } - id_parent = gdao_data_model_get_field_value_integer_at (dm, 0, "id"); + id_parent = gdaex_data_model_get_field_value_integer_at (dm, 0, "id"); } i++; @@ -872,7 +862,7 @@ static gchar dm = path_get_data_model (confi, path); if (dm != NULL) { - ret = gdao_data_model_get_field_value_stringify_at (dm, 0, "value"); + ret = gdaex_data_model_get_field_value_stringify_at (dm, 0, "value"); } return ret; @@ -890,7 +880,7 @@ get_children (Confi *confi, GNode *parentNode, gint idParent, gchar *path) priv->id_config, idParent); - GdaDataModel *dm = gdao_query (priv->gdao, sql); + GdaDataModel *dm = gdaex_query (priv->gdaex, sql); if (dm != NULL) { gint i, rows = gda_data_model_get_n_rows (dm); @@ -900,11 +890,11 @@ get_children (Confi *confi, GNode *parentNode, gint idParent, gchar *path) ConfiKey *ck = (ConfiKey *)g_malloc0 (sizeof (ConfiKey)); ck->id_config = priv->id_config; - ck->id = gdao_data_model_get_field_value_integer_at (dm, i, "id"); - ck->id_parent = gdao_data_model_get_field_value_integer_at (dm, i, "id_parent"); - ck->key = g_strdup (gdao_data_model_get_field_value_stringify_at (dm, i, "key")); - ck->value = g_strdup (gdao_data_model_get_field_value_stringify_at (dm, i, "value")); - ck->description = g_strdup (gdao_data_model_get_field_value_stringify_at (dm, i, "description")); + ck->id = gdaex_data_model_get_field_value_integer_at (dm, i, "id"); + ck->id_parent = gdaex_data_model_get_field_value_integer_at (dm, i, "id_parent"); + ck->key = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "key")); + ck->value = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "value")); + ck->description = g_strdup (gdaex_data_model_get_field_value_stringify_at (dm, i, "description")); ck->path = g_strdup (path); newNode = g_node_append_data (parentNode, ck); @@ -925,19 +915,19 @@ confi_set_property (GObject *object, guint property_id, const GValue *value, GPa { case PROP_NAME: priv->name = g_strdup (g_value_get_string (value)); - gdao_execute (priv->gdao, g_strdup_printf ("UPDATE configs " + gdaex_execute (priv->gdaex, g_strdup_printf ("UPDATE configs " "SET name = '%s' " "WHERE id = %d", - gdao_strescape (priv->name, NULL), + gdaex_strescape (priv->name, NULL), priv->id_config)); break; case PROP_DESCRIPTION: priv->description = g_strdup (g_value_get_string (value)); - gdao_execute (priv->gdao, g_strdup_printf ("UPDATE configs " + gdaex_execute (priv->gdaex, g_strdup_printf ("UPDATE configs " "SET description = '%s' " "WHERE id = %d", - gdao_strescape (priv->description, NULL), + gdaex_strescape (priv->description, NULL), priv->id_config)); break; @@ -996,7 +986,7 @@ confi_delete_id_from_db_values (Confi *confi, gint id) priv->id_config, id); - return (gdao_execute (priv->gdao, sql) >= 0); + return (gdaex_execute (priv->gdaex, sql) >= 0); } static gboolean diff --git a/src/libconfi.h b/src/libconfi.h index 04bb9ca..bcd97b5 100644 --- a/src/libconfi.h +++ b/src/libconfi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2014 Andrea Zagli * * 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 @@ -22,7 +22,7 @@ #include #include -#include +#include G_BEGIN_DECLS @@ -61,16 +61,12 @@ typedef struct GType confi_get_type (void) G_GNUC_CONST; -Confi *confi_new (GdaClient *gda_client, - const gchar *provider_id, - const gchar *cnc_string, +Confi *confi_new (const gchar *cnc_string, const gchar *name, const gchar *root, gboolean create); -GList *confi_get_configs_list (GdaClient *gda_client, - const gchar *provider_id, - const gchar *cnc_string, +GList *confi_get_configs_list (const gchar *cnc_string, const gchar *filter); GNode *confi_get_tree (Confi *confi); diff --git a/tests/test.c b/tests/test.c index 20b78d5..dabc7bd 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2014 Andrea Zagli * * 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 @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include #include gboolean @@ -26,7 +26,7 @@ traverse_func (GNode *node, ConfiKey *ck = (ConfiKey *)node->data; if (ck->id != 0) { - g_fprintf (stderr, "%s%s%s\n", ck->path, strcmp (ck->path, "") == 0 ? "" : "/", ck->key); + g_error ("%s%s%s\n", ck->path, strcmp (ck->path, "") == 0 ? "" : "/", ck->key); } return FALSE; @@ -35,35 +35,28 @@ traverse_func (GNode *node, int main (int argc, char **argv) { - GdaClient *gda_client; Confi *confi; GNode *tree; - gda_init ("test", "0.0.1", argc, argv); - gda_client = gda_client_new (); - if (gda_client == NULL) - { - g_fprintf (stderr, "Errore nell'inizializzazione del gda_client\n"); - return 0; - } + gda_init (); - confi = confi_new (gda_client, "PostgreSQL", "HOSTADDR=127.0.0.1;PORT=5432;DATABASE=confi;HOST=localhost;USER=postgres", "Default", NULL, FALSE); + confi = confi_new ("PostgreSQL://HOSTADDR=127.0.0.1;PORT=5432;DATABASE=confi;HOST=localhost;USER=postgres", "Default", NULL, FALSE); if (confi == NULL) { - g_fprintf (stderr, "Errore nell'inizializzazione della configurazione\n"); + g_error ("Errore nell'inizializzazione della configurazione\n"); return 0; } - g_fprintf (stderr, "Value from key \"folder/key1/key1_2\"\n%s\n\n", confi_path_get_value (confi, "folder/key1/key1_2")); + g_error ("Value from key \"folder/key1/key1_2\"\n%s\n\n", confi_path_get_value (confi, "folder/key1/key1_2")); - g_fprintf (stderr, "Traversing the entire tree\n"); + g_error ("Traversing the entire tree\n"); tree = confi_get_tree (confi); g_node_traverse (tree, G_PRE_ORDER, G_TRAVERSE_ALL, -1, traverse_func, NULL); - g_fprintf (stderr, "\n"); + g_error ("\n"); - g_fprintf (stderr, "Setting root \"key2\"\n"); + g_error ("Setting root \"key2\"\n"); confi_set_root (confi, "key2"); - g_fprintf (stderr, "Value from key \"key2-1\" %s\n", confi_path_get_value (confi, "key2-1")); + g_error ("Value from key \"key2-1\" %s\n", confi_path_get_value (confi, "key2-1")); confi_destroy (confi);