diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 387e526c06979e05d40352a148af4045ed7a19fe..0000000000000000000000000000000000000000 --- a/.editorconfig +++ /dev/null @@ -1,16 +0,0 @@ -# EditorConfig <http://EditorConfig.org> -root = true - -# elementary defaults -[*] -charset = utf-8 -end_of_line = lf -indent_size = tab -indent_style = space -insert_final_newline = true -max_line_length = 120 -tab_width = 4 - -# Markup files -[{*.html,*.xml,*.xml.in,*.yml}] -tab_width = 2 diff --git a/.gitignore b/.gitignore index 41cad32ceca24aea210b35cbb50aa1d8439c1968..c4cc9f4c97f2605581edd8aa7558e932f3e9070f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.buildconfig + build install diff --git a/COPYING b/COPYING index 10926e87f113fb026c366866d6fa466061562870..d159169d1050894d3ea3b98e1c965c4058208fe1 100644 --- a/COPYING +++ b/COPYING @@ -1,622 +1,281 @@ GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + Version 2, June 1991 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 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 + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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. +this service 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. + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. 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. +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. 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 + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to 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 + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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. +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. END OF TERMS AND CONDITIONS @@ -628,15 +287,15 @@ 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 +convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> - This program is free software: you can redistribute it and/or modify + 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 + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -644,32 +303,37 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 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: +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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". +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice +This 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. diff --git a/README.md b/README.md index 14e004c8a5ca686f655d8388d32d61a0e5892819..a8ad04535ea5e4e3162e9aa6069ec27f749f50fc 100644 --- a/README.md +++ b/README.md @@ -1,139 +1,75 @@ -## Important note - -2019-01-04 - Since I don't own anymore an android device, I'm not able to develop it... so, developpement is stopped so far. - - -## EOSConnect - -It's a KDEConnect client using GTK+ written in Vala, based on [mconnect](https://github.com/kevinselvaprasanna/mconnect). -The application is designed for elementary OS. (but should works on other distributions, perhaps.) - -A note on [mconnect](https://github.com/kevinselvaprasanna/mconnect). First version of EOSConnect used a custom fork of mconnect, extending his DBus API, so used as a backend, started by EOSConnect at startup. But I encoutered lot's of issues with async DBus calls in order to setup mconnect backend correctly, and EOSConnect began to have too much files and abstractions classes - in order to be able to change the backend later. So I decided to integrate directly mconnect code into EOSConnect, removing his DBus API. It removed lot's of code in EOSConnect and I was able to setup and adapt mconnect like I want easily. - -### Warning - -It's a Work In Progess, not intented for daily use. - -### Screenshots -#### Main window - - -#### SMS tab - - -#### Send a SMS without using SMS tab - -It's searching in available adressbooks, or you can use a custom phone number. - - - - -#### Send file(s) to device - -You can send files to device from Files's context menu. (or from the Dock's quick list.) - -") - -#### Dock integration - - +<div align="center"> + <h1 align="center">Conecto</h1> + <h3 align="center">Integrate your Android-phone with your PC - a GTK client for KDEConnect.</h3> +</div> + +<br/> + +<p align="center"> + <a href="https://github.com/hannesschulze/conecto/blob/master/COPYING"> + <img src="https://img.shields.io/badge/License-GPL--2.0-blue.svg"> + </a> + <a href="https://github.com/hannesschulze/conecto/releases"> + <img src="https://img.shields.io/badge/Release-v%201.0.0-orange.svg"> + </a> +</p> + +<p align="center"> + <img src="screenshots/devices.png" alt="Screenshot"><br> + <a href="https://github.com/hannesschulze/conecto/issues/new">Report a problem!</a> +</p> + +## Installation + +### Dependencies +These dependencies must be present before building: + - `meson` + - `valac` + - `debhelper` + - `libgranite-dev` + - `libgtk-3-dev` + - `libunity-dev` + - `libnotify-dev` + - `libghc-gnutls-dev` + - `libsqlite3-dev` + - `libedataserver1.2-dev` + - `libebook1.2-dev` + +Use the following command to install the dependencies: +```shell +sudo apt install elementary-sdk libunity-dev libnotify-dev libghc-gnutls-dev libsqlite3-dev libedataserver1.2-dev libebook1.2-dev +``` -### Installation -* On Ubuntu or elementary OS, install these dependencies: -```bash -sudo apt install elementary-sdk libunity-dev libnotify-dev libghc-gnutls-dev libsqlite3-dev libedataserver1.2-dev libebook1.2-dev -y +### Building ``` -* Clone the repository. -* Inside the project, compile with: -```bash -meson build && clear && ninja -C build && glib-compile-schemas ./data/ +git clone https://github.com/hannesschulze/conecto.git && cd conecto +meson build --prefix=/usr +cd build +ninja ``` -* Start application - * Start from the build directory: - ```bash - GSETTINGS_SCHEMA_DIR=data ./build/src/com.github.gyan000.eos-connect - ``` - * Start with complete debug output: - ```bash - GSETTINGS_SCHEMA_DIR=data ./build/src/com.github.gyan000.eos-connect -d - ``` -* To install it: -```bash -sudo ninja -C build install - ``` -### Known issues -* When launching app, sometimes, configured device, not connected on local network, does not appears as "not connected". -* When launching app, sometimes, need to unlock phone/tablet in order to see the device "connected". -* When started for the first time from build directory, quicklist not available. - -### Roadmap -#### v0.1 -- [x] Import mconnect, remove useless stuff. -- [x] List available devices. -- [x] Use Tablet or Phone or Computre icons in devices list. -- [x] Pair automatically. -- [x] Plugin configuration by device: plugin list, custom name. -- [x] List configured device in dynamic quicklist. -- [x] Dconf: global setting and by device settings. - -#### v0.2 - ping -- [x] Send / receive ping, with notification. -- [x] Ping plugin configurarion. (button to send a ping.) - -#### v0.3 - battery -- [x] Receive notification when battery below a threshold. -- [x] Battery plugin configuration. (option to setup charge percentage warning) -- [x] Show battery percentage in dynamic quicklist. - -#### v0.4 - notification -- [x] Send / receive notifications. -- [x] Notification plugin configuration. (configuration window to activate/deactivate send/receive notifications globally and by application, with application filter.) -- [ ] Synchronise notifications on both devices. (when notification closed on a device, it should close on the other device.) - -#### v0.4 - share -- [x] Send one or more files, with popup with file advancement. -- [x] Receive files, with advancement using launcher api to display progress bar on the icon in the dock. -- [x] Share plugin configuration. (option to setup default save folder) -- [x] Add option to Files's context menu to send file(s) to a device. +To install, use `ninja install`, then execute with com.github.hannesschulze.conecto: +```shell +sudo ninja install +com.github.hannesschulze.conecto +``` -#### v0.5 - SMS -- [x] Send / receive SMS, with SMS notification. -- [x] Option to display SMS tab in dynamic quicklist. -- [x] Tab in main window with SMS history by contact. -- [x] Add an icon on header bar to send SMS to one or more contacts. -- [x] Use libedataserver & libebook to get available adressbooks and take contacts with mobile phone. (and use contact photo if available) -- [x] Widget to send SMS, with input text and dropdown to select available device, which can send a SMS. (to use in the widget send SMS fom header bar, and into the SMS tab.) -- [x] When entering phone number or contact name in SMS widget from headerbar, display available contacts, with photo. -- [x] Use sqlite3 to store SMS by phone number. (and be able to scroll back in the history) -- [ ] When user do not want to store SMS with sqlite, use a dummy SMS store. -- [ ] General option, for all devices, to activate or not the storage of SMS history. -- [ ] SMS plugin configuration. (to setup how many days of history we want to keep) +## About this project -#### v0.5.1 - Telephony -- [ ] Display who's calling, with contact photo if available. -- [ ] Make sure we display notification when call missed. -- [ ] Telephony plugin configuration. +This project aims to provide a KDEConnect client designed for elementary OS, based on [mconnect](https://github.com/kevinselvaprasanna/mconnect). -#### v0.7 - Commands -- [ ] Execute commands. -- [ ] Command plugin configuration. (configuration window with available commands for remove device) +Conecto is based on [EOSConnect](https://github.com/gyan000/EOSConnect) by gyan000. Unfortunately he wasn't able to continue development because he didn't own an android device anymore. -#### v0.8 - Clipboard -- [ ] Copy / past working. (in both direction ?) -- [ ] Clipboard plugin configuration. +This project is a work in progress, not intended for daily use. -#### v0.9 - Multimedia control -- [ ] Multimedia control plugin configuration. +Current features include: + - Connecting to the android device + - Pinging the device + - Sharing files through devices + - Showing the battery level + - Receiving notifications + - Sending SMS -#### v0.9.1 - Remote control -- [ ] Remote control plugin configuration +## License -#### v1 -- [ ] Remove refresh icon at bottom of devices list. -- [ ] Unpair device, with icon at bottom of devices list. -- [ ] Option, when unpairing a device, to delete everything: configuration, SMS history. -- [ ] Welcome screen, with how-to setup. -- [ ] Option to setup public visible name of EOSConnect. -- [ ] Translations: french. -- [ ] Code cleanup. +This project is licensed under the GPL-2.0 License - see the [COPYING](COPYING) file for details. diff --git a/build-aux/meson/postinstall.py b/build-aux/meson/postinstall.py new file mode 100644 index 0000000000000000000000000000000000000000..2e07613f4d1b2944250873c27d0f9d7d06a3722e --- /dev/null +++ b/build-aux/meson/postinstall.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python3 + +from os import environ, path +from subprocess import call + +prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local') +datadir = path.join(prefix, 'share') +destdir = environ.get('DESTDIR', '') + +# Package managers set this so we don't need to run +if not destdir: + print('Updating icon cache...') + call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')]) + + print('Updating desktop database...') + call(['update-desktop-database', '-q', path.join(datadir, 'applications')]) + + print('Compiling GSettings schemas...') + call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')]) diff --git a/data/com.github.gyan000.eos-connect.appdata.png b/data/com.github.gyan000.eos-connect.appdata.png deleted file mode 100644 index 99b082956d35f4b11ab05181cb24bcb43af57585..0000000000000000000000000000000000000000 Binary files a/data/com.github.gyan000.eos-connect.appdata.png and /dev/null differ diff --git a/data/com.github.gyan000.eos-connect.appdata.xml.in b/data/com.github.gyan000.eos-connect.appdata.xml.in deleted file mode 100644 index e2c972ff2ab7b6130ab12f55f1da15dc81a56b05..0000000000000000000000000000000000000000 --- a/data/com.github.gyan000.eos-connect.appdata.xml.in +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2018 gyan000 <gyan000@ijaz.fr> --> -<component type="desktop"> - <id>com.github.gyan000.eos-connect.desktop</id> - <metadata_license>CC0</metadata_license> - <name>EOS Connect</name> - <summary>KDE Connect client for Elementary OS.</summary> - <description> - <p>KDE Connect client for Elementary OS, based on MConnect.</p> - </description> -</component> diff --git a/data/com.github.gyan000.eos-connect.desktop.in.in b/data/com.github.gyan000.eos-connect.desktop.in.in deleted file mode 100644 index 9f8d59da1573e7d2327616a21ba694f7fa71b6d0..0000000000000000000000000000000000000000 --- a/data/com.github.gyan000.eos-connect.desktop.in.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=EOS Connect -GenericName=EOS Connect -Comment=KDE Connect client for Elementary OS. -Categories=Utility; -Exec=com.github.gyan000.eos-connect -Icon=phone -Terminal=false -Type=Application -X-GNOME-Gettext-Domain=eos-connect -X-GNOME-UsesNotifications=true -Keywords=KDE;connect; diff --git a/data/com.github.hannesschulze.conecto.appdata.xml.in b/data/com.github.hannesschulze.conecto.appdata.xml.in new file mode 100644 index 0000000000000000000000000000000000000000..4491307aef4f6823eb2e05ff516389d66d3d3cc2 --- /dev/null +++ b/data/com.github.hannesschulze.conecto.appdata.xml.in @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2018 gyan000 <gyan000@ijaz.fr> --> +<component type="desktop"> + <id>com.github.hannesschulze.conecto.desktop</id> + <metadata_license>CC0</metadata_license> + <name>Conecto</name> + <summary>Integrate your Android-phone with your PC</summary> + <description> + <p>Integrate your Android-phone with your PC - a GTK client for KDEConnect. </p> + </description> +</component> diff --git a/data/com.github.hannesschulze.conecto.desktop.in b/data/com.github.hannesschulze.conecto.desktop.in new file mode 100644 index 0000000000000000000000000000000000000000..ed9f4e8d75152e2bd87eb369e06a50be9b69a6b5 --- /dev/null +++ b/data/com.github.hannesschulze.conecto.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Conecto +GenericName=Conecto +Comment=Integrate your Android-phone with your PC - a GTK client for KDEConnect. +Categories=Utility; +Exec=com.github.hannesschulze.conecto +Icon=phone +Terminal=false +Type=Application +X-GNOME-Gettext-Domain=conecto +X-GNOME-UsesNotifications=true +Keywords=KDE;connect; diff --git a/data/com.github.gyan000.eos-connect.gschema.xml b/data/com.github.hannesschulze.conecto.gschema.xml similarity index 94% rename from data/com.github.gyan000.eos-connect.gschema.xml rename to data/com.github.hannesschulze.conecto.gschema.xml index 687f95bcf4da616876dd2bcd69e80df5763ce18e..a791dd9f338fd0873e95188c044b359cc9b5c02c 100644 --- a/data/com.github.gyan000.eos-connect.gschema.xml +++ b/data/com.github.hannesschulze.conecto.gschema.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <schemalist> - <schema id="com.github.gyan000.eos-connect" path="/com/github/gyan000/eos-connect/"> + <schema id="com.github.hannesschulze.conecto" path="/com/github/hannesschulze/conecto/"> <key type="b" name="use-dark-theme"> <default>false</default> <summary>Use dark theme.</summary> @@ -14,7 +14,7 @@ <summary>Activate / Deactivate the storage of SMS for all devices.</summary> </key> </schema> - <schema id="com.github.gyan000.eos-connect.settings.device"> + <schema id="com.github.hannesschulze.conecto.settings.device"> <key type="s" name="custom-name"> <default>""</default> <summary>Custom name for the device.</summary> diff --git a/data/meson.build b/data/meson.build index 0a004985c947cb997209047f74d4881cafb89c9e..ba0f39dfb7dd74473488fb29a3a73fab67e9e41e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,73 +1,42 @@ -# Daemon Desktop file (for GNOME Session autostart) -#configure_file( -# input: meson.project_name() + '-daemon.desktop.in', -# output: '@BASENAME@', -# configuration: conf_data, -# install_dir: join_paths(get_option('datadir'), 'applications') -#) - -# D-Bus Service -#configure_file( -# input: meson.project_name() + '.service.in', -# output: '@BASENAME@', -# configuration: conf_data, -# install_dir: dbus.get_pkgconfig_variable('session_bus_services_dir') -#) - -# GNOME Shell Search Provider -#configure_file( -# input: meson.project_name() + '.search-provider.ini.in', -# output: '@BASENAME@', -# configuration: conf_data, -# install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers') -#) - -# AppData file -i18n.merge_file( - input: meson.project_name() + '.appdata.xml.in', - output: '@BASENAME@', - po_dir: join_paths(meson.source_root (), 'po', 'extra'), - type: 'xml', - install_dir: join_paths(get_option('datadir'), 'metainfo'), - install: true +desktop_file = i18n.merge_file( + input: 'com.github.hannesschulze.conecto.desktop.in', + output: 'com.github.hannesschulze.conecto.desktop', + type: 'desktop', + po_dir: '../po', + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') ) -# Desktop File -desktop_in = configure_file( - input: meson.project_name() + '.desktop.in.in', - output: '@BASENAME@', - configuration: conf_data +desktop_utils = find_program('desktop-file-validate', required: false) +if desktop_utils.found() + test('Validate desktop file', desktop_utils, + args: [desktop_file] + ) +endif + +appstream_file = i18n.merge_file( + input: 'com.github.hannesschulze.conecto.appdata.xml.in', + output: 'com.github.hannesschulze.conecto.appdata.xml', + po_dir: '../po', + install: true, + install_dir: join_paths(get_option('datadir'), 'appdata') ) -i18n.merge_file( - input: desktop_in, - output: meson.project_name() + '.desktop', - po_dir: join_paths(meson.source_root (), 'po'), - type: 'desktop', - install_dir: join_paths(get_option('datadir'), 'applications'), - install: true -) +appstream_util = find_program('appstream-util', required: false) +if appstream_util.found() + test('Validate appstream file', appstream_util, + args: ['validate', appstream_file] + ) +endif -# Blacklist file -#install_data( -# 'appcenter.blacklist', -# install_dir: config_dir, -#) -# Install GSettings schemas -install_data( - meson.project_name() + '.gschema.xml', - install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas') +install_data('com.github.hannesschulze.conecto.gschema.xml', + install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') ) -# Use GResource -#css_gresource = gnome.compile_resources( -# 'gresource_css', -# meson.project_name() + '.gresource.xml' -#) - -#icons_gresource = gnome.compile_resources( -# 'gresource_icons', -# 'icons/categories.gresource.xml', -# source_dir: 'icons' -#) +compile_schemas = find_program('glib-compile-schemas', required: false) +if compile_schemas.found() + test('Validate schema file', compile_schemas, + args: ['--strict', '--dry-run', meson.current_source_dir()] + ) +endif diff --git a/data/test/telephony-thumbnail-source.b64 b/data/test/telephony-thumbnail-source.b64 deleted file mode 100644 index 8639f7741d0497546dd9081172938e728571cfb8..0000000000000000000000000000000000000000 --- a/data/test/telephony-thumbnail-source.b64 +++ /dev/null @@ -1 +0,0 @@ -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 diff --git a/data/test/telephony-thumbnail-source2.b64 b/data/test/telephony-thumbnail-source2.b64 deleted file mode 100644 index c4d109539db6ddb2cdbd128ef76f7ed16586f3c0..0000000000000000000000000000000000000000 --- a/data/test/telephony-thumbnail-source2.b64 +++ /dev/null @@ -1 +0,0 @@ -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\n9PluT96VKlSB6Y// diff --git a/data/test/telephony-thumbnail-source3.b64 b/data/test/telephony-thumbnail-source3.b64 deleted file mode 100644 index 3ff074a6f0b7cbe7cc760a6c94f5942fbf6eebdd..0000000000000000000000000000000000000000 --- a/data/test/telephony-thumbnail-source3.b64 +++ /dev/null @@ -1 +0,0 @@ -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\nH//Z diff --git a/data/test/telephony-thumbnail-source4.b64 b/data/test/telephony-thumbnail-source4.b64 deleted file mode 100644 index 972044a2f6349f188c1656775a83406841adb55d..0000000000000000000000000000000000000000 --- a/data/test/telephony-thumbnail-source4.b64 +++ /dev/null @@ -1 +0,0 @@ -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 diff --git a/meson.build b/meson.build index d791fb19303f3ffe965e375826dc646117cc216d..5fe4ce53d447d538b78148aaa4807a0614e27a26 100644 --- a/meson.build +++ b/meson.build @@ -1,72 +1,56 @@ -project( - 'com.github.gyan000.eos-connect', - 'vala', 'c', - version: '0.4.9') +project('com.github.hannesschulze.conecto', ['c', 'vala'], version: '0.1.0', + meson_version: '>= 0.40.0', +) -gettext_name = meson.project_name() -gnome = import('gnome') i18n = import('i18n') -add_project_arguments( - '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name), - '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE', - language:'c' -) +conf = configuration_data() +conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +configure_file(output: 'config.h', configuration: conf) +config_h_dir = include_directories('.') +c_args = [ + '-include', 'config.h' +] -dep_atspi = dependency('atspi-2') -dep_gdk = dependency('gdk-3.0') -dep_gee = dependency ('gee-0.8') -dep_gio = dependency ('gio-2.0') -dep_gio_unix = dependency('gio-unix-2.0') -dep_glib = dependency('glib-2.0') -dep_granite = dependency ('granite', version: '>=0.4.2') -dep_gtk = dependency ('gtk+-3.0', version: '>=3.18') -dep_gnutls = dependency('gnutls') -dep_gobject = dependency('gobject-2.0') -dep_json_glib = dependency('json-glib-1.0') -dep_libebook = dependency('libebook-1.2') -dep_libedataserver = dependency('libedataserver-1.2') -dep_libnotify = dependency('libnotify') -dep_posix = meson.get_compiler('vala').find_library('posix') -#dep_libsoup = dependency ('libsoup-2.4') -dep_unity = dependency('unity', version: '>=4.0.0') -dep_sqlite = dependency('sqlite3') -add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'src/MConnect/vapi')], language: 'vala') +gnome = import('gnome') -dependencies = [ - dep_atspi, - dep_gdk, - dep_gee, - dep_gio, - dep_gio_unix, - dep_glib, - dep_gnutls, - dep_gobject, - dep_granite, - dep_gtk, - dep_json_glib, - dep_libebook, - dep_libedataserver, - dep_libnotify, - #dep_libsoup, - dep_posix, - dep_sqlite, - dep_unity +conecto_deps = [ + dependency('atspi-2'), + dependency('gdk-3.0'), + dependency('gee-0.8'), + dependency('gio-2.0'), + dependency('gio-unix-2.0'), + dependency('glib-2.0'), + dependency('granite', version: '>=0.4.2'), + dependency('gtk+-3.0', version: '>=3.18'), + dependency('gnutls'), + dependency('gobject-2.0'), + dependency('json-glib-1.0'), + dependency('libebook-1.2'), + dependency('libedataserver-1.2'), + dependency('libnotify'), + dependency('unity', version: '>=4.0.0'), + dependency('sqlite3'), + meson.get_compiler('vala').find_library('posix'), ] -conf_data = configuration_data() -conf_data.set('PROJECT_NAME', meson.project_name()) -#conf_data.set('DESKTOP_ICON', get_option('icon')) -conf_data.set('EXEC_NAME', meson.project_name()) -conf_data.set('GETTEXT_PACKAGE', meson.project_name()) -#conf_data.set('APP_NAME', get_option('name')) -conf_data.set('VERSION', meson.project_version()) -#conf_data.set('CONFIGDIR', config_dir) -conf_data.set('EXEC_PATH', join_paths (get_option('prefix'), get_option('bindir'), meson.project_name())) - -meson.add_install_script('meson/post_install.py') +add_project_arguments( + [ '--vapidir', join_paths(meson.current_source_dir(), 'src/MConnect/vapi') ], + language: 'vala' +) -subdir('data') subdir('src') subdir('po') +subdir('data') + + +executable('com.github.hannesschulze.conecto', + conecto_sources, + vala_args: '--target-glib=2.50', + dependencies: conecto_deps, + install: true, + c_args: c_args +) + +meson.add_install_script('build-aux/meson/postinstall.py') diff --git a/meson/post_install.py b/meson/post_install.py deleted file mode 100644 index 76ed255bc5c7c54a5900b3c4f1b641a8c37ae592..0000000000000000000000000000000000000000 --- a/meson/post_install.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 - -import os -import subprocess - -schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') - -if not os.environ.get('DESTDIR'): - print('Compiling gsettings schemas...') - subprocess.call(['glib-compile-schemas', schemadir]) diff --git a/po/POTFILES b/po/POTFILES index ba129c6437da4feb9b208849aa643d7548eb4504..1a2ccc808eae5372e2bc77c19f8daa11c12385ff 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1 +1 @@ -src/EOSConnect.vala +src/Conecto.vala diff --git a/po/com.github.gyan000.eos-connect.pot b/po/com.github.gyan000.eos-connect.pot index 4dd06d0d4f1c0575d64d953668aecc8f8d54a99d..a0fc2f126d1a7b4ac47ca22945646bb5b771d5c8 100644 --- a/po/com.github.gyan000.eos-connect.pot +++ b/po/com.github.gyan000.eos-connect.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the com.github.gyan000.eos-connect package. +# This file is distributed under the same license as the com.github.hannesschulze.conecto package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: com.github.gyan000.eos-connect\n" +"Project-Id-Version: com.github.hannesschulze.conecto\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-03 18:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/fr.po b/po/fr.po index c69c2fa592364fe51058cb3e7216a9713f0233f1..bdf0de8290d5fc3272e6feea71fc42bd149b5e60 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,11 +1,11 @@ -# French translations for com.github.gyan000.eos-connect package. -# Copyright (C) 2018 THE com.github.gyan000.eos-connect'S COPYRIGHT HOLDER -# This file is distributed under the same license as the com.github.gyan000.eos-connect package. +# French translations for com.github.hannesschulze.conecto package. +# Copyright (C) 2018 THE com.github.hannesschulze.conecto'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.hannesschulze.conecto package. # Automatically generated, 2018. # msgid "" msgstr "" -"Project-Id-Version: com.github.gyan000.eos-connect\n" +"Project-Id-Version: com.github.hannesschulze.conecto\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-03 18:05+0200\n" "PO-Revision-Date: 2018-06-03 16:22+0200\n" diff --git a/po/meson.build b/po/meson.build index 0f431a3e545a7d41e910d8fef1655022277bbec7..9d5456035153a1006941c10d4ed4de17dfde21c0 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,3 +1,7 @@ -i18n.gettext(meson.project_name(), - args: ['--directory='+meson.source_root(), '--from-code=UTF-8'] +i18n.gettext( + meson.project_name(), + args: [ + '--directory=' + meson.source_root(), + '--from-code=UTF-8' + ] ) diff --git a/po/uk.po b/po/uk.po index b488216cf2017e3641a689396f0385546e64457d..2e74c44972a9b84fd84c94cbb2a7601d892d7d24 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,11 +1,11 @@ -# Ukrainian translations for com.github.gyan000.eos-connect package. -# Copyright (C) 2018 THE com.github.gyan000.eos-connect'S COPYRIGHT HOLDER -# This file is distributed under the same license as the com.github.gyan000.eos-connect package. +# Ukrainian translations for com.github.hannesschulze.conecto package. +# Copyright (C) 2018 THE com.github.hannesschulze.conecto'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.hannesschulze.conecto package. # Automatically generated, 2018. # msgid "" msgstr "" -"Project-Id-Version: com.github.gyan000.eos-connect\n" +"Project-Id-Version: com.github.hannesschulze.conecto\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-03 18:05+0200\n" "PO-Revision-Date: 2018-06-03 16:22+0200\n" diff --git a/src/EOSConnect/EOSConnect.vala b/src/Conecto/Conecto.vala similarity index 93% rename from src/EOSConnect/EOSConnect.vala rename to src/Conecto/Conecto.vala index 6b1c04bb0cd9167bb2aa55efe5e14854e5e83199..bddea480d3dbfe304cceea27a51a7f1bc147674a 100644 --- a/src/EOSConnect/EOSConnect.vala +++ b/src/Conecto/Conecto.vala @@ -14,21 +14,22 @@ * * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> + * Hannes Schulze <haschu0103 (at) gmail.com> */ -using EOSConnect.Plugin; -using EOSConnect.Plugin.Windows; -using EOSConnect.Widgets; +using Conecto.Plugin; +using Conecto.Plugin.Windows; +using Conecto.Widgets; using Gee; using MConnect; using Unity; -namespace EOSConnect { +namespace Conecto { public class App : Granite.Application { - public const string APP_NAME="eos-connect"; - public const string GSETTINGS_SCHEMA_ID="com.github.gyan000.eos-connect"; - public const string GSETTINGS_SCHEMA_PATH="/com/github/gyan000/eos-connect"; + public const string APP_NAME="conecto"; + public const string GSETTINGS_SCHEMA_ID="com.github.hannesschulze.conecto"; + public const string GSETTINGS_SCHEMA_PATH="/com/github/hannesschulze/conecto"; public HashMap<string, Device> devices_map; public ContactsInterface contacts_interface; private GLib.Settings main_settings; @@ -44,8 +45,8 @@ namespace EOSConnect { construct { application_id = App.GSETTINGS_SCHEMA_ID; flags = ApplicationFlags.FLAGS_NONE; - program_name = "EOS Connect"; - build_version = "0.5"; + program_name = "Conecto"; + build_version = "0.1"; } public override void activate () @@ -111,7 +112,7 @@ namespace EOSConnect { error ("Cannot run without thread support.\n"); } - message ("Report any issues/bugs you might find to https://github.com/gyan000/EOSConnect/issues"); + message ("Report any issues/bugs you might find to https://github.com/hannesschulze/conecto/issues"); var application = new App (); return application.run (args); diff --git a/src/EOSConnect/Config.vala b/src/Conecto/Config.vala similarity index 98% rename from src/EOSConnect/Config.vala rename to src/Conecto/Config.vala index 434c8f1bd50d9764885f78170350e79edea3c5a7..3edf642afd5ece66c6fe35ed74d7c7966f6adf2f 100644 --- a/src/EOSConnect/Config.vala +++ b/src/Conecto/Config.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect { +namespace Conecto { public class Config : Object { diff --git a/src/EOSConnect/Contact.vala b/src/Conecto/Contact.vala similarity index 98% rename from src/EOSConnect/Contact.vala rename to src/Conecto/Contact.vala index 4623a7ac8e9b5afe1e699407eef62ea182cd30d7..763e540f212e78fef442345167598fc66cc743be 100644 --- a/src/EOSConnect/Contact.vala +++ b/src/Conecto/Contact.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect { +namespace Conecto { public class Contact : Object { diff --git a/src/EOSConnect/ContactsInterface.vala b/src/Conecto/ContactsInterface.vala similarity index 97% rename from src/EOSConnect/ContactsInterface.vala rename to src/Conecto/ContactsInterface.vala index 53341460d1664505641af42a74d75755634b51c6..002fa4716720329799109c9b9c2b283c39a960f4 100644 --- a/src/EOSConnect/ContactsInterface.vala +++ b/src/Conecto/ContactsInterface.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect { +namespace Conecto { public abstract class ContactsInterface : Object { diff --git a/src/EOSConnect/Contractor.vala b/src/Conecto/Contractor.vala similarity index 94% rename from src/EOSConnect/Contractor.vala rename to src/Conecto/Contractor.vala index f572851283806f5aad7763f04f7ec4688c35e26f..d1d0cff4eaac53e4d927c9102c2b016063d696b4 100644 --- a/src/EOSConnect/Contractor.vala +++ b/src/Conecto/Contractor.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect { +namespace Conecto { public class Contractor { @@ -64,9 +64,9 @@ namespace EOSConnect { string str_name="Name=Send to " + device.custom_name + "\n"; string str_desc="Description=Send this file to " + device.custom_name + "\n"; // TOCHEK find out why without --print-reply it's not working. - string str_command ="Exec=dbus-send --print-reply --dest=com.github.gyan000.eos-connect "; - str_command += "/com/github/gyan000/eosconnect/share "; - str_command += "com.github.gyan000.eosconnect.Share.Files "; + string str_command ="Exec=dbus-send --print-reply --dest=com.github.hannesschulze.conecto "; + str_command += "/com/github/hannesschulze/conecto/share "; + str_command += "com.github.hannesschulze.conecto.Share.Files "; str_command += "string:'" + device.id + "' string:'%F'\n"; os.write ("[Contractor Entry]\n".data); os.write (str_name.data); diff --git a/src/EOSConnect/DebugToolbar.vala b/src/Conecto/DebugToolbar.vala similarity index 99% rename from src/EOSConnect/DebugToolbar.vala rename to src/Conecto/DebugToolbar.vala index ae7760e93f25f49f9e608c6b1a8a1fae3e801b8a..670a87db569a88f3d5d3254cb91917a46557768b 100644 --- a/src/EOSConnect/DebugToolbar.vala +++ b/src/Conecto/DebugToolbar.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect { +namespace Conecto { public class DebugToolbar : Gtk.Grid { diff --git a/src/EOSConnect/EContacts.vala b/src/Conecto/EContacts.vala similarity index 99% rename from src/EOSConnect/EContacts.vala rename to src/Conecto/EContacts.vala index 05ab3e98666cd087c1f9641a571bea0784a279b6..176f263a38bc94cde26c42dc4e538ed6c0893435 100644 --- a/src/EOSConnect/EContacts.vala +++ b/src/Conecto/EContacts.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect { +namespace Conecto { public class EContacts : ContactsInterface { diff --git a/src/EOSConnect/MainWindow.vala b/src/Conecto/MainWindow.vala similarity index 98% rename from src/EOSConnect/MainWindow.vala rename to src/Conecto/MainWindow.vala index 2f9723a6325860d737488c4f62280775ff97b364..039d1f21461ef04f543ba57653a1922f3a9965cf 100644 --- a/src/EOSConnect/MainWindow.vala +++ b/src/Conecto/MainWindow.vala @@ -15,14 +15,14 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Plugin; -using EOSConnect.Plugin.Windows; -using EOSConnect.Widgets; +using Conecto.Plugin; +using Conecto.Plugin.Windows; +using Conecto.Widgets; using Gee; using Granite.Widgets; using MConnect; -namespace EOSConnect { +namespace Conecto { public class MainWindow : Gtk.ApplicationWindow { diff --git a/src/EOSConnect/Notification.vala b/src/Conecto/Notification.vala similarity index 98% rename from src/EOSConnect/Notification.vala rename to src/Conecto/Notification.vala index 2866fb1bcbd497a1feaffb823f9f47f7ad906862..0e7fe4a7e8907281ada49386855de5c27d337488 100644 --- a/src/EOSConnect/Notification.vala +++ b/src/Conecto/Notification.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000(at] ijaz.fr> */ - namespace EOSConnect { + namespace Conecto { public class Notification : Object { public string id { get; private set; } public string app_name { get; private set; } diff --git a/src/EOSConnect/Plugin/Battery.vala b/src/Conecto/Plugin/Battery.vala similarity index 95% rename from src/EOSConnect/Plugin/Battery.vala rename to src/Conecto/Plugin/Battery.vala index 92bf49d58b5ecf3a90e08472b26713da0297d99c..9c97f52a4b6b0515215e65438fb5fd179c3767a9 100644 --- a/src/EOSConnect/Plugin/Battery.vala +++ b/src/Conecto/Plugin/Battery.vala @@ -15,12 +15,12 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Plugin.Popover; -using EOSConnect.Widgets; +using Conecto.Plugin.Popover; +using Conecto.Widgets; using Gee; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class Battery : PluginInterface { diff --git a/src/EOSConnect/Plugin/Dialogs/NotificationSettings.vala b/src/Conecto/Plugin/Dialogs/NotificationSettings.vala similarity index 99% rename from src/EOSConnect/Plugin/Dialogs/NotificationSettings.vala rename to src/Conecto/Plugin/Dialogs/NotificationSettings.vala index c63d4275692ac8e388be581beff329462eb7e005..484776e7855530967daaa79ad2a282e84506061b 100644 --- a/src/EOSConnect/Plugin/Dialogs/NotificationSettings.vala +++ b/src/Conecto/Plugin/Dialogs/NotificationSettings.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; using MConnect; -namespace EOSConnect.Plugin.Dialogs { +namespace Conecto.Plugin.Dialogs { public class NotificationSettings : Gtk.Dialog { diff --git a/src/EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala b/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala similarity index 98% rename from src/EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala rename to src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala index a642b3c38c011c14d2cca3b50d606f297136a62b..173fd74fc1f5d8168fc62a6a7b2f03f65b5d118c 100644 --- a/src/EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala +++ b/src/Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala @@ -15,9 +15,9 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; -namespace EOSConnect.Plugin.Dialogs { +namespace Conecto.Plugin.Dialogs { public class ShareFileInfoProgress : Gtk.Dialog { diff --git a/src/EOSConnect/Plugin/Notification.vala b/src/Conecto/Plugin/Notification.vala similarity index 96% rename from src/EOSConnect/Plugin/Notification.vala rename to src/Conecto/Plugin/Notification.vala index a84f73ac419c831b0265a59d6898fbeeaf11b6b9..8351b4b6e3648a748bf556c25dcb26d07f046b09 100644 --- a/src/EOSConnect/Plugin/Notification.vala +++ b/src/Conecto/Plugin/Notification.vala @@ -15,11 +15,11 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Plugin.Dialogs; +using Conecto.Plugin.Dialogs; using Gee; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class @Notification : PluginInterface { diff --git a/src/EOSConnect/Plugin/Ping.vala b/src/Conecto/Plugin/Ping.vala similarity index 93% rename from src/EOSConnect/Plugin/Ping.vala rename to src/Conecto/Plugin/Ping.vala index 1d756db36d753c551ee54795fdf6ed7a6ca9b2f9..33c746086f37dc90f2d36e751a56aaf230aad028 100644 --- a/src/EOSConnect/Plugin/Ping.vala +++ b/src/Conecto/Plugin/Ping.vala @@ -15,11 +15,11 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Widgets; -using EOSConnect.Plugin; +using Conecto.Widgets; +using Conecto.Plugin; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class Ping : PluginInterface { diff --git a/src/EOSConnect/Plugin/PluginInterface.vala b/src/Conecto/Plugin/PluginInterface.vala similarity index 97% rename from src/EOSConnect/Plugin/PluginInterface.vala rename to src/Conecto/Plugin/PluginInterface.vala index 12c2ad0186be872d8a561f114c6fbf3f6dd22ba1..f5f5d549d6c291453d63272af73883f2cbb3df0d 100644 --- a/src/EOSConnect/Plugin/PluginInterface.vala +++ b/src/Conecto/Plugin/PluginInterface.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Widgets; +using Conecto.Widgets; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public abstract class PluginInterface : GLib.Object { diff --git a/src/EOSConnect/Plugin/Popover/BatterySettings.vala b/src/Conecto/Plugin/Popover/BatterySettings.vala similarity index 98% rename from src/EOSConnect/Plugin/Popover/BatterySettings.vala rename to src/Conecto/Plugin/Popover/BatterySettings.vala index a21187f8c8daab492a2d1e22e3afed544fae29c8..a5eda8446d47f2010738bec7ca9ec36e57f266cd 100644 --- a/src/EOSConnect/Plugin/Popover/BatterySettings.vala +++ b/src/Conecto/Plugin/Popover/BatterySettings.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; using MConnect; -namespace EOSConnect.Plugin.Popover { +namespace Conecto.Plugin.Popover { public class BatterySettings : Gtk.Popover { diff --git a/src/EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala b/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala similarity index 98% rename from src/EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala rename to src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala index 6bb0f28405fe5d920ef483bdd1634f0b9dd3b98b..506fb38f62806aec146a1a83e758400e55e400cf 100644 --- a/src/EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala +++ b/src/Conecto/Plugin/Popover/SMSNewMessageNewContact.vala @@ -15,12 +15,12 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; -using EOSConnect.Plugin.Widgets; +using Conecto; +using Conecto.Plugin.Widgets; using Gee; using MConnect; -namespace EOSConnect.Plugin.Popover { +namespace Conecto.Plugin.Popover { public class SMSNewMessageNewContact : Gtk.Popover { @@ -83,7 +83,7 @@ namespace EOSConnect.Plugin.Popover { SMS sms = new SMS ( message, SMS.FROM_ME, - SMS.FROM_TYPE_EOSCONNECT, + SMS.FROM_TYPE_CONECTO, new DateTime.now_utc ()); if (device.has_capability_handler (TelephonyHandler.TELEPHONY) ) { diff --git a/src/EOSConnect/Plugin/Popover/ShareSettings.vala b/src/Conecto/Plugin/Popover/ShareSettings.vala similarity index 97% rename from src/EOSConnect/Plugin/Popover/ShareSettings.vala rename to src/Conecto/Plugin/Popover/ShareSettings.vala index d9615ff93209f6e3814b4b1c86495dc36d7640a6..c69e8816661b578efe38d1defc8e246762998a98 100644 --- a/src/EOSConnect/Plugin/Popover/ShareSettings.vala +++ b/src/Conecto/Plugin/Popover/ShareSettings.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; using MConnect; -namespace EOSConnect.Plugin.Popover { +namespace Conecto.Plugin.Popover { public class ShareSettings : Gtk.Popover { diff --git a/src/EOSConnect/Plugin/Popover/TelephonySettings.vala b/src/Conecto/Plugin/Popover/TelephonySettings.vala similarity index 98% rename from src/EOSConnect/Plugin/Popover/TelephonySettings.vala rename to src/Conecto/Plugin/Popover/TelephonySettings.vala index a03256fd60504ab5abdf58f0e8effc4cd1ddb377..f28e97dc1c1634ac2cf40f6d3325792438e03a05 100644 --- a/src/EOSConnect/Plugin/Popover/TelephonySettings.vala +++ b/src/Conecto/Plugin/Popover/TelephonySettings.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; using MConnect; -namespace EOSConnect.Plugin.Popover { +namespace Conecto.Plugin.Popover { public class TelephonySettings : Gtk.Popover { diff --git a/src/EOSConnect/Plugin/SMS.vala b/src/Conecto/Plugin/SMS.vala similarity index 94% rename from src/EOSConnect/Plugin/SMS.vala rename to src/Conecto/Plugin/SMS.vala index 26509c7ba8d202d892aab4b5ed5f0df34432fffe..234e4f50a9f2559eb5f5d9a8aed30830986d2e60 100644 --- a/src/EOSConnect/Plugin/SMS.vala +++ b/src/Conecto/Plugin/SMS.vala @@ -15,13 +15,13 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ - namespace EOSConnect.Plugin { + namespace Conecto.Plugin { public class SMS : Object { public const int FROM_TYPE_TELEPHONY = 1; public const int FROM_TYPE_NOTIFICATION = 2; - public const int FROM_TYPE_EOSCONNECT = 3; + public const int FROM_TYPE_CONECTO = 3; public const int FROM_CONTACT = 1; public const int FROM_ME = 2; diff --git a/src/EOSConnect/Plugin/SMSContact.vala b/src/Conecto/Plugin/SMSContact.vala similarity index 98% rename from src/EOSConnect/Plugin/SMSContact.vala rename to src/Conecto/Plugin/SMSContact.vala index 3978bc8370625baaf3ffb42fdaf543e66d454e12..32da043b2133847161c214cc32e3e32acdbdcf63 100644 --- a/src/EOSConnect/Plugin/SMSContact.vala +++ b/src/Conecto/Plugin/SMSContact.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class SMSContact : Object { diff --git a/src/EOSConnect/Plugin/SMSStore.vala b/src/Conecto/Plugin/SMSStore.vala similarity index 97% rename from src/EOSConnect/Plugin/SMSStore.vala rename to src/Conecto/Plugin/SMSStore.vala index 6d1778791e460a1f6c7c62bc3055884152b2c9a6..8dbe5a818461c841e8c69b2798c5e46d78b642bb 100644 --- a/src/EOSConnect/Plugin/SMSStore.vala +++ b/src/Conecto/Plugin/SMSStore.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class SMSStore : GLib.Object { diff --git a/src/EOSConnect/Plugin/SMSStoreFactory.vala b/src/Conecto/Plugin/SMSStoreFactory.vala similarity index 98% rename from src/EOSConnect/Plugin/SMSStoreFactory.vala rename to src/Conecto/Plugin/SMSStoreFactory.vala index 03e8b472113d0a02648df78c1b932631a7d501a6..ce2e24451c4d60893d6dfaadca596962e8f9d595 100644 --- a/src/EOSConnect/Plugin/SMSStoreFactory.vala +++ b/src/Conecto/Plugin/SMSStoreFactory.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public abstract class SMSStoreFactory : Object { diff --git a/src/EOSConnect/Plugin/SMSStoreInterface.vala b/src/Conecto/Plugin/SMSStoreInterface.vala similarity index 98% rename from src/EOSConnect/Plugin/SMSStoreInterface.vala rename to src/Conecto/Plugin/SMSStoreInterface.vala index 4c8d72a0b251137ee511df64a0ee119a27269e53..a90eb0cd210b15e468df3389dd96eed0884bcf98 100644 --- a/src/EOSConnect/Plugin/SMSStoreInterface.vala +++ b/src/Conecto/Plugin/SMSStoreInterface.vala @@ -18,7 +18,7 @@ using Gee; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public abstract class SMSStoreInterface : Object { diff --git a/src/EOSConnect/Plugin/SMSStoreSQLite.vala b/src/Conecto/Plugin/SMSStoreSQLite.vala similarity index 99% rename from src/EOSConnect/Plugin/SMSStoreSQLite.vala rename to src/Conecto/Plugin/SMSStoreSQLite.vala index de164c58768bf4374967de1a886b6f006d315941..e41416f6a6166978bbc22c677d15699ec7f8bd16 100644 --- a/src/EOSConnect/Plugin/SMSStoreSQLite.vala +++ b/src/Conecto/Plugin/SMSStoreSQLite.vala @@ -19,7 +19,7 @@ using Gee; using MConnect; using Sqlite; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class SMSStoreSQLite : SMSStoreInterface { diff --git a/src/EOSConnect/Plugin/SMSStoreTemp.vala b/src/Conecto/Plugin/SMSStoreTemp.vala similarity index 96% rename from src/EOSConnect/Plugin/SMSStoreTemp.vala rename to src/Conecto/Plugin/SMSStoreTemp.vala index f4575feac3009e23d52f3651b71a2521e60fbdc7..a224c05bd69ca0a7421f83c73cc0354647b2803e 100644 --- a/src/EOSConnect/Plugin/SMSStoreTemp.vala +++ b/src/Conecto/Plugin/SMSStoreTemp.vala @@ -18,7 +18,7 @@ using MConnect; using Sqlite; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class SMSStoreTemp : SMSStoreInterface { diff --git a/src/EOSConnect/Plugin/Share.vala b/src/Conecto/Plugin/Share.vala similarity index 96% rename from src/EOSConnect/Plugin/Share.vala rename to src/Conecto/Plugin/Share.vala index 98a8135750284683d513ac8c77f47c431e6dee22..210805ca27ce900a3d267a68e4ba71721fda3e98 100644 --- a/src/EOSConnect/Plugin/Share.vala +++ b/src/Conecto/Plugin/Share.vala @@ -15,13 +15,13 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Plugin.Popover; -using EOSConnect.Plugin.Dialogs; -using EOSConnect.Widgets; +using Conecto.Plugin.Popover; +using Conecto.Plugin.Dialogs; +using Conecto.Widgets; using Gee; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class Share : PluginInterface { diff --git a/src/EOSConnect/Plugin/Telephony.vala b/src/Conecto/Plugin/Telephony.vala similarity index 93% rename from src/EOSConnect/Plugin/Telephony.vala rename to src/Conecto/Plugin/Telephony.vala index 3f8b2f57509ceda105d0959b9f03be1952b19d16..2edbaead008912aacf1eca51257e4f57823df2ed 100644 --- a/src/EOSConnect/Plugin/Telephony.vala +++ b/src/Conecto/Plugin/Telephony.vala @@ -16,13 +16,13 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using Gee; -using EOSConnect; -using EOSConnect.Widgets; -using EOSConnect.Plugin; -using EOSConnect.Plugin.Popover; +using Conecto; +using Conecto.Widgets; +using Conecto.Plugin; +using Conecto.Plugin.Popover; using MConnect; -namespace EOSConnect.Plugin { +namespace Conecto.Plugin { public class Telephony : PluginInterface { diff --git a/src/EOSConnect/Plugin/Views/SMSMessagesView.vala b/src/Conecto/Plugin/Views/SMSMessagesView.vala similarity index 98% rename from src/EOSConnect/Plugin/Views/SMSMessagesView.vala rename to src/Conecto/Plugin/Views/SMSMessagesView.vala index af941a19a2501a75420518f35ee34dafb9d291d8..78e8233711215a6bc73153a40f2cdaaba0c1b41f 100644 --- a/src/EOSConnect/Plugin/Views/SMSMessagesView.vala +++ b/src/Conecto/Plugin/Views/SMSMessagesView.vala @@ -15,13 +15,13 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; -using EOSConnect.Plugin; -using EOSConnect.Plugin.Widgets; +using Conecto; +using Conecto.Plugin; +using Conecto.Plugin.Widgets; using Gee; using MConnect; -namespace EOSConnect.Plugin.Views { +namespace Conecto.Plugin.Views { public class SMSMessagesView : Gtk.Grid { @@ -173,7 +173,7 @@ namespace EOSConnect.Plugin.Views { SMS sms = new SMS ( message, SMS.FROM_ME, - SMS.FROM_TYPE_EOSCONNECT, + SMS.FROM_TYPE_CONECTO, new DateTime.now_utc ()); if (device.has_capability_handler (TelephonyHandler.TELEPHONY) ) { diff --git a/src/EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala similarity index 96% rename from src/EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala rename to src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala index 6b1e67612f0302d5f072f1018d240125ec97d4fa..9632ba8ab7bedb7f86b1a9ebacfe54dc6f06442d 100644 --- a/src/EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala +++ b/src/Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ - using EOSConnect.Widgets; + using Conecto.Widgets; using MConnect; -namespace EOSConnect.Plugin.Widgets { +namespace Conecto.Plugin.Widgets { public class BatteryPluginListBoxRow : PluginListBoxRow { diff --git a/src/EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala similarity index 97% rename from src/EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala rename to src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala index 768a3ca113e4f2fe5813935f3fd9293b4bb93322..b04ef11246689186206da119ca0af2506433b159 100644 --- a/src/EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala +++ b/src/Conecto/Plugin/Widgets/PingPluginListBoxRow.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Widgets; +using Conecto.Widgets; using MConnect; -namespace EOSConnect.Plugin.Widgets { +namespace Conecto.Plugin.Widgets { public class PingPluginListBoxRow : PluginListBoxRow { diff --git a/src/EOSConnect/Plugin/Widgets/SMSContactListBox.vala b/src/Conecto/Plugin/Widgets/SMSContactListBox.vala similarity index 96% rename from src/EOSConnect/Plugin/Widgets/SMSContactListBox.vala rename to src/Conecto/Plugin/Widgets/SMSContactListBox.vala index 80d735d9f411478b4730fe7728239c1c374c5bbe..5613d9e4fd149be2a6c6f0ace2dcfce06bdc458e 100644 --- a/src/EOSConnect/Plugin/Widgets/SMSContactListBox.vala +++ b/src/Conecto/Plugin/Widgets/SMSContactListBox.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; using MConnect; -namespace EOSConnect.Plugin.Widgets { +namespace Conecto.Plugin.Widgets { public class SMSContactListBox : Gtk.ListBox { diff --git a/src/EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala b/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala similarity index 97% rename from src/EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala rename to src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala index 2f242fa395b0e1704f12f7db1fe528b4e71c4c0e..7aab8d4444cf335a56fd09d465be87f797db01e1 100644 --- a/src/EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala +++ b/src/Conecto/Plugin/Widgets/SMSContactListBoxRow.vala @@ -15,11 +15,11 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; -using EOSConnect.Plugin; +using Conecto; +using Conecto.Plugin; using MConnect; -namespace EOSConnect.Plugin.Widgets { +namespace Conecto.Plugin.Widgets { public class SMSContactListBoxRow : Gtk.ListBoxRow { diff --git a/src/EOSConnect/Plugin/Widgets/SMSTextEntry.vala b/src/Conecto/Plugin/Widgets/SMSTextEntry.vala similarity index 97% rename from src/EOSConnect/Plugin/Widgets/SMSTextEntry.vala rename to src/Conecto/Plugin/Widgets/SMSTextEntry.vala index 6f32d9a4fa6a9bddd73f6aadf0b051bf3e0ff8df..fe5d934439b8fc5f1239041986a788d221b9fdb3 100644 --- a/src/EOSConnect/Plugin/Widgets/SMSTextEntry.vala +++ b/src/Conecto/Plugin/Widgets/SMSTextEntry.vala @@ -16,12 +16,12 @@ * gyan000 <gyan000 (at] ijaz.fr> */ - using EOSConnect; - using EOSConnect.Plugin; + using Conecto; + using Conecto.Plugin; using Gee; using MConnect; - namespace EOSConnect.Plugin.Widgets { + namespace Conecto.Plugin.Widgets { public class SMSTextEntry : Gtk.Box { diff --git a/src/EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala b/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala similarity index 96% rename from src/EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala rename to src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala index b8c00188542d30c9d5ccaacdbcc3067cdd0acd97..b5911a08f584288fbab781a265023bb948bc39df 100644 --- a/src/EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala +++ b/src/Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ - using EOSConnect.Widgets; + using Conecto.Widgets; using MConnect; -namespace EOSConnect.Plugin.Widgets { +namespace Conecto.Plugin.Widgets { public class TelephonyPluginListBoxRow : PluginListBoxRow { diff --git a/src/EOSConnect/Plugin/Windows/SMSHistory.vala b/src/Conecto/Plugin/Windows/SMSHistory.vala similarity index 98% rename from src/EOSConnect/Plugin/Windows/SMSHistory.vala rename to src/Conecto/Plugin/Windows/SMSHistory.vala index cd14eb71a73252dee9d213c2046b9e38958d1700..69129eee3a854a9c7269dc9d09c06f314b35930c 100644 --- a/src/EOSConnect/Plugin/Windows/SMSHistory.vala +++ b/src/Conecto/Plugin/Windows/SMSHistory.vala @@ -16,12 +16,12 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using Gee; -using EOSConnect; -using EOSConnect.Plugin; -using EOSConnect.Plugin.Views; +using Conecto; +using Conecto.Plugin; +using Conecto.Plugin.Views; using MConnect; -namespace EOSConnect.Plugin.Windows { +namespace Conecto.Plugin.Windows { public class SMSHistory : Gtk.Stack { diff --git a/src/EOSConnect/Tools.vala b/src/Conecto/Tools.vala similarity index 99% rename from src/EOSConnect/Tools.vala rename to src/Conecto/Tools.vala index 4ec1961db9c1501fdf1bcd976508693951db00ee..90670fb9a5a4ce0a84d3592e327d3cffba7b449f 100644 --- a/src/EOSConnect/Tools.vala +++ b/src/Conecto/Tools.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect { +namespace Conecto { public class Tools { diff --git a/src/EOSConnect/Views/DeviceSettingsView.vala b/src/Conecto/Views/DeviceSettingsView.vala similarity index 99% rename from src/EOSConnect/Views/DeviceSettingsView.vala rename to src/Conecto/Views/DeviceSettingsView.vala index 416f7cb0dd2789a4996f082ef2e94664de5168bc..e92c7d94e25b1d3507ffddaf4f4305c9d01d7c99 100644 --- a/src/EOSConnect/Views/DeviceSettingsView.vala +++ b/src/Conecto/Views/DeviceSettingsView.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect.Views { +namespace Conecto.Views { public class DeviceSettingsView : Granite.SimpleSettingsPage { diff --git a/src/EOSConnect/Views/DevicesView.vala b/src/Conecto/Views/DevicesView.vala similarity index 99% rename from src/EOSConnect/Views/DevicesView.vala rename to src/Conecto/Views/DevicesView.vala index 0e6ddbcff706d12bdf4491f648fb9253f5e42254..bf0da4afb2b1f3a223e5dcf8270c88917df7cf35 100644 --- a/src/EOSConnect/Views/DevicesView.vala +++ b/src/Conecto/Views/DevicesView.vala @@ -19,7 +19,7 @@ using Gee; using Granite.Widgets; using MConnect; -namespace EOSConnect.Views { +namespace Conecto.Views { public class DevicesView : Gtk.Frame { diff --git a/src/EOSConnect/Views/MainSettingsView.vala b/src/Conecto/Views/MainSettingsView.vala similarity index 99% rename from src/EOSConnect/Views/MainSettingsView.vala rename to src/Conecto/Views/MainSettingsView.vala index 1a58b291031c5eb8f2dccbd9ddef275c84471e15..9a65ef4d2e9d63137afbce1e714a2fd771b5d6c1 100644 --- a/src/EOSConnect/Views/MainSettingsView.vala +++ b/src/Conecto/Views/MainSettingsView.vala @@ -15,7 +15,7 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -namespace EOSConnect.Views { +namespace Conecto.Views { public class MainSettingsView : Gtk.Stack { diff --git a/src/EOSConnect/Widgets/DeviceListActionBarFooter.vala b/src/Conecto/Widgets/DeviceListActionBarFooter.vala similarity index 98% rename from src/EOSConnect/Widgets/DeviceListActionBarFooter.vala rename to src/Conecto/Widgets/DeviceListActionBarFooter.vala index 5674b2cd37ed7bd117bba6a085fc31a34083cbd1..260c3bf4eb7db9d463731a1f28d1e54924e98800 100644 --- a/src/EOSConnect/Widgets/DeviceListActionBarFooter.vala +++ b/src/Conecto/Widgets/DeviceListActionBarFooter.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect.Widgets { +namespace Conecto.Widgets { public class DeviceListActionBarFooter : Gtk.ActionBar { diff --git a/src/EOSConnect/Widgets/DeviceListBox.vala b/src/Conecto/Widgets/DeviceListBox.vala similarity index 98% rename from src/EOSConnect/Widgets/DeviceListBox.vala rename to src/Conecto/Widgets/DeviceListBox.vala index 541dd90b30c55572b965d131a37dabace5259e9e..a461cf7f8c397d904be85857ba636240e6628115 100644 --- a/src/EOSConnect/Widgets/DeviceListBox.vala +++ b/src/Conecto/Widgets/DeviceListBox.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect.Widgets { +namespace Conecto.Widgets { public class DeviceListBox : Gtk.ListBox { diff --git a/src/EOSConnect/Widgets/DeviceListBoxRow.vala b/src/Conecto/Widgets/DeviceListBoxRow.vala similarity index 98% rename from src/EOSConnect/Widgets/DeviceListBoxRow.vala rename to src/Conecto/Widgets/DeviceListBoxRow.vala index 3a675b3578b422fa82d864144e6507b89e14219f..3006cd8ee5444d3bc2e5dafc6745c9b4812c6d9d 100644 --- a/src/EOSConnect/Widgets/DeviceListBoxRow.vala +++ b/src/Conecto/Widgets/DeviceListBoxRow.vala @@ -17,7 +17,7 @@ */ using MConnect; -namespace EOSConnect.Widgets { +namespace Conecto.Widgets { public class DeviceListBoxRow : Gtk.ListBoxRow { diff --git a/src/EOSConnect/Widgets/DeviceMenuitem.vala b/src/Conecto/Widgets/DeviceMenuitem.vala similarity index 95% rename from src/EOSConnect/Widgets/DeviceMenuitem.vala rename to src/Conecto/Widgets/DeviceMenuitem.vala index dc181e8b9b07724c726818a5d4619953785543e0..75e95d5c6fabe8744a4705a3a13d56e8d4bd76db 100644 --- a/src/EOSConnect/Widgets/DeviceMenuitem.vala +++ b/src/Conecto/Widgets/DeviceMenuitem.vala @@ -16,10 +16,10 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using MConnect; -using EOSConnect.Plugin; -using EOSConnect.Plugin.Windows; +using Conecto.Plugin; +using Conecto.Plugin.Windows; -namespace EOSConnect.Widgets { +namespace Conecto.Widgets { public class DeviceMenuitem : Dbusmenu.Menuitem { @@ -105,7 +105,7 @@ namespace EOSConnect.Widgets { ((Share)device.get_plugin (ShareHandler.SHARE_PKT)).select_files (device); }); child_append (sub_menu_item_share); - EOSConnect.Contractor.create_contract (device); + Conecto.Contractor.create_contract (device); } sub_menu_item_share.property_set (Dbusmenu.MENUITEM_PROP_ICON_NAME, "send-to"); @@ -114,7 +114,7 @@ namespace EOSConnect.Widgets { if (sub_menu_item_share != null) { child_delete (sub_menu_item_share); sub_menu_item_share = null; - EOSConnect.Contractor.destroy_contract (device); + Conecto.Contractor.destroy_contract (device); } } } diff --git a/src/EOSConnect/Widgets/PluginListBox.vala b/src/Conecto/Widgets/PluginListBox.vala similarity index 97% rename from src/EOSConnect/Widgets/PluginListBox.vala rename to src/Conecto/Widgets/PluginListBox.vala index 59ee8e65825d4dc612a6d2ce1aa96cccfdcc1f1b..94e61bcc2da97960d7bb7e4a053a72010c907d1a 100644 --- a/src/EOSConnect/Widgets/PluginListBox.vala +++ b/src/Conecto/Widgets/PluginListBox.vala @@ -16,9 +16,9 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using MConnect; -using EOSConnect.Plugin; +using Conecto.Plugin; -namespace EOSConnect.Widgets { +namespace Conecto.Widgets { public class PluginListBox : Gtk.ListBox { diff --git a/src/EOSConnect/Widgets/PluginListBoxRow.vala b/src/Conecto/Widgets/PluginListBoxRow.vala similarity index 98% rename from src/EOSConnect/Widgets/PluginListBoxRow.vala rename to src/Conecto/Widgets/PluginListBoxRow.vala index b58319e8cf84823c5cd6bca32a1c775d22c278be..0b778bf0f10175c81cbad588ef34399edd7bb537 100644 --- a/src/EOSConnect/Widgets/PluginListBoxRow.vala +++ b/src/Conecto/Widgets/PluginListBoxRow.vala @@ -15,10 +15,10 @@ * AUTHORS * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Plugin; +using Conecto.Plugin; using MConnect; -namespace EOSConnect.Widgets { +namespace Conecto.Widgets { public class PluginListBoxRow : Gtk.ListBoxRow { public weak PluginInterface plugin_interface { get; construct; } diff --git a/src/MConnect/BatteryHandler.vala b/src/MConnect/BatteryHandler.vala index 9fc8a39e11da88c8e9ffb961d325807aedd5f806..d4f0b36a6872dffe30198cb1712609953959ce7a 100644 --- a/src/MConnect/BatteryHandler.vala +++ b/src/MConnect/BatteryHandler.vala @@ -16,7 +16,7 @@ * Maciek Borzecki <maciek.borzecki (at] gmail.com> * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; +using Conecto; namespace MConnect { diff --git a/src/MConnect/Device.vala b/src/MConnect/Device.vala index b9af4e5c08df88861b1501871fd48d5c2fea1358..82c401f8081498249f9b9e152ef56b4e2da8f9d0 100644 --- a/src/MConnect/Device.vala +++ b/src/MConnect/Device.vala @@ -17,8 +17,8 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using Gee; -using EOSConnect; -using EOSConnect.Plugin; +using Conecto; +using Conecto.Plugin; namespace MConnect { @@ -397,13 +397,13 @@ namespace MConnect { public void setup_plugins () { var schema = SettingsSchemaSource.get_default ().lookup ( - EOSConnect.App.GSETTINGS_SCHEMA_ID + ".settings.device", + Conecto.App.GSETTINGS_SCHEMA_ID + ".settings.device", false); if (schema != null) { debug ("Getting config for device ID: " + id); settings = new GLib.Settings.full (schema, null, - EOSConnect.App.GSETTINGS_SCHEMA_PATH + "/settings/devices/%s/".printf (id)); + Conecto.App.GSETTINGS_SCHEMA_PATH + "/settings/devices/%s/".printf (id)); if (settings.get_string ("custom-name").length > 1) { custom_name = settings.get_string ("custom-name"); diff --git a/src/MConnect/DeviceManager.vala b/src/MConnect/DeviceManager.vala index 7de7246c88e5c4f5960e9b0ed97281137ef93163..78912cf7a678bf1ebad2545ae9682de7eb57a130 100644 --- a/src/MConnect/DeviceManager.vala +++ b/src/MConnect/DeviceManager.vala @@ -17,7 +17,7 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using Gee; -using EOSConnect; +using Conecto; namespace MConnect { diff --git a/src/MConnect/DownloadTransfer.vala b/src/MConnect/DownloadTransfer.vala index 30bd5acd8bc0d4a9edf64918f25e7aa08ebf91cd..5ac44387bdc73d828613025a223d49acd2fc4f2e 100644 --- a/src/MConnect/DownloadTransfer.vala +++ b/src/MConnect/DownloadTransfer.vala @@ -35,7 +35,7 @@ namespace MConnect { public string destination = ""; public DownloadTransfer (Device device, InetSocketAddress isa, uint64 size, string destination) { - this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (EOSConnect.App.GSETTINGS_SCHEMA_ID + ".desktop"); + this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (Conecto.App.GSETTINGS_SCHEMA_ID + ".desktop"); this.isa = isa; this.cancellable = new Cancellable (); this.destination = destination; diff --git a/src/MConnect/MConnectThread.vala b/src/MConnect/MConnectThread.vala index 6c549218ddb353624f74cdfffbe2b7a11373d533..845f1003f44dc71602aa98c58562384ef7c525c9 100644 --- a/src/MConnect/MConnectThread.vala +++ b/src/MConnect/MConnectThread.vala @@ -91,7 +91,7 @@ namespace MConnect { discovery.listen (); - Bus.own_name (BusType.SESSION, "com.github.gyan000.eos-connect", BusNameOwnerFlags.NONE, + Bus.own_name (BusType.SESSION, "com.github.hannesschulze.conecto", BusNameOwnerFlags.NONE, on_bus_aquired, () => {}, () => stderr.printf ("Could not aquire name\n")); @@ -108,7 +108,7 @@ namespace MConnect { public void on_bus_aquired (DBusConnection conn) { try { // Share service. - conn.register_object ("/com/github/gyan000/eosconnect/share", new ShareHandlerProxy ()); + conn.register_object ("/com/github/hannesschulze/conecto/share", new ShareHandlerProxy ()); } catch (IOError e) { warning ("Could not register service.\n"); } diff --git a/src/MConnect/NotificationHandler.vala b/src/MConnect/NotificationHandler.vala index 4937abc966d9c5b254d848df3a416d2caec96266..f73483ec94891568b17b7d67a012374420ea41e7 100644 --- a/src/MConnect/NotificationHandler.vala +++ b/src/MConnect/NotificationHandler.vala @@ -17,7 +17,7 @@ * gyan000 <gyan000 (at] ijaz.fr> */ using Gee; -using EOSConnect; +using Conecto; namespace MConnect { diff --git a/src/MConnect/ShareHandler.vala b/src/MConnect/ShareHandler.vala index 128261c269229b93d7d5b3921be732c9e27973bd..373be75a895f044117660fa18bc747247b76d188 100644 --- a/src/MConnect/ShareHandler.vala +++ b/src/MConnect/ShareHandler.vala @@ -37,7 +37,7 @@ namespace MConnect { if (ShareHandler.DOWNLOADS == null) { ShareHandler.DOWNLOADS = Path.build_filename ( - Environment.get_user_special_dir (UserDirectory.DOWNLOAD), "EOSConnect"); + Environment.get_user_special_dir (UserDirectory.DOWNLOAD), "Conecto"); if (DirUtils.create_with_parents (ShareHandler.DOWNLOADS, 0700) == -1) { warning ("Failed to create downloads directory: %s", Posix.strerror (Posix.errno)); diff --git a/src/MConnect/ShareHandlerProxy.vala b/src/MConnect/ShareHandlerProxy.vala index f64f171bddeee74493f63cf44cab272915148fa9..a95e86062fbbef88eff2e8c5f01eec814cd0389c 100644 --- a/src/MConnect/ShareHandlerProxy.vala +++ b/src/MConnect/ShareHandlerProxy.vala @@ -16,11 +16,11 @@ * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect.Plugin; +using Conecto.Plugin; using Gee; using MConnect; -[DBus (name = "com.github.gyan000.eosconnect.Share")] +[DBus (name = "com.github.hannesschulze.conecto.Share")] class ShareHandlerProxy : Object { // private HashMap<string, Device> devices_map; @@ -51,7 +51,7 @@ class ShareHandlerProxy : Object { } } -[DBus (name = "com.github.gyan000.eosconnect.ShareError")] +[DBus (name = "com.github.hannesschulze.conecto.ShareError")] public errordomain ShareError { SOME_ERROR } diff --git a/src/MConnect/TelephonyHandler.vala b/src/MConnect/TelephonyHandler.vala index 5b248df9d08954610106b740966d36b211664f20..3800e81c0363f2db00a19365077fa2c24d6cd6f2 100644 --- a/src/MConnect/TelephonyHandler.vala +++ b/src/MConnect/TelephonyHandler.vala @@ -16,8 +16,8 @@ * Maciek Borzecki <maciek.borzecki (at] gmail.com> * gyan000 <gyan000 (at] ijaz.fr> */ -using EOSConnect; -using EOSConnect.Plugin; +using Conecto; +using Conecto.Plugin; namespace MConnect { @@ -108,7 +108,7 @@ namespace MConnect { notification.set_body (notif_body); if (event == "sms") { - // Action defined in EOSConnect._init_sms_history_view () + // Action defined in Conecto._init_sms_history_view () notification.set_default_action ("app.telephony-open-sms-tab"); } diff --git a/src/MConnect/UploadTransfer.vala b/src/MConnect/UploadTransfer.vala index a5d51f4c55a1d400c79c0eeab9ba961a707b1925..2fe9b19377bea114d76e786ad805632ed7c12cef 100644 --- a/src/MConnect/UploadTransfer.vala +++ b/src/MConnect/UploadTransfer.vala @@ -43,7 +43,7 @@ namespace MConnect { int file_num = 1, string file_uri = "" ) { - this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (EOSConnect.App.GSETTINGS_SCHEMA_ID + ".desktop"); + this.launcher_entry = Unity.LauncherEntry.get_for_desktop_id (Conecto.App.GSETTINGS_SCHEMA_ID + ".desktop"); this.socket_service = socket_service; this.cancellable = new Cancellable (); this.device = device; diff --git a/src/meson.build b/src/meson.build index 466b4e77892d043983e148fb044eec18179115c3..859e8529996b375837851988573278cd99e2e09a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,49 +1,49 @@ -all_files = files( - 'EOSConnect/Config.vala', - 'EOSConnect/Contact.vala', - 'EOSConnect/ContactsInterface.vala', - 'EOSConnect/Contractor.vala', - 'EOSConnect/EContacts.vala', - 'EOSConnect/EOSConnect.vala', - 'EOSConnect/DebugToolbar.vala', - 'EOSConnect/MainWindow.vala', - 'EOSConnect/Plugin/Battery.vala', - 'EOSConnect/Plugin/Dialogs/NotificationSettings.vala', - 'EOSConnect/Plugin/Dialogs/ShareFileInfoProgress.vala', - 'EOSConnect/Plugin/Notification.vala', - 'EOSConnect/Plugin/Ping.vala', - 'EOSConnect/Plugin/PluginInterface.vala', - 'EOSConnect/Plugin/Popover/BatterySettings.vala', - 'EOSConnect/Plugin/Popover/ShareSettings.vala', - 'EOSConnect/Plugin/Popover/SMSNewMessageNewContact.vala', - 'EOSConnect/Plugin/Popover/TelephonySettings.vala', - 'EOSConnect/Plugin/Share.vala', - 'EOSConnect/Plugin/SMS.vala', - 'EOSConnect/Plugin/SMSContact.vala', - 'EOSConnect/Plugin/SMSStore.vala', - 'EOSConnect/Plugin/SMSStoreFactory.vala', - 'EOSConnect/Plugin/SMSStoreInterface.vala', - 'EOSConnect/Plugin/SMSStoreSQLite.vala', - 'EOSConnect/Plugin/SMSStoreTemp.vala', - 'EOSConnect/Plugin/Telephony.vala', - 'EOSConnect/Plugin/Views/SMSMessagesView.vala', - 'EOSConnect/Plugin/Widgets/PingPluginListBoxRow.vala', - 'EOSConnect/Plugin/Widgets/BatteryPluginListBoxRow.vala', - 'EOSConnect/Plugin/Widgets/SMSContactListBox.vala', - 'EOSConnect/Plugin/Widgets/SMSContactListBoxRow.vala', - 'EOSConnect/Plugin/Widgets/SMSTextEntry.vala', - 'EOSConnect/Plugin/Widgets/TelephonyPluginListBoxRow.vala', - 'EOSConnect/Plugin/Windows/SMSHistory.vala', - 'EOSConnect/Tools.vala', - 'EOSConnect/Views/DevicesView.vala', - 'EOSConnect/Views/DeviceSettingsView.vala', - 'EOSConnect/Views/MainSettingsView.vala', - 'EOSConnect/Widgets/DeviceListActionBarFooter.vala', - 'EOSConnect/Widgets/DeviceListBox.vala', - 'EOSConnect/Widgets/DeviceListBoxRow.vala', - 'EOSConnect/Widgets/DeviceMenuitem.vala', - 'EOSConnect/Widgets/PluginListBox.vala', - 'EOSConnect/Widgets/PluginListBoxRow.vala', +conecto_sources = files( + 'Conecto/Config.vala', + 'Conecto/Contact.vala', + 'Conecto/ContactsInterface.vala', + 'Conecto/Contractor.vala', + 'Conecto/EContacts.vala', + 'Conecto/Conecto.vala', + 'Conecto/DebugToolbar.vala', + 'Conecto/MainWindow.vala', + 'Conecto/Plugin/Battery.vala', + 'Conecto/Plugin/Dialogs/NotificationSettings.vala', + 'Conecto/Plugin/Dialogs/ShareFileInfoProgress.vala', + 'Conecto/Plugin/Notification.vala', + 'Conecto/Plugin/Ping.vala', + 'Conecto/Plugin/PluginInterface.vala', + 'Conecto/Plugin/Popover/BatterySettings.vala', + 'Conecto/Plugin/Popover/ShareSettings.vala', + 'Conecto/Plugin/Popover/SMSNewMessageNewContact.vala', + 'Conecto/Plugin/Popover/TelephonySettings.vala', + 'Conecto/Plugin/Share.vala', + 'Conecto/Plugin/SMS.vala', + 'Conecto/Plugin/SMSContact.vala', + 'Conecto/Plugin/SMSStore.vala', + 'Conecto/Plugin/SMSStoreFactory.vala', + 'Conecto/Plugin/SMSStoreInterface.vala', + 'Conecto/Plugin/SMSStoreSQLite.vala', + 'Conecto/Plugin/SMSStoreTemp.vala', + 'Conecto/Plugin/Telephony.vala', + 'Conecto/Plugin/Views/SMSMessagesView.vala', + 'Conecto/Plugin/Widgets/PingPluginListBoxRow.vala', + 'Conecto/Plugin/Widgets/BatteryPluginListBoxRow.vala', + 'Conecto/Plugin/Widgets/SMSContactListBox.vala', + 'Conecto/Plugin/Widgets/SMSContactListBoxRow.vala', + 'Conecto/Plugin/Widgets/SMSTextEntry.vala', + 'Conecto/Plugin/Widgets/TelephonyPluginListBoxRow.vala', + 'Conecto/Plugin/Windows/SMSHistory.vala', + 'Conecto/Tools.vala', + 'Conecto/Views/DevicesView.vala', + 'Conecto/Views/DeviceSettingsView.vala', + 'Conecto/Views/MainSettingsView.vala', + 'Conecto/Widgets/DeviceListActionBarFooter.vala', + 'Conecto/Widgets/DeviceListBox.vala', + 'Conecto/Widgets/DeviceListBoxRow.vala', + 'Conecto/Widgets/DeviceMenuitem.vala', + 'Conecto/Widgets/PluginListBox.vala', + 'Conecto/Widgets/PluginListBoxRow.vala', # 'MConnect/Config.vala', 'MConnect/BatteryHandler.vala', 'MConnect/Core.vala', @@ -72,13 +72,3 @@ all_files = files( 'MConnect/UploadTransfer.vala', 'MConnect/Utils.vala', ) - -executable( - meson.project_name(), - all_files, - #css_gresource, - #icons_gresource, - dependencies: dependencies, - #vala_args: args, - install: true -)