[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 07/96: Build system redone, many fixes to compile, GPLv2+->v3+, applet now appears in XFCE4s Add Items
noreply at xfce.org
noreply at xfce.org
Thu Nov 27 22:20:12 CET 2014
This is an automated email from the git hooks/post-receive script.
nick pushed a commit to branch master
in repository panel-plugins/xfce4-hardware-monitor-plugin.
commit e435786b29c714b01c26df462bdb19a252f0492f
Author: Omega Weapon <OmegaPhil at gmail.com>
Date: Sun Oct 20 17:58:38 2013 +0100
Build system redone, many fixes to compile, GPLv2+->v3+, applet now appears in XFCE4s Add Items
---
COPYING | 912 ++++++++++++++++++++++++-----------
HardwareMonitor.server.in.in | 30 --
Makefile.am | 36 +-
Makefile.in | 190 +++++---
config.h.in | 41 +-
configure.ac | 100 ++--
hardware-monitor.desktop.in | 9 +
hardware-monitor.doap | 40 --
m4/intltool.m4 | 1 +
m4/libtool.m4 | 1 +
m4/ltoptions.m4 | 1 +
m4/ltsugar.m4 | 1 +
m4/ltversion.m4 | 1 +
m4/lt~obsolete.m4 | 1 +
m4/xdt-depends.m4 | 339 +++++++++++++
m4/xdt-features.m4 | 221 +++++++++
m4/xdt-i18n.m4 | 77 +++
po/Makefile.in | 222 ---------
po/Makefile.in.in | 223 +--------
src/Makefile.am | 51 +-
src/Makefile.in | 460 ++++++++++++------
src/applet.cpp | 148 +++---
src/applet.hpp | 32 +-
src/bar-view.cpp | 37 +-
src/bar-view.hpp | 2 +-
src/canvas-view.cpp | 8 +-
src/canvas-view.hpp | 2 +-
src/choose-monitor-window.cpp | 21 +-
src/choose-monitor-window.hpp | 13 +-
src/column-view.cpp | 17 +-
src/column-view.hpp | 2 +-
src/curve-view.cpp | 14 +-
src/curve-view.hpp | 2 +-
src/flame-view.cpp | 14 +-
src/flame-view.hpp | 2 +-
src/gui-helpers.hpp | 2 +-
src/helpers.cpp | 2 +-
src/helpers.hpp | 2 +-
src/i18n.hpp | 2 +-
src/main.cpp.old | 2 +-
src/monitor-impls.cpp | 84 +---
src/monitor-impls.hpp | 2 +-
src/monitor.hpp | 10 +-
src/pixbuf-drawing.hpp | 2 +-
src/preferences-window.cpp | 60 +--
src/preferences-window.hpp | 8 +-
src/{i18n.hpp => register_plugin.c} | 33 +-
src/text-view.cpp | 11 +-
src/text-view.hpp | 2 +-
src/value-history.cpp | 2 +-
src/value-history.hpp | 2 +-
src/view.cpp | 2 +-
src/view.hpp | 2 +-
53 files changed, 2165 insertions(+), 1336 deletions(-)
diff --git a/COPYING b/COPYING
index d60c31a..94a9ed0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,285 +1,626 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
- 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 Library General Public License instead.) You can apply it to
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
-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.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
- To protect your rights, we need to 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.
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must 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.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
-
- 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
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
this License.
- 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
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-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
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
-specifies 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
-
- How to Apply These Terms to Your New Programs
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,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
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- This program is free software; you can redistribute it and/or modify
+ 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 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
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, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, 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:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <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 Library General
-Public License instead of this License.
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/HardwareMonitor.server.in.in b/HardwareMonitor.server.in.in
deleted file mode 100644
index aa8cdd6..0000000
--- a/HardwareMonitor.server.in.in
+++ /dev/null
@@ -1,30 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:HardwareMonitor_Factory"
- type="exe"
- location="@LIBEXECDIR@/@PACKAGE@">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" value="Hardware Monitor Factory"/>
- <oaf_attribute name="description" type="string" value="Factory for hardware monitor applet"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:HardwareMonitor"
- type="factory"
- location="OAFIID:HardwareMonitor_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
- <item value="IDL:Bonobo/Control:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Hardware Monitor"/>
- <oaf_attribute name="description" type="string" _value="Monitor hardware devices"/>
- <oaf_attribute name="panel:category" type="string" _value="Utility"/>
- <oaf_attribute name="panel:icon" type="string" value="hardware-monitor-applet.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/Makefile.am b/Makefile.am
index 627c9cc..ec34bf9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,29 @@
-SUBDIRS = src po # help
+# Based off original GNOME 2 applet build files copyright:
+#
+# 2003-2007 Ole Laursen <olau at hardworking.dk>
+#
+# XFCE4 modifications copyright:
+#
+# 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
+
-# server file
-serverdir = $(libdir)/bonobo/servers
-server_in_files = HardwareMonitor.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+ at SET_MAKE@
-$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@PACKAGE\@|$(PACKAGE)|" $< > $@
+SUBDIRS = src po # help
- at INTLTOOL_SERVER_RULE@
+# Defining optional macro directory
+ACLOCAL_AMFLAGS = -I m4
-# icon
+# Installing the plugin's desktop file in the correct place, with
+# translations merged in
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_DATA = $(PACKAGE_NAME).desktop
+ at INTLTOOL_DESKTOP_RULE@
+
+# Icon
icondir = $(datadir)/pixmaps
-icon_DATA = $(PACKAGE)-applet.png
+icon_DATA = hardware-monitor-applet.png
+
+EXTRA_DIST = $(icon_DATA) $(desktop_DATA) intltool-merge.in \
+ intltool-extract.in intltool-update.in MAINTAINERS
-EXTRA_DIST = $(icon_DATA) $(server_DATA:.server=.server.in.in) \
- intltool-merge.in intltool-extract.in intltool-update.in \
- MAINTAINERS
diff --git a/Makefile.in b/Makefile.in
index 7ce7654..1124683 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -14,6 +14,14 @@
@SET_MAKE@
+# Based off original GNOME 2 applet build files copyright:
+#
+# 2003-2007 Ole Laursen <olau at hardworking.dk>
+#
+# XFCE4 modifications copyright:
+#
+# 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -76,13 +84,21 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in COPYING depcomp install-sh missing
+ $(srcdir)/config.h.in COPYING ar-lib compile config.guess \
+ config.sub depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/xdt-depends.m4 $(top_srcdir)/m4/xdt-i18n.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -145,8 +161,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(serverdir)"
-DATA = $(icon_DATA) $(server_DATA)
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)"
+DATA = $(desktop_DATA) $(icon_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -223,6 +239,7 @@ ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -235,6 +252,7 @@ CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -243,11 +261,15 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DEPS_CFLAGS = @DEPS_CFLAGS@
DEPS_LIBS = @DEPS_LIBS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -267,18 +289,36 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
+LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@
+LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@
+LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@
+LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
+LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
+LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
+LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -294,6 +334,8 @@ POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
SENSORS_CFLAGS = @SENSORS_CFLAGS@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
@@ -302,26 +344,37 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XGETTEXT_ARGS = @XGETTEXT_ARGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -349,17 +402,19 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src po # help
-# server file
-serverdir = $(libdir)/bonobo/servers
-server_in_files = HardwareMonitor.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+# Defining optional macro directory
+ACLOCAL_AMFLAGS = -I m4
+
+# Installing the plugin's desktop file in the correct place, with
+# translations merged in
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_DATA = $(PACKAGE_NAME).desktop
-# icon
+# Icon
icondir = $(datadir)/pixmaps
-icon_DATA = $(PACKAGE)-applet.png
-EXTRA_DIST = $(icon_DATA) $(server_DATA:.server=.server.in.in) \
- intltool-merge.in intltool-extract.in intltool-update.in \
- MAINTAINERS
+icon_DATA = hardware-monitor-applet.png
+EXTRA_DIST = $(icon_DATA) $(desktop_DATA) intltool-merge.in \
+ intltool-extract.in intltool-update.in MAINTAINERS
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -401,8 +456,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -414,48 +469,57 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-install-iconDATA: $(icon_DATA)
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool config.lt
+install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
done
-uninstall-iconDATA:
+uninstall-desktopDATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
-install-serverDATA: $(server_DATA)
+ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-iconDATA: $(icon_DATA)
@$(NORMAL_INSTALL)
- @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(serverdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(serverdir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(serverdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(serverdir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
done
-uninstall-serverDATA:
+uninstall-iconDATA:
@$(NORMAL_UNINSTALL)
- @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(serverdir)'; $(am__uninstall_files_from_dir)
+ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -644,10 +708,16 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -749,7 +819,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(serverdir)"; do \
+ for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -784,12 +854,13 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags
dvi: dvi-recursive
@@ -803,7 +874,7 @@ info: info-recursive
info-am:
-install-data-am: install-iconDATA install-serverDATA
+install-data-am: install-desktopDATA install-iconDATA
install-dvi: install-dvi-recursive
@@ -839,7 +910,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-recursive
@@ -849,32 +920,31 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-iconDATA uninstall-serverDATA
+uninstall-am: uninstall-desktopDATA uninstall-iconDATA
.MAKE: $(am__recursive_targets) all install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-am clean clean-cscope clean-generic \
- cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-iconDATA install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-serverDATA install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-iconDATA uninstall-serverDATA
-
-
-$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@PACKAGE\@|$(PACKAGE)|" $< > $@
-
- at INTLTOOL_SERVER_RULE@
+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+ install-desktopDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-iconDATA \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-desktopDATA \
+ uninstall-iconDATA
+
+
+ at SET_MAKE@
+ at INTLTOOL_DESKTOP_RULE@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/config.h.in b/config.h.in
index 74b2ae3..af020dc 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,7 +3,7 @@
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
-/* "definition of GETTEXT_PACKAGE" */
+/* Name of default gettext domain */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
@@ -12,6 +12,9 @@
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
@@ -54,6 +57,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -78,5 +85,37 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
/* Version number of package */
#undef VERSION
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
diff --git a/configure.ac b/configure.ac
index ea53308..86baa43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,28 +1,73 @@
-AC_INIT(src/main.cpp)
+dnl Based off original GNOME 2 applet build files copyright:
+dnl
+dnl 2003-2007 Ole Laursen <olau at hardworking.dk>
+dnl
+dnl Based off xfce4-genmon-plugins build files, which are copyright:
+dnl
+dnl 2004 Roger Seguin <roger_seguin at msn.com>
+dnl 2006 Julien Devemy <jujucece at gmail.com>
+dnl
+
+dnl XFCE4 modifications copyright:
+dnl
+dnl 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
+dnl
+
+
+dnl Initialising autoconf - this provides PACKAGE_NAME and PACKAGE_VERSION
+dnl output variables
+AC_INIT([hardware-monitor], [1.4.3])
+
+dnl Initialise automake with minimum version 1.13.2 (based off https://www.flameeyes.eu/autotools-mythbuster/forwardporting/automake.html),
+dnl enabling all warnings and errors
+AM_INIT_AUTOMAKE([1.13.2 -Wall -Werror])
+
+dnl Collecting all macro definitions together into this header
AM_CONFIG_HEADER(config.h)
-dnl package name and version number
+dnl Tidy directory for containing extra m4 macros
+AC_CONFIG_MACRO_DIR([m4])
-PACKAGE=hardware-monitor
-VERSION=1.4.3
+AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+dnl Check for UNIX variants
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
-dnl checks for programs
-AC_PROG_INTLTOOL
+dnl Check for basic programs - AM_PROG_AR gets around non-POSIX archiver
+dnl warning
AC_PROG_CXX
-AC_PROG_CC
+AC_PROG_INSTALL
+IT_PROG_INTLTOOL([0.40.0])
+AM_PROG_AR
+
+dnl Initialize libtool, prevent static libraries to remove pointless
+dnl compilation
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+dnl Check for standard header files
+AC_HEADER_STDC
-dnl checks for libraries
-PKG_CHECK_MODULES(DEPS, gtkmm-2.4 >= 2.6.0 \
+dnl Configure the panel plugin (XFCE4 xdt-depends.m4)
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+
+dnl Checks for libraries
+PKG_CHECK_MODULES([DEPS], [gtkmm-2.4 >= 2.6.0 \
libgnomecanvasmm-2.6 >= 2.6.0 \
- libgnomeui-2.0 >= 2.0.0 \
libglademm-2.4 >= 2.4.0 \
- libgtop-2.0 >= 2.6.0)
-AC_SUBST(DEPS_CFLAGS)
-AC_SUBST(DEPS_LIBS)
+ libgtop-2.0 >= 2.6.0])
+
+dnl Translations (XFCE4 xdt-i18n.m4) - this needs to be done before the
+dnl libsensors checking for some reason?? Otherwise the assembler tries
+dnl to open these files in the current directory??
+XDT_I18N([ar as az be bg bn_IN bs ca cs cy da de dz el en_CA en_GB es eu fi fr gl gu he hi hr hu it ja kn ko lv mr ms nb ne nl oc pa pl pt pt_BR ru rw sl sq sr sr at Latn sv ta th tr uk vi zh_CN zh_HK zh_TW])
+
+AC_SUBST([DEPS_CFLAGS])
+AC_SUBST([DEPS_LIBS])
_cppflags="${CPPFLAGS}"
_ldflags="${LDFLAGS}"
@@ -54,29 +99,18 @@ else
fi]))
fi
-AC_SUBST(SENSORS_CFLAGS)
-AC_SUBST(SENSORS_LIBS)
+AC_SUBST([SENSORS_CFLAGS])
+AC_SUBST([SENSORS_LIBS])
CPPFLAGS=${_cppflags}
LDFLAGS=${_ldflags}
-dnl i18n
-ALL_LINGUAS="ar as az be bg bn_IN bs ca cs cy da de dz el en_CA en_GB es eu fi fr gl gu he hi hr hu it ja kn ko lv mr ms nb ne nl oc pa pl pt pt_BR ru rw sl sq sr sr at Latn sv ta th tr uk vi zh_CN zh_HK zh_TW"
-
-GETTEXT_PACKAGE=$PACKAGE
-AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", "definition of GETTEXT_PACKAGE")
-
-dnl extra stuff
+dnl Check for debugging support (XFCE4 xdt-features.m4). TODO: This macro appears to be buggy - complaints about AC_LANG_SOURCE?
+dnl XDT_FEATURE_DEBUG()
-AM_MAINTAINER_MODE
-
-dnl create makefiles
-AC_OUTPUT(
- Makefile
+dnl Create makefiles
+AC_CONFIG_FILES([Makefile
src/Makefile
po/Makefile.in
-dnl help/Makefile
-dnl help/C/Makefile
-)
+])
+AC_OUTPUT
diff --git a/hardware-monitor.desktop.in b/hardware-monitor.desktop.in
new file mode 100644
index 0000000..c5e073d
--- /dev/null
+++ b/hardware-monitor.desktop.in
@@ -0,0 +1,9 @@
+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+Encoding=UTF-8
+_Name=Hardware Monitor
+_Comment=Plugin for monitoring hardware devices
+Icon=hardware-monitor-applet
+X-XFCE-Module=hardware-monitor
+X-XFCE-Internal=false
+
diff --git a/hardware-monitor.doap b/hardware-monitor.doap
deleted file mode 100644
index 9cca488..0000000
--- a/hardware-monitor.doap
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:gnome="http://api.gnome.org/doap-extensions#"
- xmlns="http://usefulinc.com/ns/doap#">
-
- <name xml:lang="en">Hardware Monitor</name>
- <shortdesc xml:lang="en">Applet for monitoring hardware devices</shortdesc>
- <!--
- <homepage rdf:resource="http://www.gnome.org/" />
- <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/desktop-devel-list" />
- <download-page rdf:resource="http://download.gnome.org/sources/empathy/" />
- <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=empathy" />
- -->
-
- <!-- DOAP category: This is used to categorize repositories in cgit.
- Pulse could not find an appropriate category for this repository.
- Set the rdf:resource attribute with one of the following:
- http://api.gnome.org/doap-extensions#admin
- http://api.gnome.org/doap-extensions#bindings
- http://api.gnome.org/doap-extensions#deprecated
- http://api.gnome.org/doap-extensions#desktop
- http://api.gnome.org/doap-extensions#development
- http://api.gnome.org/doap-extensions#infrastructure
- http://api.gnome.org/doap-extensions#platform
- http://api.gnome.org/doap-extensions#productivity
- NOTE: There is an "Other" categorization on cgit, but we do not have a
- DOAP category for it. If your module does not belong to one of these
- groups, then do not include a category property in your DOAP file.
- <category rdf:resource="FIXME" />
- -->
-
- <maintainer>
- <foaf:Person>
- <foaf:name>Ole Laursen</foaf:name>
- <foaf:mbox rdf:resource="mailto:olau at hardworking.dk" />
- <gnome:userid>olau</gnome:userid>
- </foaf:Person>
- </maintainer>
-</Project>
diff --git a/m4/intltool.m4 b/m4/intltool.m4
new file mode 120000
index 0000000..0d413ea
--- /dev/null
+++ b/m4/intltool.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/intltool.m4
\ No newline at end of file
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 120000
index 0000000..f3504e9
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/libtool.m4
\ No newline at end of file
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 120000
index 0000000..b81279e
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/ltoptions.m4
\ No newline at end of file
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 120000
index 0000000..4d76cc7
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/ltsugar.m4
\ No newline at end of file
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 120000
index 0000000..5eb474f
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/ltversion.m4
\ No newline at end of file
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 120000
index 0000000..de0b9f9
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/lt~obsolete.m4
\ No newline at end of file
diff --git a/m4/xdt-depends.m4 b/m4/xdt-depends.m4
new file mode 100644
index 0000000..64bbb0e
--- /dev/null
+++ b/m4/xdt-depends.m4
@@ -0,0 +1,339 @@
+dnl $Id$
+dnl
+dnl Copyright (c) 2002-2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+dnl
+dnl xdt-depends
+dnl -----------
+dnl Contains M4 macros to check for software dependencies.
+dnl Partly based on prior work of the XDG contributors.
+dnl
+
+
+
+dnl We need recent a autoconf version
+AC_PREREQ([2.53])
+
+
+
+dnl XDT_PROG_PKG_CONFIG()
+dnl
+dnl Checks for the freedesktop.org pkg-config
+dnl utility and sets the PKG_CONFIG environment
+dnl variable to the full path if found.
+dnl
+AC_DEFUN([XDT_PROG_PKG_CONFIG],
+[
+ # minimum supported version of pkg-config
+ xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+ m4_ifdef([PKG_PROG_PKG_CONFIG],
+ [
+ PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION])
+
+ if test x"$PKG_CONFIG" = x""; then
+ echo
+ echo "*** Your version of pkg-config is too old. You need atleast"
+ echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
+ echo "*** from the freedesktop.org software repository at"
+ echo "***"
+ echo "*** http://www.freedesktop.org/software/pkgconfig"
+ echo "***"
+ exit 1;
+ fi
+ ],
+ [
+ echo
+ echo "*** The pkg-config utility could not be found on your system."
+ echo "*** Make sure it is in your path, or set the PKG_CONFIG"
+ echo "*** environment variable to the full path to pkg-config."
+ echo "*** You can download pkg-config from the freedesktop.org"
+ echo "*** software repository at"
+ echo "***"
+ echo "*** http://www.freedesktop.org/software/pkgconfig"
+ echo "***"
+ exit 1
+ ])
+])
+
+
+
+dnl XDT_CHECK_PACKAGE(varname, package, version, [action-if], [action-if-not])
+dnl
+dnl Checks if "package" >= "version" is installed on the
+dnl target system, using the pkg-config utility. If the
+dnl dependency is met, "varname"_CFLAGS, "varname"_LIBS,
+dnl "varname"_VERSION and "varname"_REQUIRED_VERSION
+dnl will be set and marked for substition.
+dnl
+dnl "varname"_REQUIRED_VERSION will be set to the value of
+dnl "version". This is mostly useful to automatically
+dnl place the correct version information into the RPM
+dnl .spec file.
+dnl
+dnl In addition, if the dependency is met, "action-if" will
+dnl be executed if given.
+dnl
+dnl If the package check fails, "action-if-not" will be
+dnl executed. If this parameter isn't specified, a diagnostic
+dnl message will be printed and the configure script will
+dnl be terminated with exit code 1.
+dnl
+AC_DEFUN([XDT_CHECK_PACKAGE],
+[
+ XDT_PROG_PKG_CONFIG()
+
+ AC_MSG_CHECKING([for $2 >= $3])
+ if $PKG_CONFIG "--atleast-version=$3" "$2" >/dev/null 2>&1; then
+ $1_VERSION=`$PKG_CONFIG --modversion "$2"`
+ AC_MSG_RESULT([$$1_VERSION])
+
+ AC_MSG_CHECKING([$1_CFLAGS])
+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+ AC_MSG_RESULT([$$1_CFLAGS])
+
+ AC_MSG_CHECKING([$1_LIBS])
+ $1_LIBS=`$PKG_CONFIG --libs "$2"`
+ AC_MSG_RESULT([$$1_LIBS])
+
+ $1_REQUIRED_VERSION=$3
+
+ AC_SUBST([$1_VERSION])
+ AC_SUBST([$1_CFLAGS])
+ AC_SUBST([$1_LIBS])
+ AC_SUBST([$1_REQUIRED_VERSION])
+
+ ifelse([$4], , , [$4])
+ elif $PKG_CONFIG --exists "$2" >/dev/null 2>&1; then
+ xdt_cv_version=`$PKG_CONFIG --modversion "$2"`
+ AC_MSG_RESULT([found, but $xdt_cv_version])
+
+ ifelse([$5], ,
+ [
+ echo "*** The required package $2 was found on your system,"
+ echo "*** but the installed version ($xdt_cv_version) is too old."
+ echo "*** Please upgrade $2 to atleast version $3, or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you installed"
+ echo "*** the new version of the package in a nonstandard prefix so"
+ echo "*** pkg-config is able to find it."
+ exit 1
+ ], [$5])
+ else
+ AC_MSG_RESULT([not found])
+
+ ifelse([$5], ,
+ [
+ echo "*** The required package $2 was not found on your system."
+ echo "*** Please install $2 (atleast version $3) or adjust"
+ echo "*** the PKG_CONFIG_PATH environment variable if you"
+ echo "*** installed the package in a nonstandard prefix so that"
+ echo "*** pkg-config is able to find it."
+ exit 1
+ ], [$5])
+ fi
+])
+
+
+
+dnl XDT_CHECK_OPTIONAL_PACKAGE(varname, package, version, optionname, helpstring, [default])
+dnl
+dnl Checks for an optional dependency on "package" >= "version". "default"
+dnl can be "yes" or "no" (defaults to "yes" if not specified) and controls
+dnl whether configure should check this dependency by default, or only if
+dnl the user explicitly enables it using a command line switch.
+dnl
+dnl This macro automatically adds a commandline switch based on the "optionname"
+dnl parameter (--enable-optionname/--disable-optionname), which allows the
+dnl user to explicitly control whether this optional dependency should be
+dnl enabled or not. The "helpstring" parameter gives a brief(!) description
+dnl about this dependency.
+dnl
+dnl If the user chose to enable this dependency and the required package
+dnl was found, this macro defines the variable "varname"_FOUND and sets it
+dnl to the string "yes", in addition to the 4 variables set by XDT_CHECK_PACKAGE.
+dnl But "varname"_FOUND will not be marked for substition. Furthermore,
+dnl a CPP define HAVE_"varname" will be placed in config.h (or added to
+dnl the cc command line, depending on your configure.ac) and set to
+dnl 1.
+dnl
+AC_DEFUN([XDT_CHECK_OPTIONAL_PACKAGE],
+[
+ AC_REQUIRE([XDT_PROG_PKG_CONFIG])
+
+ AC_ARG_ENABLE([$4],
+AC_HELP_STRING([--enable-$4], [Enable checking for $5 (default=m4_default([$6], [yes]))])
+AC_HELP_STRING([--disable-$4], [Disable checking for $5]),
+ [xdt_cv_$1_check=$enableval], [xdt_cv_$1_check=m4_default([$6], [yes])])
+
+ if test x"$xdt_cv_$1_check" = x"yes"; then
+ if $PKG_CONFIG --exists "$2 >= $3" >/dev/null 2>&1; then
+ XDT_CHECK_PACKAGE([$1], [$2], [$3],
+ [
+ AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present])
+ $1_FOUND="yes"
+ ])
+ else
+ AC_MSG_CHECKING([for optional package $2 >= $3])
+ AC_MSG_RESULT([not found])
+ fi
+ else
+ AC_MSG_CHECKING([for optional package $2])
+ AC_MSG_RESULT([disabled])
+ fi
+
+ AM_CONDITIONAL([HAVE_$1], [test x"$$1_FOUND" = x"yes"])
+])
+
+
+
+dnl XDT_CHECK_LIBX11()
+dnl
+dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS
+dnl and LIBX11_LIBS (and marks them for substitution). In addition
+dnl HAVE_LIBX11 is set to 1 in config.h, if the X window system and
+dnl the development files are detected on the target system.
+dnl
+AC_DEFUN([XDT_CHECK_LIBX11],
+[
+ AC_REQUIRE([AC_PATH_XTRA])
+
+ LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS=
+ if test x"$no_x" != x"yes"; then
+ AC_CHECK_LIB([X11], [main],
+ [
+ AC_DEFINE([HAVE_LIBX11], [1], [Define if libX11 is available])
+ LIBX11_CFLAGS="$X_CFLAGS"
+ for option in $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS; do
+ case "$option" in
+ -L*)
+ path=`echo $option | sed 's/^-L//'`
+ if test x"$path" != x""; then
+ LIBX11_LDFLAGS="$LIBX11_LDFLAGS -L$path"
+ fi
+ ;;
+ *)
+ LIBX11_LIBS="$LIBX11_LIBS $option"
+ ;;
+ esac
+ done
+ if ! echo $LIBX11_LIBS | grep -- '-lX11' >/dev/null; then
+ LIBX11_LIBS="$LIBX11_LIBS -lX11"
+ fi
+ ], [], [$X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS])
+ fi
+ AC_SUBST([LIBX11_CFLAGS])
+ AC_SUBST([LIBX11_LDFLAGS])
+ AC_SUBST([LIBX11_LIBS])
+])
+
+
+
+dnl XDT_CHECK_LIBX11_REQUIRE()
+dnl
+dnl Similar to XDT_CHECK_LIBX11(), but terminates with an error if
+dnl the X window system and development files aren't detected on the
+dnl target system.
+dnl
+AC_DEFUN([XDT_CHECK_LIBX11_REQUIRE],
+[
+ AC_REQUIRE([XDT_CHECK_LIBX11])
+
+ if test x"$no_x" = x"yes"; then
+ AC_MSG_ERROR([X Window system libraries and header files are required])
+ fi
+])
+
+
+
+dnl XDT_CHECK_LIBSM()
+dnl
+dnl Checks whether the session management library is present on the
+dnl target system, and sets LIBSM_CFLAGS, LIBSM_LDFLAGS and LIBSM_LIBS
+dnl properly. In addition, HAVE_LIBSM will be set to 1 in config.h
+dnl if libSM is detected.
+dnl
+AC_DEFUN([XDT_CHECK_LIBSM],
+[
+ AC_REQUIRE([XDT_CHECK_LIBX11])
+
+ LIBSM_CFLAGS= LIBSM_LDFLAGS= LIBSM_LIBS=
+ if test x"$no_x" != x"yes"; then
+ AC_CHECK_LIB([SM], [SmcSaveYourselfDone],
+ [
+ AC_DEFINE([HAVE_LIBSM], [1], [Define if libSM is available])
+ LIBSM_CFLAGS="$LIBX11_CFLAGS"
+ LIBSM_LDFLAGS="$LIBX11_LDFLAGS"
+ LIBSM_LIBS="$LIBX11_LIBS"
+ if ! echo $LIBSM_LIBS | grep -- '-lSM' >/dev/null; then
+ LIBSM_LIBS="$LIBSM_LIBS -lSM -lICE"
+ fi
+ ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lICE])
+ fi
+ AC_SUBST([LIBSM_CFLAGS])
+ AC_SUBST([LIBSM_LDFLAGS])
+ AC_SUBST([LIBSM_LIBS])
+])
+
+
+
+dnl XDT_CHECK_LIBXPM()
+dnl
+dnl Checks if the Xpm library is present on the target system, and
+dnl sets LIBXPM_CFLAGS, LIBXPM_LDFLAGS and LIBXPM_LIBS. In addition,
+dnl HAVE_LIBXPM will be set to 1 in config.h if libXpm is detected.
+dnl
+AC_DEFUN([XDT_CHECK_LIBXPM],
+[
+ AC_REQUIRE([XDT_CHECK_LIBX11])
+
+ LIBXPM_CFLAGS= LIBXPM_LDFLAGS= LIBXPM_LIBS=
+ if test "$no_x" != "yes"; then
+ AC_CHECK_LIB([Xpm], [main],
+ [
+ AC_DEFINE([HAVE_LIBXPM], [1], [Define if libXpm is available])
+ LIBXPM_CFLAGS="$LIBX11_CFLAGS"
+ LIBXPM_LDFLAGS="$LIBX11_LDFLAGS"
+ LIBXPM_LIBS="$LIBX11_LIBS"
+ if ! echo $LIBXPM_LIBS | grep -- '-lXpm' >/dev/null; then
+ LIBXPM_LIBS="$LIBXPM_LIBS -lXpm"
+ fi
+ ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXpm])
+ fi
+ AC_SUBST([LIBXPM_CFLAGS])
+ AC_SUBST([LIBXPM_LDFLAGS])
+ AC_SUBST([LIBXPM_LIBS])
+])
+
+
+
+dnl XDT_CHECK_LIBXPM_REQUIRE()
+dnl
+dnl Similar to XDT_CHECK_LIBXPM(), but fails if the Xpm library isn't
+dnl present on the target system.
+dnl
+AC_DEFUN([XDT_CHECK_LIBXPM_REQUIRE],
+[
+ AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE])
+ AC_REQUIRE([XDT_CHECK_LIBXPM])
+
+ if test x"$LIBXPM_LIBS" = x""; then
+ AC_MSG_ERROR([The Xpm library was not found on your system])
+ fi
+])
+
diff --git a/m4/xdt-features.m4 b/m4/xdt-features.m4
new file mode 100644
index 0000000..c5f5583
--- /dev/null
+++ b/m4/xdt-features.m4
@@ -0,0 +1,221 @@
+dnl $Id$
+dnl
+dnl Copyright (c) 2002-2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+dnl
+dnl xdt-depends
+dnl -----------
+dnl Contains M4 macros to check for software dependencies.
+dnl Partly based on prior work of the XDG contributors.
+dnl
+
+
+
+dnl We need recent a autoconf version
+AC_PREREQ([2.53])
+
+
+dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
+dnl
+dnl For each token in FLAGS, checks to be sure the compiler supports
+dnl the flag, and if so, adds each one to VAR.
+dnl
+AC_DEFUN([XDT_SUPPORTED_FLAGS],
+[
+ for flag in $2; do
+ AC_MSG_CHECKING([if $CC supports $flag])
+ saved_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $flag"
+ AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
+ CFLAGS="$saved_CFLAGS"
+ AC_MSG_RESULT([$flag_supported])
+
+ if test "x$flag_supported" = "xyes"; then
+ $1="$$1 $flag"
+ fi
+ done
+])
+
+
+
+dnl XDT_FEATURE_DEBUG(default_level=minimum)
+dnl
+AC_DEFUN([XDT_FEATURE_DEBUG],
+[
+ dnl weird indentation to keep output indentation correct
+ AC_ARG_ENABLE([debug],
+ AC_HELP_STRING([--enable-debug@<:@=no|minimum|yes|full@:>@],
+ [Build with debugging support @<:@default=m4_default([$1], [minimum])@:>@])
+AC_HELP_STRING([--disable-debug], [Include no debugging support]),
+ [enable_debug=$enableval], [enable_debug=m4_default([$1], [minimum])])
+
+ AC_MSG_CHECKING([whether to build with debugging support])
+ if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
+ AC_DEFINE([DEBUG], [1], [Define for debugging support])
+
+ xdt_cv_additional_CFLAGS="-DXFCE_DISABLE_DEPRECATED \
+ -Wall -Wextra \
+ -Wno-missing-field-initializers \
+ -Wno-unused-parameter -Wold-style-definition \
+ -Wdeclaration-after-statement \
+ -Wmissing-declarations \
+ -Wmissing-noreturn -Wshadow -Wpointer-arith \
+ -Wcast-align -Wformat-security \
+ -Winit-self -Wmissing-include-dirs -Wundef \
+ -Wmissing-format-attribute -Wnested-externs"
+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+
+ if test x`uname` = x"Linux"; then
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
+ fi
+
+ dnl # signal.h inline is crapy on openbsd
+ if test x`uname` != x"OpenBSD"; then
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
+ fi
+
+ if test x"$enable_debug" = x"full"; then
+ AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror"
+ CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+ AC_MSG_RESULT([full])
+ else
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g"
+ AC_MSG_RESULT([yes])
+ fi
+
+ XDT_SUPPORTED_FLAGS([supported_CFLAGS], [$xdt_cv_additional_CFLAGS])
+
+ ifelse([$CXX], , , [
+ dnl FIXME: should test on c++ compiler, but the following line causes
+ dnl autoconf errors for projects that don't check for a
+ dnl c++ compiler at all.
+ dnl AC_LANG_PUSH([C++])
+ dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS])
+ dnl AC_LANG_POP()
+ dnl instead, just use supported_CFLAGS...
+ supported_CXXFLAGS="$supported_CFLAGS"
+ ])
+
+ CFLAGS="$CFLAGS $supported_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $supported_CXXFLAGS"
+ else
+ CPPFLAGS="$CPPFLAGS -DNDEBUG"
+
+ if test x"$enable_debug" = x"no"; then
+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+ AC_MSG_RESULT([no])
+ else
+ AC_MSG_RESULT([minimum])
+ fi
+ fi
+])
+
+
+dnl XDT_FEATURE_VISIBILITY()
+dnl
+dnl Checks to see if the compiler supports the 'visibility' attribute
+dnl If so, adds -DHAVE_GNUC_VISIBILTY to CPPFLAGS. Also sets the
+dnl automake conditional HAVE_GNUC_VISIBILITY.
+dnl
+AC_DEFUN([XDT_FEATURE_VISIBILITY],
+[
+ AC_ARG_ENABLE([visibility],
+ AC_HELP_STRING([--disable-visibility],
+ [Don't use ELF visibility attributes]),
+ [enable_visibility=$enableval], [enable_visibility=yes])
+ have_gnuc_visibility=no
+ if test "x$enable_visibility" != "xno"; then
+ XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter])
+ saved_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $xdt_vis_test_cflags"
+ AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
+ AC_COMPILE_IFELSE(AC_LANG_SOURCE(
+ [
+ void test_default (void);
+ void test_hidden (void);
+
+ void __attribute__ ((visibility("default"))) test_default (void) {}
+ void __attribute__ ((visibility("hidden"))) test_hidden (void) {}
+
+ int main (int argc, char **argv) {
+ test_default ();
+ test_hidden ();
+ return 0;
+ }
+ ]),
+ [
+ have_gnuc_visibility=yes
+ AC_MSG_RESULT([yes])
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ])
+ CFLAGS="$saved_CFLAGS"
+ fi
+
+ if test "x$have_gnuc_visibility" = "xyes"; then
+ CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY"
+ xdt_vis_hidden_cflags=""
+ XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden])
+ if test "x$xdt_vis_hidden_cflags" = "x"; then
+ XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden])
+ fi
+ CFLAGS="$CFLAGS $xdt_vis_hidden_cflags"
+ fi
+
+ AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test "x$have_gnuc_visibility" = "xyes"])
+])
+
+dnl XDT_FEATURE_LINKER_OPTS
+dnl
+dnl Checks for and enables any special linker optimizations.
+dnl
+AC_DEFUN([XDT_FEATURE_LINKER_OPTS],
+[
+ AC_ARG_ENABLE([linker-opts],
+ AC_HELP_STRING([--disable-linker-opts],
+ [Disable linker optimizations]),
+ [enable_linker_opts=$enableval], [enable_linker_opts=yes])
+
+ if test "x$enable_linker_opts" != "xno"; then
+ if test x`uname` != x"OpenBSD"; then
+ AC_MSG_CHECKING([whether $LD accepts --as-needed])
+ case `$LD --as-needed -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ LDFLAGS="$LDFLAGS -Wl,--as-needed"
+ AC_MSG_RESULT([yes])
+ ;;
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+ esac
+ fi
+ AC_MSG_CHECKING([whether $LD accepts -O1])
+ case `$LD -O1 -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ LDFLAGS="$LDFLAGS -Wl,-O1"
+ AC_MSG_RESULT([yes])
+ ;;
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+ esac
+ fi
+])
diff --git a/m4/xdt-i18n.m4 b/m4/xdt-i18n.m4
new file mode 100644
index 0000000..8d90e4f
--- /dev/null
+++ b/m4/xdt-i18n.m4
@@ -0,0 +1,77 @@
+dnl $Id$
+dnl
+dnl Copyright (c) 2002-2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License along
+dnl with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+dnl
+dnl xdt-i18n
+dnl --------
+dnl Internalization M4 macros.
+dnl
+
+
+dnl XDT_I18N(LINGUAS [, PACKAGE])
+dnl
+dnl This macro takes care of setting up everything for i18n support.
+dnl
+dnl If PACKAGE isn't specified, it defaults to the package tarname; see
+dnl the description of AC_INIT() for an explanation of what makes up
+dnl the package tarname. Normally, you don't need to specify PACKAGE,
+dnl but you can stick with the default.
+dnl
+AC_DEFUN([XDT_I18N],
+[
+ dnl Substitute GETTEXT_PACKAGE variable
+ GETTEXT_PACKAGE=m4_default([$2], [AC_PACKAGE_TARNAME()])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain])
+ AC_SUBST([GETTEXT_PACKAGE])
+
+ dnl gettext and stuff
+ ALL_LINGUAS="$1"
+ AM_GLIB_GNU_GETTEXT()
+
+ dnl This is required on some Linux systems
+ AC_CHECK_FUNC([bind_textdomain_codeset])
+
+ dnl Determine where to install locale files
+ AC_MSG_CHECKING([for locales directory])
+ AC_ARG_WITH([locales-dir],
+ [
+ AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+ ], [localedir=$withval],
+ [
+ if test x"$CATOBJEXT" = x".mo"; then
+ localedir=$libdir/locale
+ else
+ localedir=$datadir/locale
+ fi
+ ])
+ AC_MSG_RESULT([$localedir])
+ AC_SUBST([localedir])
+
+ dnl Determine additional xgettext flags
+ AC_MSG_CHECKING([for additional xgettext flags])
+ if test x"$XGETTEXT_ARGS" = x""; then
+ XGETTEXT_ARGS="--keyword=Q_ --from-code=UTF-8";
+ else
+ XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_ --from-code=UTF-8";
+ fi
+ AC_SUBST([XGETTEXT_ARGS])
+ AC_MSG_RESULT([$XGETTEXT_ARGS])
+])
+
diff --git a/po/Makefile.in b/po/Makefile.in
deleted file mode 100644
index 5165391..0000000
--- a/po/Makefile.in
+++ /dev/null
@@ -1,222 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
-#
-# This file may be copied and used freely without restrictions. It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob at ximian.com> to install
-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = hardware-monitor
-PACKAGE = hardware-monitor
-VERSION = 1.4.3
-
-SHELL = /bin/bash
-
-srcdir = .
-top_srcdir = ..
-top_builddir = ..
-
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-libdir = ${exec_prefix}/lib
-DATADIRNAME = share
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = ${SHELL} /mnt/Storage_1/Programming/C++/hardware-monitor-applet/hardware-monitor-1.4.3/install-sh
-# Automake >= 1.8 provides $(MKDIR_P).
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-
-GMSGFMT = /usr/bin/msgfmt
-MSGFMT = /usr/bin/msgfmt
-XGETTEXT = /usr/bin/xgettext
-INTLTOOL_UPDATE = /usr/bin/intltool-update
-INTLTOOL_EXTRACT = /usr/bin/intltool-extract
-MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = ar as az be bg bn_IN bs ca cs cy da de dz el en_CA en_GB es eu fi fr gl gu he hi hr hu it ja kn ko lv mr ms nb ne nl oc pa pl pt pt_BR ru rw sl sq sr sr at Latn sv ta th tr uk vi zh_CN zh_HK zh_TW
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-AM_DEFAULT_VERBOSITY = 1
-INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
-INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
-
-.po.pox:
- $(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
- $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
-
-.po.gmo:
- $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-yes
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(GENPOT)
-
-install: install-data
-install-data: install-data-yes
-install-data-no: all
-install-data-yes: all
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $$dir; \
- if test -r $$lang.gmo; then \
- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $(srcdir)/$$lang.gmo as" \
- "$$dir/$(GETTEXT_PACKAGE).mo"; \
- fi; \
- if test -r $$lang.gmo.m; then \
- $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- if test -r $(srcdir)/$$lang.gmo.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
- $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $(srcdir)/$$lang.gmo.m as" \
- "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- true; \
- fi; \
- fi; \
- done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- done
-
-check: all $(GETTEXT_PACKAGE).pot
- rm -f missing notexist
- srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
- if [ -r missing -o -r notexist ]; then \
- exit 1; \
- fi
-
-mostlyclean:
- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile Makefile.in POTFILES stamp-it
- rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
- rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
- dists="$(DISTFILES)"; \
- extra_dists="$(EXTRA_DISTFILES)"; \
- for file in $$extra_dists; do \
- test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
- done; \
- for file in $$dists; do \
- test -f $$file || file="$(srcdir)/$$file"; \
- ln $$file $(distdir) 2> /dev/null \
- || cp -p $$file $(distdir); \
- done
-
-update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- tmpdir=`pwd`; \
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- echo "$$lang:"; \
- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
- if $$result; then \
- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "msgmerge for $$lang.gmo failed!"; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi; \
- done
-
-Makefile POTFILES: stamp-it
- @if test ! -f $@; then \
- rm -f stamp-it; \
- $(MAKE) stamp-it; \
- fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
- $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 06a8cfe..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,222 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
-#
-# This file may be copied and used freely without restrictions. It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob at ximian.com> to install
-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p at .
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
-INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
-
-.po.pox:
- $(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
- $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
-
-.po.gmo:
- $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && gencat $@ $*.msg
-
-
-all: all- at USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(GENPOT)
-
-install: install-data
-install-data: install-data- at USE_NLS@
-install-data-no: all
-install-data-yes: all
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $$dir; \
- if test -r $$lang.gmo; then \
- $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $(srcdir)/$$lang.gmo as" \
- "$$dir/$(GETTEXT_PACKAGE).mo"; \
- fi; \
- if test -r $$lang.gmo.m; then \
- $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- if test -r $(srcdir)/$$lang.gmo.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
- $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $(srcdir)/$$lang.gmo.m as" \
- "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
- else \
- true; \
- fi; \
- fi; \
- done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- done
-
-check: all $(GETTEXT_PACKAGE).pot
- rm -f missing notexist
- srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
- if [ -r missing -o -r notexist ]; then \
- exit 1; \
- fi
-
-mostlyclean:
- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile Makefile.in POTFILES stamp-it
- rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
- rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
- dists="$(DISTFILES)"; \
- extra_dists="$(EXTRA_DISTFILES)"; \
- for file in $$extra_dists; do \
- test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
- done; \
- for file in $$dists; do \
- test -f $$file || file="$(srcdir)/$$file"; \
- ln $$file $(distdir) 2> /dev/null \
- || cp -p $$file $(distdir); \
- done
-
-update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- tmpdir=`pwd`; \
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- echo "$$lang:"; \
- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
- if $$result; then \
- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "msgmerge for $$lang.gmo failed!"; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi; \
- done
-
-Makefile POTFILES: stamp-it
- @if test ! -f $@; then \
- rm -f stamp-it; \
- $(MAKE) stamp-it; \
- fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
- $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 120000
index 0000000..e4713cf
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1 @@
+/usr/share/intltool/Makefile.in.in
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 7917772..5aa7c09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,18 @@
-# pass info on to source
-INCLUDES = \
--DHARDWARE_MONITOR_GLADEDIR=\""$(gladedir)/"\" \
--DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \
--DGNOMEICONDIR=\""$(icondir)"\"
+# Based off original GNOME 2 applet build files copyright:
+#
+# 2003-2007 Ole Laursen <olau at hardworking.dk>
+#
+# XFCE4 modifications copyright:
+#
+# 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
-libexec_PROGRAMS = hardware-monitor
-# list of source files needed to build the executable
-hardware_monitor_SOURCES = \
+# Defining libraries to be built and their installation destination
+plugindir = $(libdir)/xfce4/panel/plugins
+plugin_LTLIBRARIES = libhardware-monitor.la
+
+# List of source files needed to build the library
+libhardware_monitor_la_SOURCES = \
applet.cpp applet.hpp \
bar-view.cpp bar-view.hpp \
choose-monitor-window.cpp choose-monitor-window.hpp \
@@ -18,26 +23,44 @@ hardware_monitor_SOURCES = \
gui-helpers.hpp \
helpers.cpp helpers.hpp \
i18n.hpp \
- main.cpp \
monitor.hpp \
monitor-impls.cpp monitor-impls.hpp \
preferences-window.cpp preferences-window.hpp \
pixbuf-drawing.hpp \
+ register_plugin.c \
text-view.cpp text-view.hpp \
view.cpp view.hpp \
value-history.cpp value-history.hpp \
ucompose.hpp
-AM_CXXFLAGS = $(DEPS_CFLAGS) $(SENSORS_CFLAGS) -Wall -O3
+libhardware_monitor_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'
+
+
+libhardware_monitor_la_CPPFLAGS = \
+ -DHARDWARE_MONITOR_GLADEDIR=\""$(gladedir)/"\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ @LIBXFCE4PANEL_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@
+
+# TODO: This doesnt appear to be used?
+# -DGNOMEICONDIR=\""$(icondir)"\"
-LDADD = $(DEPS_LIBS) $(SENSORS_LIBS)
+libhardware_monitor_la_LIBADD = \
+ @LIBXFCE4PANEL_LIBS@ \
+ @LIBXFCE4UI_LIBS@ \
+ $(DEPS_LIBS) $(SENSORS_LIBS)
+
+
+AM_CXXFLAGS = $(DEPS_CFLAGS) $(SENSORS_CFLAGS) -Wall -O3
glade_DATA = ui.glade
-gladedir = $(datadir)/$(PACKAGE)/glade
+gladedir = $(datadir)/$(PACKAGE_NAME)/glade
# FIXME: both here and in ../Makefile.am?
icondir = $(datadir)/pixmaps
-gnomelocaledir = $(datadir)/locale
-
EXTRA_DIST = $(glade_DATA)
diff --git a/src/Makefile.in b/src/Makefile.in
index 8868a0e..14e92bd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -14,6 +14,14 @@
@SET_MAKE@
+# Based off original GNOME 2 applet build files copyright:
+#
+# 2003-2007 Ole Laursen <olau at hardworking.dk>
+#
+# XFCE4 modifications copyright:
+#
+# 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
@@ -77,31 +85,78 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-libexec_PROGRAMS = hardware-monitor$(EXEEXT)
+build_triplet = @build@
+host_triplet = @host@
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/m4/xdt-depends.m4 $(top_srcdir)/m4/xdt-i18n.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)"
-PROGRAMS = $(libexec_PROGRAMS)
-am_hardware_monitor_OBJECTS = applet.$(OBJEXT) bar-view.$(OBJEXT) \
- choose-monitor-window.$(OBJEXT) canvas-view.$(OBJEXT) \
- column-view.$(OBJEXT) curve-view.$(OBJEXT) \
- flame-view.$(OBJEXT) helpers.$(OBJEXT) main.$(OBJEXT) \
- monitor-impls.$(OBJEXT) preferences-window.$(OBJEXT) \
- text-view.$(OBJEXT) view.$(OBJEXT) value-history.$(OBJEXT)
-hardware_monitor_OBJECTS = $(am_hardware_monitor_OBJECTS)
-hardware_monitor_LDADD = $(LDADD)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)"
+LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
-hardware_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+libhardware_monitor_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
+am_libhardware_monitor_la_OBJECTS = libhardware_monitor_la-applet.lo \
+ libhardware_monitor_la-bar-view.lo \
+ libhardware_monitor_la-choose-monitor-window.lo \
+ libhardware_monitor_la-canvas-view.lo \
+ libhardware_monitor_la-column-view.lo \
+ libhardware_monitor_la-curve-view.lo \
+ libhardware_monitor_la-flame-view.lo \
+ libhardware_monitor_la-helpers.lo \
+ libhardware_monitor_la-monitor-impls.lo \
+ libhardware_monitor_la-preferences-window.lo \
+ libhardware_monitor_la-text-view.lo \
+ libhardware_monitor_la-view.lo \
+ libhardware_monitor_la-value-history.lo
+libhardware_monitor_la_OBJECTS = $(am_libhardware_monitor_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libhardware_monitor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libhardware_monitor_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -120,63 +175,47 @@ am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_ at AM_V@)
am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
am__v_CXX_1 =
CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
- -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(hardware_monitor_SOURCES)
-DIST_SOURCES = $(hardware_monitor_SOURCES)
+SOURCES = $(libhardware_monitor_la_SOURCES)
+DIST_SOURCES = $(libhardware_monitor_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
DATA = $(glade_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
@@ -202,6 +241,7 @@ ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -214,6 +254,7 @@ CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -222,11 +263,15 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DEPS_CFLAGS = @DEPS_CFLAGS@
DEPS_LIBS = @DEPS_LIBS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -246,18 +291,36 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
+LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@
+LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@
+LIBXFCE4PANEL_VERSION = @LIBXFCE4PANEL_VERSION@
+LIBXFCE4UI_CFLAGS = @LIBXFCE4UI_CFLAGS@
+LIBXFCE4UI_LIBS = @LIBXFCE4UI_LIBS@
+LIBXFCE4UI_REQUIRED_VERSION = @LIBXFCE4UI_REQUIRED_VERSION@
+LIBXFCE4UI_VERSION = @LIBXFCE4UI_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -273,6 +336,8 @@ POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
SENSORS_CFLAGS = @SENSORS_CFLAGS@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
@@ -281,26 +346,37 @@ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+XGETTEXT_ARGS = @XGETTEXT_ARGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
@@ -327,15 +403,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# pass info on to source
-INCLUDES = \
--DHARDWARE_MONITOR_GLADEDIR=\""$(gladedir)/"\" \
--DGNOMELOCALEDIR=\""$(gnomelocaledir)"\" \
--DGNOMEICONDIR=\""$(icondir)"\"
-
+# Defining libraries to be built and their installation destination
+plugindir = $(libdir)/xfce4/panel/plugins
+plugin_LTLIBRARIES = libhardware-monitor.la
-# list of source files needed to build the executable
-hardware_monitor_SOURCES = \
+# List of source files needed to build the library
+libhardware_monitor_la_SOURCES = \
applet.cpp applet.hpp \
bar-view.cpp bar-view.hpp \
choose-monitor-window.cpp choose-monitor-window.hpp \
@@ -346,7 +419,6 @@ hardware_monitor_SOURCES = \
gui-helpers.hpp \
helpers.cpp helpers.hpp \
i18n.hpp \
- main.cpp \
monitor.hpp \
monitor-impls.cpp monitor-impls.hpp \
preferences-window.cpp preferences-window.hpp \
@@ -356,19 +428,37 @@ hardware_monitor_SOURCES = \
value-history.cpp value-history.hpp \
ucompose.hpp
+libhardware_monitor_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'
+
+libhardware_monitor_la_CPPFLAGS = \
+ -DHARDWARE_MONITOR_GLADEDIR=\""$(gladedir)/"\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ @LIBXFCE4PANEL_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@
+
+
+# TODO: This doesnt appear to be used?
+# -DGNOMEICONDIR=\""$(icondir)"\"
+libhardware_monitor_la_LIBADD = \
+ @LIBXFCE4PANEL_LIBS@ \
+ @LIBXFCE4UI_LIBS@ \
+ $(DEPS_LIBS) $(SENSORS_LIBS)
+
AM_CXXFLAGS = $(DEPS_CFLAGS) $(SENSORS_CFLAGS) -Wall -O3
-LDADD = $(DEPS_LIBS) $(SENSORS_LIBS)
glade_DATA = ui.glade
-gladedir = $(datadir)/$(PACKAGE)/glade
+gladedir = $(datadir)/$(PACKAGE_NAME)/glade
# FIXME: both here and in ../Makefile.am?
icondir = $(datadir)/pixmaps
-gnomelocaledir = $(datadir)/locale
EXTRA_DIST = $(glade_DATA)
all: all-am
.SUFFIXES:
-.SUFFIXES: .cpp .o .obj
+.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -399,52 +489,44 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-libexecPROGRAMS: $(libexec_PROGRAMS)
+
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
@$(NORMAL_INSTALL)
- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
- fi; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p \
- ; then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' \
- -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-libexecPROGRAMS:
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+ }
+
+uninstall-pluginLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' \
- `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
-
-clean-libexecPROGRAMS:
- -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
-
-hardware-monitor$(EXEEXT): $(hardware_monitor_OBJECTS) $(hardware_monitor_DEPENDENCIES) $(EXTRA_hardware_monitor_DEPENDENCIES)
- @rm -f hardware-monitor$(EXEEXT)
- $(AM_V_CXXLD)$(CXXLINK) $(hardware_monitor_OBJECTS) $(hardware_monitor_LDADD) $(LIBS)
+ @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+ done
+
+clean-pluginLTLIBRARIES:
+ -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+ @list='$(plugin_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+
+libhardware-monitor.la: $(libhardware_monitor_la_OBJECTS) $(libhardware_monitor_la_DEPENDENCIES) $(EXTRA_libhardware_monitor_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libhardware_monitor_la_LINK) -rpath $(plugindir) $(libhardware_monitor_la_OBJECTS) $(libhardware_monitor_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -452,20 +534,19 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/applet.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bar-view.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/canvas-view.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/choose-monitor-window.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/column-view.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/curve-view.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flame-view.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/helpers.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/monitor-impls.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/preferences-window.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/text-view.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/value-history.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/view.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-applet.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-bar-view.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-canvas-view.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-choose-monitor-window.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-column-view.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-curve-view.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-flame-view.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-helpers.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-monitor-impls.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-preferences-window.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-text-view.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-value-history.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libhardware_monitor_la-view.Plo at am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -480,6 +561,110 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+libhardware_monitor_la-applet.lo: applet.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-applet.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-applet.Tpo -c -o libhardware_monitor_la-applet.lo `test -f 'applet.cpp' || echo '$(srcdir)/'`applet.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-applet.Tpo $(DEPDIR)/libhardware_monitor_la-applet.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='applet.cpp' object='libhardware_monitor_la-applet.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-applet.lo `test -f 'applet.cpp' || echo '$(srcdir)/'`applet.cpp
+
+libhardware_monitor_la-bar-view.lo: bar-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-bar-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-bar-view.Tpo -c -o libhardware_monitor_la-bar-view.lo `test -f 'bar-view.cpp' || echo '$(srcdir)/'`bar-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-bar-view.Tpo $(DEPDIR)/libhardware_monitor_la-bar-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='bar-view.cpp' object='libhardware_monitor_la-bar-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-bar-view.lo `test -f 'bar-view.cpp' || echo '$(srcdir)/'`bar-view.cpp
+
+libhardware_monitor_la-choose-monitor-window.lo: choose-monitor-window.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-choose-monitor-window.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-choose-monitor-window.Tpo -c -o libhardware_monitor_la-choose-monitor-window.lo `test -f 'choose-monitor-window.cpp' || echo '$(srcdir)/'`choose-monitor-window.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-choose-monitor-window.Tpo $(DEPDIR)/libhardware_monitor_la-choose-monitor-window.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='choose-monitor-window.cpp' object='libhardware_monitor_la-choose-monitor-window.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-choose-monitor-window.lo `test -f 'choose-monitor-window.cpp' || echo '$(srcdir)/'`choose-monitor-window.cpp
+
+libhardware_monitor_la-canvas-view.lo: canvas-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-canvas-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-canvas-view.Tpo -c -o libhardware_monitor_la-canvas-view.lo `test -f 'canvas-view.cpp' || echo '$(srcdir)/'`canvas-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-canvas-view.Tpo $(DEPDIR)/libhardware_monitor_la-canvas-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='canvas-view.cpp' object='libhardware_monitor_la-canvas-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-canvas-view.lo `test -f 'canvas-view.cpp' || echo '$(srcdir)/'`canvas-view.cpp
+
+libhardware_monitor_la-column-view.lo: column-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-column-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-column-view.Tpo -c -o libhardware_monitor_la-column-view.lo `test -f 'column-view.cpp' || echo '$(srcdir)/'`column-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-column-view.Tpo $(DEPDIR)/libhardware_monitor_la-column-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='column-view.cpp' object='libhardware_monitor_la-column-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-column-view.lo `test -f 'column-view.cpp' || echo '$(srcdir)/'`column-view.cpp
+
+libhardware_monitor_la-curve-view.lo: curve-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-curve-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-curve-view.Tpo -c -o libhardware_monitor_la-curve-view.lo `test -f 'curve-view.cpp' || echo '$(srcdir)/'`curve-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-curve-view.Tpo $(DEPDIR)/libhardware_monitor_la-curve-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='curve-view.cpp' object='libhardware_monitor_la-curve-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-curve-view.lo `test -f 'curve-view.cpp' || echo '$(srcdir)/'`curve-view.cpp
+
+libhardware_monitor_la-flame-view.lo: flame-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-flame-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-flame-view.Tpo -c -o libhardware_monitor_la-flame-view.lo `test -f 'flame-view.cpp' || echo '$(srcdir)/'`flame-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-flame-view.Tpo $(DEPDIR)/libhardware_monitor_la-flame-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='flame-view.cpp' object='libhardware_monitor_la-flame-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-flame-view.lo `test -f 'flame-view.cpp' || echo '$(srcdir)/'`flame-view.cpp
+
+libhardware_monitor_la-helpers.lo: helpers.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-helpers.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-helpers.Tpo -c -o libhardware_monitor_la-helpers.lo `test -f 'helpers.cpp' || echo '$(srcdir)/'`helpers.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-helpers.Tpo $(DEPDIR)/libhardware_monitor_la-helpers.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='helpers.cpp' object='libhardware_monitor_la-helpers.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-helpers.lo `test -f 'helpers.cpp' || echo '$(srcdir)/'`helpers.cpp
+
+libhardware_monitor_la-monitor-impls.lo: monitor-impls.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-monitor-impls.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-monitor-impls.Tpo -c -o libhardware_monitor_la-monitor-impls.lo `test -f 'monitor-impls.cpp' || echo '$(srcdir)/'`monitor-impls.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-monitor-impls.Tpo $(DEPDIR)/libhardware_monitor_la-monitor-impls.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='monitor-impls.cpp' object='libhardware_monitor_la-monitor-impls.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-monitor-impls.lo `test -f 'monitor-impls.cpp' || echo '$(srcdir)/'`monitor-impls.cpp
+
+libhardware_monitor_la-preferences-window.lo: preferences-window.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-preferences-window.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-preferences-window.Tpo -c -o libhardware_monitor_la-preferences-window.lo `test -f 'preferences-window.cpp' || echo '$(srcdir)/'`preferences-window.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-preferences-window.Tpo $(DEPDIR)/libhardware_monitor_la-preferences-window.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='preferences-window.cpp' object='libhardware_monitor_la-preferences-window.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-preferences-window.lo `test -f 'preferences-window.cpp' || echo '$(srcdir)/'`preferences-window.cpp
+
+libhardware_monitor_la-text-view.lo: text-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-text-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-text-view.Tpo -c -o libhardware_monitor_la-text-view.lo `test -f 'text-view.cpp' || echo '$(srcdir)/'`text-view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-text-view.Tpo $(DEPDIR)/libhardware_monitor_la-text-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='text-view.cpp' object='libhardware_monitor_la-text-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-text-view.lo `test -f 'text-view.cpp' || echo '$(srcdir)/'`text-view.cpp
+
+libhardware_monitor_la-view.lo: view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-view.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-view.Tpo -c -o libhardware_monitor_la-view.lo `test -f 'view.cpp' || echo '$(srcdir)/'`view.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-view.Tpo $(DEPDIR)/libhardware_monitor_la-view.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='view.cpp' object='libhardware_monitor_la-view.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-view.lo `test -f 'view.cpp' || echo '$(srcdir)/'`view.cpp
+
+libhardware_monitor_la-value-history.lo: value-history.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhardware_monitor_la-value-history.lo -MD -MP -MF $(DEPDIR)/libhardware_monitor_la-value-history.Tpo -c -o libhardware_monitor_la-value-history.lo `test -f 'value-history.cpp' || echo '$(srcdir)/'`value-history.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhardware_monitor_la-value-history.Tpo $(DEPDIR)/libhardware_monitor_la-value-history.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='value-history.cpp' object='libhardware_monitor_la-value-history.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhardware_monitor_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhardware_monitor_la-value-history.lo `test -f 'value-history.cpp' || echo '$(srcdir)/'`value-history.cpp
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
install-gladeDATA: $(glade_DATA)
@$(NORMAL_INSTALL)
@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
@@ -586,9 +771,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
+all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)"; do \
+ for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(gladedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -623,7 +808,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+ mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -643,13 +829,13 @@ info: info-am
info-am:
-install-data-am: install-gladeDATA
+install-data-am: install-gladeDATA install-pluginLTLIBRARIES
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-libexecPROGRAMS
+install-exec-am:
install-html: install-html-am
@@ -678,7 +864,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
pdf: pdf-am
@@ -688,23 +875,24 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-gladeDATA uninstall-libexecPROGRAMS
+uninstall-am: uninstall-gladeDATA uninstall-pluginLTLIBRARIES
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libexecPROGRAMS cscopelist-am ctags ctags-am distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-gladeDATA install-html \
- install-html-am install-info install-info-am \
- install-libexecPROGRAMS install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-gladeDATA uninstall-libexecPROGRAMS
+ clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
+ ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-gladeDATA install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pluginLTLIBRARIES install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am uninstall-gladeDATA uninstall-pluginLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/applet.cpp b/src/applet.cpp
index 9414a9a..5fbb9e5 100644
--- a/src/applet.cpp
+++ b/src/applet.cpp
@@ -5,7 +5,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -28,10 +28,11 @@
#include <gtkmm/main.h>
#include <cassert>
#include <unistd.h> // for nice
+#include <libgnomecanvasmm/init.h>
extern "C"
{
-#include <libxfce4panel/xfce-panel-plugin.h> // Registration macro
+#include <libxfce4util/libxfce4util.h>
}
#include "ucompose.hpp"
@@ -48,26 +49,24 @@ extern "C"
#include "preferences-window.hpp"
#include "i18n.hpp"
-
+// TODO: GPL3+, add myself to copyright of all changed files
// XFCE4 functions to create and destroy applet
extern "C" void applet_construct(XfcePanelPlugin* plugin)
{
nice(5); // Don't eat up too much CPU
- // WIP: Try to compile!
-
// Initialising GTK and GNOME canvas
- Gtk::Main main(argc, argv);
+ Gtk::Main main(NULL, NULL);
Gnome::Canvas::init();
try {
// i18n
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
// Actually creating the applet/plugin
- Applet *applet = manage(new Applet(plugin));
+ Applet *applet = Gtk::manage(new Applet(plugin));
applet->show();
}
catch(const Glib::Error &ex)
@@ -87,21 +86,54 @@ extern "C" void applet_construct(XfcePanelPlugin* plugin)
}*/
// Helpers for popping up the various things
-void display_preferences(gpointer* applet)
+void display_preferences(void *applet)
{
static_cast<Applet *>(applet)->on_preferences_activated();
}
-void display_help(gpointer* applet)
+void display_help(void *applet)
{
static_cast<Applet *>(applet)->on_help_activated();
}
-void display_about(gpointer* applet)
+void display_about(void *applet)
{
static_cast<Applet *>(applet)->on_about_activated();
}
+/* Function declared here as its a callback for a C signal, so cant be a
+ * method */
+void save_monitors(void *applet)
+{
+ // Getting at applet/plugin objects
+ Applet *tmp_applet = static_cast<Applet*>(applet);
+ XfcePanelPlugin *panel_applet = tmp_applet->panel_applet;
+
+ // Search for a writeable settings file, create one if it doesnt exist
+ gchar* file = xfce_panel_plugin_save_location(panel_applet, true);
+
+ if (file)
+ {
+ // Opening setting file
+ XfceRc* settings = xfce_rc_simple_open(file, false);
+ g_free(file);
+
+ // Looping for all monitors and calling save on each
+ for (monitor_iter i = tmp_applet->monitors.begin(),
+ end = tmp_applet->monitors.end(); i != end; ++i)
+ (*i)->save(settings);
+
+ // Close settings file
+ xfce_rc_close(settings);
+ }
+ else
+ {
+ // Unable to obtain writeable config file - informing user and exiting
+ std::cerr << _("Unable to obtain writeable config file path in order to"
+ " save monitors!\n");
+ }
+}
+
Applet::Applet(XfcePanelPlugin *plugin)
: panel_applet(plugin),
@@ -109,19 +141,20 @@ Applet::Applet(XfcePanelPlugin *plugin)
// Setting defaults
icon_path("/usr/share/pixmaps/hardware-monitor-applet.png"),
viewer_type("curve"),
- viewer_size(96), // Arbitrary default
viewer_font(""),
+ viewer_size(96), // Arbitrary default
background_color(0x00000000), // black as the night
use_background_color(false),
next_color(0)
{
// Search for settings file
+ XfceRc* settings = NULL;
gchar* file = xfce_panel_plugin_lookup_rc_file(panel_applet);
if (file)
{
// One exists - loading readonly settings
- XfceRc* settings = xfce_rc_simple_open(file, true);
+ settings = xfce_rc_simple_open(file, true);
g_free(file);
icon_path = xfce_rc_read_entry(settings, "icon-path", icon_path.c_str());
@@ -129,22 +162,20 @@ Applet::Applet(XfcePanelPlugin *plugin)
viewer_type.c_str());
viewer_size = xfce_rc_read_int_entry(settings, "viewer_size",
viewer_size);
- viewer_font = xfce_rc_read_entry(settings, "viewer_font", viewer_font);
+ viewer_font = xfce_rc_read_entry(settings, "viewer_font",
+ viewer_font.c_str());
background_color = xfce_rc_read_int_entry(settings, "background_color",
background_color);
use_background_color = xfce_rc_read_bool_entry(settings,
"use_background_color", use_background_color);
next_color = xfce_rc_read_int_entry(settings, "next_color",
next_color);
-
- // All settings loaded
- xfce_rc_close(settings);
}
// Loading icon
try
{
- icon = Gdk::Pixbuf::create_from_file(icon_name);
+ icon = Gdk::Pixbuf::create_from_file(icon_path);
}
catch (...)
{
@@ -208,6 +239,9 @@ Applet::Applet(XfcePanelPlugin *plugin)
for (monitor_iter i = mon.begin(), end = mon.end(); i != end; ++i)
add_monitor(*i);
+ // All settings loaded
+ xfce_rc_close(settings);
+
/* TODO: This should be completely irrelevant as the view and background colour is already set above
// Start displaying something
// Ensure config values aren't null
@@ -282,7 +316,7 @@ Applet::~Applet()
view.reset();
// Save monitors configuration
- save_monitors();
+ save_monitors(this);
// Delete monitors
for (monitor_iter i = monitors.begin(), end = monitors.end(); i != end; ++i) {
@@ -346,7 +380,7 @@ unsigned int Applet::get_fg_color()
// Updating next_color
next_color = int((next_color + 1) %
- (sizeof(colors) / sizeof(unsigned int))));
+ (sizeof(colors) / sizeof(unsigned int)));
// Search for a writeable settings file, create one if it doesnt exist
gchar* file = xfce_panel_plugin_save_location(panel_applet, true);
@@ -376,9 +410,8 @@ unsigned int Applet::get_fg_color()
int Applet::get_size() const
{
- // FIXME: the panel appears to lie about its true size
- // 2 pixels of frame decoration on both sides
- return panel_applet_get_size(panel_applet) - 2 * 2;
+ // Return the width or height depending on the orientation
+ return xfce_panel_plugin_get_size(panel_applet);
}
bool Applet::horizontal() const
@@ -392,6 +425,31 @@ Glib::RefPtr<Gdk::Pixbuf> Applet::get_icon()
return icon;
}
+const Glib::ustring Applet::get_viewer_type()
+{
+ return viewer_type;
+}
+
+int Applet::get_background_color() const
+{
+ return background_color;
+}
+
+gboolean Applet::get_use_background_color() const
+{
+ return use_background_color;
+}
+
+int Applet::get_viewer_size() const
+{
+ return viewer_size;
+}
+
+const Glib::ustring Applet::get_viewer_font()
+{
+ return viewer_font;
+}
+
void Applet::add_monitor(Monitor *monitor)
{
add_sync_for(monitor);
@@ -433,7 +491,7 @@ void Applet::add_monitor(Monitor *monitor)
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Load settings for monitor
@@ -472,7 +530,8 @@ void Applet::remove_monitor(Monitor *monitor)
// Removing settings group associated with the monitor if it exists
if (xfce_rc_has_group(settings, monitor->get_settings_dir().c_str()))
- xfce_rc_delete_group(settings, monitor->get_settings_dir().c_str())
+ xfce_rc_delete_group(settings, monitor->get_settings_dir().c_str(),
+ FALSE);
// Close settings file
xfce_rc_close(settings);
@@ -511,7 +570,7 @@ void Applet::replace_monitor(Monitor *prev_mon, Monitor *new_mon)
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Load settings
@@ -528,7 +587,7 @@ void Applet::replace_monitor(Monitor *prev_mon, Monitor *new_mon)
}
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(panel_applet, true);
+ file = xfce_panel_plugin_save_location(panel_applet, true);
if (file)
{
@@ -572,32 +631,6 @@ void Applet::remove_sync_for(Monitor *monitor)
(*i)->remove_sync_with(monitor);
}
-void Applet::save_monitors()
-{
- // Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(panel_applet, true);
-
- if (file)
- {
- // Opening setting file
- XfceRc* settings = xfce_rc_simple_open(file, false);
- g_free(file);
-
- // Looping for all monitors and calling save on each
- for (monitor_iter i = monitors.begin(), end = monitors.end(); i != end; ++i)
- (*i)->save(settings);
-
- // Close settings file
- xfce_rc_close(settings);
- }
- else
- {
- // Unable to obtain writeable config file - informing user and exiting
- std::cerr << _("Unable to obtain writeable config file path in order to"
- " save monitors!\n");
- }
-}
-
Glib::ustring Applet::find_empty_monitor_dir()
{
Glib::ustring mon_dir;
@@ -608,7 +641,7 @@ Glib::ustring Applet::find_empty_monitor_dir()
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
int c = 1;
@@ -679,10 +712,3 @@ void Applet::on_about_activated()
about->raise();
}
}
-
-/* 'Registering' the applet - in reality this substitutes into a load
- * of functions including a main */
-extern "C"
-{
- XFCE_PANEL_PLUGIN_REGISTER(applet_construct)
-}
diff --git a/src/applet.hpp b/src/applet.hpp
index 67947d3..76a29d9 100644
--- a/src/applet.hpp
+++ b/src/applet.hpp
@@ -5,7 +5,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -36,10 +36,10 @@
extern "C"
{
-#include <gtk/gtk.h> // TODO: Confirm this is needed
#include <libxfce4panel/libxfce4panel.h>
}
+
#include "monitor.hpp"
class PreferencesWindow;
@@ -50,7 +50,7 @@ class View;
class Applet: public Gtk::EventBox
{
public:
- Applet(PanelApplet *panel_applet);
+ Applet(XfcePanelPlugin *plugin);
~Applet();
Gtk::Container &get_container();
@@ -60,14 +60,27 @@ public:
bool horizontal() const; // whether we're in horizontal mode
void set_view(View *view); // use this view to monitor
+ /* The following have been created to access properties that used to
+ * be publically available through GConf, but are private data in the
+ * object */
+ const Glib::ustring get_viewer_type();
+ int get_background_color() const;
+ gboolean get_use_background_color() const;
+ int get_viewer_size() const;
+ const Glib::ustring get_viewer_font();
+ void set_viewer_font(Glib::ustring font_name);
+
Glib::RefPtr<Gdk::Pixbuf> get_icon(); // get the application icon
void add_monitor(Monitor *monitor); // take over ownership of monitor
void remove_monitor(Monitor *monitor); // get rid of the monitor
void replace_monitor(Monitor *prev_monitor, Monitor *new_monitor);
+ // For opening settings file associated with the plugin
+ XfcePanelPlugin *panel_applet;
+
static int const update_interval = 1000;
-
+
private:
// monitors
monitor_seq monitors;
@@ -84,9 +97,8 @@ private:
sigc::connection timer;
Glib::ustring find_empty_monitor_dir();
-
+
// data
- XfcePanelPlugin *panel_applet;
Glib::ustring icon_path;
Glib::ustring viewer_type;
Glib::ustring viewer_font;
@@ -100,11 +112,11 @@ private:
std::auto_ptr<PreferencesWindow> preferences_window;
Gtk::Tooltips tooltips;
-
- friend void display_preferences(BonoboUIComponent *, void *applet, const gchar *);
- friend void display_help(BonoboUIComponent *, void *applet, const gchar *);
- friend void display_about(BonoboUIComponent *, void *applet, const gchar *);
+ friend void display_preferences(void *applet);
+ friend void display_help(void *applet);
+ friend void display_about(void *applet);
+ friend void save_monitors(void *applet);
};
#endif
diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 6bd8de9..d5b4086 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -1,10 +1,11 @@
/* Implementation of the bar view.
*
* Copyright (c) 2003, 04 Ole Laursen.
+ * Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -112,16 +113,16 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading color
bool color_missing = false;
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_has_entry(settings, "color")
+ if (xfce_rc_has_entry(settings, "color"))
{
fill_color = xfce_rc_read_int_entry(settings, "color",
- applet->get_fg_color());
+ applet->get_fg_color());
}
else
color_missing = true;
@@ -138,25 +139,25 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
// Search for a writeable settings file, create one if it doesnt exist
file = xfce_panel_plugin_save_location(applet->panel_applet, true);
-
+
if (file)
{
- // Opening setting file
- settings = xfce_rc_simple_open(file, false);
- g_free(file);
-
- // Saving color
- xfce_rc_set_group(settings, dir.c_str());
- xfce_write_int_entry(settings, "color", int(fill_color));
-
- // Close settings file
- xfce_rc_close(settings);
+ // Opening setting file
+ settings = xfce_rc_simple_open(file, false);
+ g_free(file);
+
+ // Saving color
+ xfce_rc_set_group(settings, dir.c_str());
+ xfce_rc_write_int_entry(settings, "color", int(fill_color));
+
+ // Close settings file
+ xfce_rc_close(settings);
}
else
{
- // Unable to obtain writeable config file - informing user
- std::cerr << _("Unable to obtain writeable config file path in "
- "order to update color in Bar::draw call!\n");
+ // Unable to obtain writeable config file - informing user
+ std::cerr << _("Unable to obtain writeable config file path in "
+ "order to update color in Bar::draw call!\n");
}
}
}
diff --git a/src/bar-view.hpp b/src/bar-view.hpp
index dd458b2..56d6ce9 100644
--- a/src/bar-view.hpp
+++ b/src/bar-view.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/canvas-view.cpp b/src/canvas-view.cpp
index ead4c78..91b5b7c 100644
--- a/src/canvas-view.cpp
+++ b/src/canvas-view.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -62,13 +62,13 @@ void CanvasView::do_update()
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading size
bool size_missing = false;
int size = 60;
- if (xfce_rc_has_entry(settings, "viewer_size")
+ if (xfce_rc_has_entry(settings, "viewer_size"))
{
size = xfce_rc_read_int_entry(settings, "viewer_size", 60);
}
@@ -93,7 +93,7 @@ void CanvasView::do_update()
g_free(file);
// Saving viewer size
- xfce_write_int_entry(settings, "viewer_size", size);
+ xfce_rc_write_int_entry(settings, "viewer_size", size);
// Close settings file
xfce_rc_close(settings);
diff --git a/src/canvas-view.hpp b/src/canvas-view.hpp
index 21cd20d..6656f49 100644
--- a/src/canvas-view.hpp
+++ b/src/canvas-view.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index f3ab657..21798f2 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -1,10 +1,11 @@
/* Implementation of the ChooseMonitorWindow class.
*
* Copyright (c) 2003, 04 Ole Laursen.
+ * Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -163,7 +164,7 @@ ChooseMonitorWindow::~ChooseMonitorWindow()
}
-Monitor *ChooseMonitorWindow::run(const XfcePanelPlugin* panel_applet,
+Monitor *ChooseMonitorWindow::run(XfcePanelPlugin* panel_applet,
const Glib::ustring &mon_dir)
{
// setup dialog
@@ -175,6 +176,8 @@ Monitor *ChooseMonitorWindow::run(const XfcePanelPlugin* panel_applet,
if (file)
{
// Loading settings
+ XfceRc* settings = xfce_rc_simple_open(file, true);
+ g_free(file);
xfce_rc_set_group(settings, mon_dir.c_str());
Glib::ustring type = xfce_rc_read_entry(settings, "type", "");
@@ -216,9 +219,9 @@ Monitor *ChooseMonitorWindow::run(const XfcePanelPlugin* panel_applet,
}
// Fill in cpu info
- if (xfce_rc_has_entry(settings, "cpu_no")
+ if (xfce_rc_has_entry(settings, "cpu_no"))
{
- int no = xfce_rc_read_int_entry(settings, "cpu_no", -1)
+ int no = xfce_rc_read_int_entry(settings, "cpu_no", -1);
if (no >= 0 && no < CpuUsageMonitor::max_no_cpus) {
one_cpu_radiobutton->set_active();
cpu_no_spinbutton->set_value(no + 1);
@@ -229,13 +232,13 @@ Monitor *ChooseMonitorWindow::run(const XfcePanelPlugin* panel_applet,
}
// Fill in disk usage info
- if (xfce_rc_has_entry(settings, "mount_dir")
+ if (xfce_rc_has_entry(settings, "mount_dir"))
{
- GLib::ustring mount_dir = xfce_rc_read_entry(settings,
+ Glib::ustring mount_dir = xfce_rc_read_entry(settings,
"mount_dir", "");
mount_dir_entry->set_text(mount_dir);
}
- if (xfce_rc_has_entry(settings, "show_free")
+ if (xfce_rc_has_entry(settings, "show_free"))
{
bool show_free = xfce_rc_read_bool_entry(settings,
"show_free", false);
@@ -243,7 +246,7 @@ Monitor *ChooseMonitorWindow::run(const XfcePanelPlugin* panel_applet,
}
// Fill in network load info
- if (xfce_rc_has_entry(settings, "interface")
+ if (xfce_rc_has_entry(settings, "interface"))
{
Glib::ustring interface = xfce_rc_read_entry(settings,
"interface", "eth");
@@ -267,7 +270,7 @@ Monitor *ChooseMonitorWindow::run(const XfcePanelPlugin* panel_applet,
network_type_optionmenu->set_history(0);
}
- if (xfce_rc_has_entry(settings, "interface_direction")
+ if (xfce_rc_has_entry(settings, "interface_direction"))
{
int direction = xfce_rc_read_int_entry(settings,
"interface_direction", NetworkLoadMonitor::all_data);
diff --git a/src/choose-monitor-window.hpp b/src/choose-monitor-window.hpp
index a0d2678..181dd42 100644
--- a/src/choose-monitor-window.hpp
+++ b/src/choose-monitor-window.hpp
@@ -1,10 +1,11 @@
/* The choose monitor window.
*
* Copyright (c) 2003, 04 Ole Laursen.
+ * Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -21,6 +22,7 @@
#ifndef CHOOSE_MONITOR_WINDOW_HPP
#define CHOOSE_MONITOR_WINDOW_HPP
+#include <iostream>
#include <memory>
#include <libglademm/xml.h>
@@ -34,6 +36,12 @@
#include <gtkmm/optionmenu.h>
#include <gtkmm/radiobutton.h>
#include <gtkmm/spinbutton.h>
+#include <glibmm/ustring.h>
+
+extern "C"
+{
+#include <libxfce4panel/libxfce4panel.h>
+}
class Applet;
class Monitor;
@@ -44,8 +52,9 @@ public:
ChooseMonitorWindow(Glib::RefPtr<Gdk::Pixbuf> icon, Gtk::Window &parent);
~ChooseMonitorWindow();
+ // WIP: Bullshit error saying that Glib is not declared. Glib::RefPtr above was present in the original code so this is nonsense. It definitely doesnt like this new run function signature though
// given a monitor directory (may be ""), return a new monitor or 0
- Monitor *run(const XfcePanelPlugin* panel_applet,
+ Monitor *run(XfcePanelPlugin* panel_applet,
const Glib::ustring &mon_dir);
private:
diff --git a/src/column-view.cpp b/src/column-view.cpp
index 6f025d9..7ee25d6 100644
--- a/src/column-view.cpp
+++ b/src/column-view.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -77,17 +77,14 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
double time_offset = double(remaining_draws) / CanvasView::draw_iterations;
-
- Glib::RefPtr<Gnome::Conf::Client> &client = applet->panel_applet;
-
ValueHistory::iterator vi = value_history.values.begin(),
vend = value_history.values.end();
if (vi == vend) // there must be at least one point
return;
- // get colour
- unsigned int color;
+ // Get default colour
+ unsigned int color = applet->get_fg_color();
// Fetching assigned settings group
Glib::ustring dir = monitor->get_settings_dir();
@@ -98,13 +95,13 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading color
bool color_missing = false;
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_has_entry(settings, "color")
+ if (xfce_rc_has_entry(settings, "color"))
{
color = xfce_rc_read_int_entry(settings, "color",
applet->get_fg_color());
@@ -120,8 +117,6 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
* be separated */
if (color_missing)
{
- color = applet->get_fg_color();
-
// Search for a writeable settings file, create one if it doesnt exist
file = xfce_panel_plugin_save_location(applet->panel_applet, true);
@@ -133,7 +128,7 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
// Saving color
xfce_rc_set_group(settings, dir.c_str());
- xfce_write_int_entry(settings, "color", int(color));
+ xfce_rc_write_int_entry(settings, "color", int(color));
// Close settings file
xfce_rc_close(settings);
diff --git a/src/column-view.hpp b/src/column-view.hpp
index 03d67f3..7dc825a 100644
--- a/src/column-view.hpp
+++ b/src/column-view.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index 8d414d2..ac911f7 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -88,8 +88,8 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas,
line->property_join_style() = Gdk::JOIN_ROUND;
}
- // get drawing attributes
- unsigned int color;
+ // Get drawing attributes with defaults
+ unsigned int color = applet->get_fg_color();
double const line_width = 1.5;
// Obtaining color
@@ -102,13 +102,13 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas,
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading color
bool color_missing = false;
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_has_entry(settings, "color")
+ if (xfce_rc_has_entry(settings, "color"))
{
color = xfce_rc_read_int_entry(settings, "color",
applet->get_fg_color());
@@ -124,8 +124,6 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas,
* be separated */
if (color_missing)
{
- color = applet->get_fg_color();
-
// Search for a writeable settings file, create one if it doesnt exist
file = xfce_panel_plugin_save_location(applet->panel_applet, true);
@@ -137,7 +135,7 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas,
// Saving color
xfce_rc_set_group(settings, dir.c_str());
- xfce_write_int_entry(settings, "color", int(color));
+ xfce_rc_write_int_entry(settings, "color", int(color));
// Close settings file
xfce_rc_close(settings);
diff --git a/src/curve-view.hpp b/src/curve-view.hpp
index 314f623..8ffd5c4 100644
--- a/src/curve-view.hpp
+++ b/src/curve-view.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/flame-view.cpp b/src/flame-view.cpp
index cb8c012..2fab872 100644
--- a/src/flame-view.cpp
+++ b/src/flame-view.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -66,8 +66,8 @@ Flame::Flame(Monitor *m)
void Flame::update(Gnome::Canvas::Canvas &canvas,
Applet *applet, int width, int height, int no, int total)
{
- // Get color
- unsigned int color;
+ // Get color with default
+ unsigned int color = applet->get_fg_color();
// Fetching assigned settings group
Glib::ustring dir = monitor->get_settings_dir();
@@ -78,13 +78,13 @@ void Flame::update(Gnome::Canvas::Canvas &canvas,
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading color
bool color_missing = false;
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_has_entry(settings, "color")
+ if (xfce_rc_has_entry(settings, "color"))
{
color = xfce_rc_read_int_entry(settings, "color",
applet->get_fg_color());
@@ -100,8 +100,6 @@ void Flame::update(Gnome::Canvas::Canvas &canvas,
* be separated */
if (color_missing)
{
- color = applet->get_fg_color();
-
// Search for a writeable settings file, create one if it doesnt exist
file = xfce_panel_plugin_save_location(applet->panel_applet, true);
@@ -113,7 +111,7 @@ void Flame::update(Gnome::Canvas::Canvas &canvas,
// Saving color
xfce_rc_set_group(settings, dir.c_str());
- xfce_write_int_entry(settings, "color", int(color));
+ xfce_rc_write_int_entry(settings, "color", int(color));
// Close settings file
xfce_rc_close(settings);
diff --git a/src/flame-view.hpp b/src/flame-view.hpp
index 2e3f1fa..04704af 100644
--- a/src/flame-view.hpp
+++ b/src/flame-view.hpp
@@ -5,7 +5,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/gui-helpers.hpp b/src/gui-helpers.hpp
index e96755d..7d4f767 100644
--- a/src/gui-helpers.hpp
+++ b/src/gui-helpers.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 5f3010c..2b3a18d 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/helpers.hpp b/src/helpers.hpp
index 0bd4ec3..dc4fb38 100644
--- a/src/helpers.hpp
+++ b/src/helpers.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/i18n.hpp b/src/i18n.hpp
index d2ce5dc..dfd6e85 100644
--- a/src/i18n.hpp
+++ b/src/i18n.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/main.cpp.old b/src/main.cpp.old
index 45606ac..6d43e6e 100644
--- a/src/main.cpp.old
+++ b/src/main.cpp.old
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index d35231b..99a70e3 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -52,7 +52,7 @@ double const max_decay = 0.999;
//
std::list<Monitor *>
-load_monitors(const XfceRc* const settings)
+load_monitors(XfceRc* settings)
{
std::list<Monitor *> monitors;
@@ -63,7 +63,7 @@ load_monitors(const XfceRc* const settings)
gchar** settings_monitors = xfce_rc_get_groups(settings);
// They do - looping for all monitors
- for (gchar** settings_monitor = settings_monitors; *settings_monitor;
+ for (gchar* settings_monitor = *settings_monitors; *settings_monitor;
++settings_monitors)
{
// Setting the correct group prior to loading settings
@@ -75,7 +75,7 @@ load_monitors(const XfceRc* const settings)
if (type == "cpu_usage")
{
// Obtaining cpu_no
- int cpu_no = xfce_rc_read_int_entry(settings, cpu_no, -1);
+ int cpu_no = xfce_rc_read_int_entry(settings, "cpu_no", -1);
// Creating CPU usage monitor with provided number if valid
if (cpu_no == -1)
@@ -456,22 +456,11 @@ void LoadAverageMonitor::load(XfceRc *settings)
// Fetching assigned settings group
Glib::ustring dir = get_settings_dir();
- // Loading settings
+ // Loading settings - no support for floats, unstringifying
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_read_entry(settings, "type", "") == "load_average")
- {
- /* No support for floats - unstringifying, making sure the data is
- * not corrupt */
- Glib::ustring setting = xfce_rc_read_entry(settings, "max", "5");
- if (dynamic_cast<float>(setting))
- max_value = static_cast<float>(setting)
- else
- {
- std::cerr << String::ucompose(_("Unable to configure max load "
- "average for monitor %1 - cant cast '%2' to float!\n"),
- dir, setting);
- }
- }
+ Glib::ustring type = xfce_rc_read_entry(settings, "type", "");
+ if (type == "load_average")
+ max_value = atof(xfce_rc_read_entry(settings, "max", "5"));
}
@@ -785,7 +774,7 @@ void NetworkLoadMonitor::save(XfceRc *settings)
// Saving settings
xfce_rc_set_group(settings, dir.c_str());
xfce_rc_write_entry(settings, "type", "network_load");
- xfce_rc_write_entry(settings, "interface", interface);
+ xfce_rc_write_entry(settings, "interface", interface.c_str());
xfce_rc_write_int_entry(settings, "interface_no", interface_no);
xfce_rc_write_int_entry(settings, "interface_direction",
int(direction));
@@ -800,11 +789,12 @@ void NetworkLoadMonitor::load(XfceRc *settings)
/* Loading settings - ensuring the settings are for the particular
* network monitor?? */
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_read_entry(settings, "type", "") == "network_load"
- && xfce_rc_read_entry(settings, "interface", "") == interface
- && xfce_rc_read_int_entry(settings, "interface_no", 0) == interface
+ Glib::ustring type = xfce_rc_read_entry(settings, "type", ""),
+ setting_interface = xfce_rc_read_entry(settings, "interface", "");
+ if (type == "network_load" && setting_interface == interface
+ && xfce_rc_read_int_entry(settings, "interface_no", 0) == interface_no
&& xfce_rc_read_int_entry(settings, "interface_direction",
- incoming_data) s== interface)
+ int(incoming_data)) == int(direction))
{
max_value = xfce_rc_read_int_entry(settings, "max", 0);
}
@@ -1025,24 +1015,13 @@ void TemperatureMonitor::load(XfceRc *settings)
// Fetching assigned settings group
Glib::ustring dir = get_settings_dir();
- // Loading settings, making sure the right sensor is loaded
+ /* Loading settings, making sure the right sensor is loaded. No support
+ * for floats, unstringifying */
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_read_entry(settings, "type", "") == "temperature"
- && xfce_rc_read_int_entry(settings, "temperature_no", 0) ==
- sensors_no)
- {
- /* No support for floats - unstringifying, making sure the data is
- * not corrupt */
- Glib::ustring setting = xfce_rc_read_entry(settings, "max", "40");
- if (dynamic_cast<float>(setting))
- max_value = static_cast<float>(setting)
- else
- {
- std::cerr << String::ucompose(_("Unable to configure max "
- "temperature for monitor %1 - cant cast '%2' to float!\n"),
- dir, setting);
- }
- }
+ Glib::ustring type = xfce_rc_read_entry(settings, "type", "");
+ if (type == "temperature" && xfce_rc_read_int_entry(settings,
+ "temperature_no", 0) == sensors_no)
+ max_value = atof(xfce_rc_read_entry(settings, "max", "40"));
}
@@ -1127,22 +1106,11 @@ void FanSpeedMonitor::load(XfceRc *settings)
// Fetching assigned settings group
Glib::ustring dir = get_settings_dir();
- // Loading settings, making sure the right fan is loaded
+ /* Loading settings, making sure the right fan is loaded. No support
+ * for floats, unstringifying */
xfce_rc_set_group(settings, dir.c_str());
- if (xfce_rc_read_entry(settings, "type", "") == "fan_speed"
- && xfce_rc_read_int_entry(settings, "fan_no", 0) ==
- sensors_no)
- {
- /* No support for floats - unstringifying, making sure the data is
- * not corrupt */
- Glib::ustring setting = xfce_rc_read_entry(settings, "max", "1");
- if (dynamic_cast<float>(setting))
- max_value = static_cast<float>(setting)
- else
- {
- std::cerr << String::ucompose(_("Unable to configure max fan RPM "
- "for monitor %1 - cant cast '%2' to float!\n"),
- dir, setting);
- }
- }
+ Glib::ustring type = xfce_rc_read_entry(settings, "type", "");
+ if (type == "fan_speed" && xfce_rc_read_int_entry(settings, "fan_no",
+ 0) == sensors_no)
+ max_value = atof(xfce_rc_read_entry(settings, "max", "1"));
}
diff --git a/src/monitor-impls.hpp b/src/monitor-impls.hpp
index 9b992cb..1f29d60 100644
--- a/src/monitor-impls.hpp
+++ b/src/monitor-impls.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/monitor.hpp b/src/monitor.hpp
index 812ab42..ea705b1 100644
--- a/src/monitor.hpp
+++ b/src/monitor.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -25,6 +25,11 @@
#include <list>
#include <glibmm/ustring.h>
+extern "C"
+{
+#include <libxfce4util/libxfce4util.h>
+}
+
#include "helpers.hpp"
class Monitor: noncopyable
@@ -115,7 +120,6 @@ private:
typedef std::list<Monitor *> monitor_seq;
typedef monitor_seq::iterator monitor_iter;
-monitor_seq load_monitors(const Glib::RefPtr<Gnome::Conf::Client> &client,
- const Glib::ustring &dir);
+monitor_seq load_monitors(const XfceRc* const settings);
#endif
diff --git a/src/pixbuf-drawing.hpp b/src/pixbuf-drawing.hpp
index b88e067..b3bdf13 100644
--- a/src/pixbuf-drawing.hpp
+++ b/src/pixbuf-drawing.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/preferences-window.cpp b/src/preferences-window.cpp
index 384163b..eb963ad 100644
--- a/src/preferences-window.cpp
+++ b/src/preferences-window.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -34,9 +34,6 @@
#include "i18n.hpp"
-// Private prototypes
-void save_font_name(Glib::ustring &font_name)
-
void PreferencesWindow::connect_monitor_colorbutton(Gtk::ColorButton
*colorbutton)
{
@@ -183,13 +180,12 @@ PreferencesWindow::PreferencesWindow(Applet &applet_, monitor_seq monitors)
sigc::mem_fun(*this, &PreferencesWindow::font_listener));
*/
-
// Fill in values
- viewer_type_listener(0, &applet->viewer_type);
- background_color_listener(0, applet->background_color);
- use_background_color_listener(0, applet->use_background_color);
- size_listener(0, applet->viewer_size);
- font_listener(0, &applet->viewer_font);
+ viewer_type_listener(0, applet.get_viewer_type());
+ background_color_listener(0, applet.get_background_color());
+ use_background_color_listener(0, applet.get_use_background_color());
+ size_listener(0, applet.get_viewer_size());
+ font_listener(0, applet.get_viewer_font());
for (monitor_iter i = monitors.begin(), end = monitors.end(); i != end; ++i)
add_to_monitors_list(*i);
@@ -255,7 +251,7 @@ namespace
// Originally gconf callbacks
void PreferencesWindow::viewer_type_listener(unsigned int,
- Glib::ustring &viewer_type;)
+ const Glib::ustring viewer_type)
{
if (viewer_type == "curve")
{
@@ -328,7 +324,7 @@ void PreferencesWindow::size_listener(unsigned int,
}
void PreferencesWindow::font_listener(unsigned int,
- Glib::ustring &viewer_font)
+ const Glib::ustring viewer_font)
{
if (viewer_font.empty())
font_checkbutton->set_active(false);
@@ -382,7 +378,7 @@ void PreferencesWindow::sync_conf_with_colorbutton(std::string settings_dir,
b = c.get_blue() >> 8;
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -422,10 +418,10 @@ void PreferencesWindow::on_background_color_radiobutton_toggled()
bool on = background_color_radiobutton->get_active();
background_colorbutton->set_sensitive(on);
- use_background_color_listener(0, on)
+ use_background_color_listener(0, on);
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -455,7 +451,7 @@ void PreferencesWindow::on_curve_radiobutton_toggled()
if (active)
{
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -490,7 +486,7 @@ void PreferencesWindow::on_bar_radiobutton_toggled()
if (active)
{
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -525,7 +521,7 @@ void PreferencesWindow::on_vbar_radiobutton_toggled()
if (active)
{
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -560,7 +556,7 @@ void PreferencesWindow::on_column_radiobutton_toggled()
if (active)
{
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -595,7 +591,7 @@ void PreferencesWindow::on_text_radiobutton_toggled()
if (active)
{
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -629,7 +625,7 @@ void PreferencesWindow::on_flame_radiobutton_toggled()
if (active)
{
// Search for a writeable settings file, create one if it doesnt exist
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -668,7 +664,7 @@ void PreferencesWindow::on_size_scale_changed()
/* Saving pixel value of scale
* Search for a writeable settings file, create one if it doesnt exist */
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
@@ -765,12 +761,6 @@ void PreferencesWindow::on_change_button_clicked()
void PreferencesWindow::stop_monitor_listeners()
{
- Glib::RefPtr<Gnome::Conf::Client> &client = applet.get_gconf_client();
-
- for (std::vector<unsigned int>::iterator i = monitor_listeners.begin(),
- end = monitor_listeners.end(); i != end; ++i)
- client->notify_remove(*i);
-
monitor_listeners.clear();
}
@@ -786,19 +776,19 @@ void PreferencesWindow::on_selection_changed()
// Making sure the selection is available
if (sel)
{
- unsigned int con, color;
+ unsigned int color = 0; // TODO: Is this an acceptable default? Can't seem to see how the normal default happens
// Loading up new monitor colour
// Fetching assigned settings group
Glib::ustring key, mon_dir = (*(*i)[mc.monitor]).get_settings_dir();
// Search for settings file
- gchar* file = xfce_panel_plugin_lookup_rc_file(applet->panel_applet);
+ gchar* file = xfce_panel_plugin_lookup_rc_file(applet.panel_applet);
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading color
@@ -848,7 +838,7 @@ Monitor *PreferencesWindow::run_choose_monitor_window(const Glib::ustring &str)
{
ChooseMonitorWindow chooser(applet.get_icon(), *window);
- return chooser.run(applet->panel_applet, str);
+ return chooser.run(applet.panel_applet, str);
}
void PreferencesWindow::add_to_monitors_list(Monitor *mon)
@@ -891,12 +881,12 @@ int PreferencesWindow::pixels_to_size_scale(int pixels)
return min_i;
}
-void save_font_name(Glib::ustring &font_name)
+void PreferencesWindow::save_font_name(Glib::ustring font_name)
{
- applet->font = font_name;
+ applet.set_viewer_font(font_name);
// Search for a writeable settings file, create one if it doesnt exist */
- gchar* file = xfce_panel_plugin_save_location(applet->panel_applet, true);
+ gchar* file = xfce_panel_plugin_save_location(applet.panel_applet, true);
if (file)
{
diff --git a/src/preferences-window.hpp b/src/preferences-window.hpp
index 008282a..c01cf93 100644
--- a/src/preferences-window.hpp
+++ b/src/preferences-window.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -104,12 +104,12 @@ private:
typedef Gtk::ListStore::iterator store_iter;
// Originally gconf callbacks
- void viewer_type_listener(unsigned int, Glib::ustring &viewer_type);
+ void viewer_type_listener(unsigned int, const Glib::ustring viewer_type);
void background_color_listener(unsigned int,
unsigned int background_color);
void use_background_color_listener(unsigned int, bool use_background_color);
void size_listener(unsigned int, int viewer_size);
- void font_listener(unsigned int, Glib::ustring &viewer_font);
+ void font_listener(unsigned int, const Glib::ustring viewer_font);
void monitor_color_listener(unsigned int, unsigned int color);
void stop_monitor_listeners();
@@ -150,6 +150,8 @@ private:
void sync_conf_with_colorbutton(std::string settings_dir,
std::string setting_name, Gtk::ColorButton *button);
void connect_monitor_colorbutton(Gtk::ColorButton *colorbutton);
+
+ void save_font_name(Glib::ustring font_name);
Applet &applet;
};
diff --git a/src/i18n.hpp b/src/register_plugin.c
similarity index 55%
copy from src/i18n.hpp
copy to src/register_plugin.c
index d2ce5dc..f650fa7 100644
--- a/src/i18n.hpp
+++ b/src/register_plugin.c
@@ -1,10 +1,8 @@
-/* Internationalisation functions.
- *
- * Copyright (c) 2003 Ole Laursen.
+/* Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -18,26 +16,13 @@
* USA.
*/
-#ifndef HARDWARE_MONITOR_I18N_HPP
-#define HARDWARE_MONITOR_I18N_HPP
-
-#ifndef GETTEXT_PACKAGE
-#error "config.h must be included prior to i18n.hpp"
-#endif
-
-#include <libintl.h>
-#include <locale.h>
-
-#ifdef _
-#undef _
-#endif
-#ifdef N_
-#undef N_
-#endif
+#include <libxfce4panel/xfce-panel-plugin.h>
-//#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define _(x) gettext (x)
-#define N_(x) x
+/* It looks like plugin registration MUST happen in a pure C file - doing
+ * this in a C linkage block in applet.cpp is not good enough */
+extern void applet_construct(XfcePanelPlugin* plugin);
-#endif
+/* 'Registering' the applet - in reality this substitutes into a load
+ * of functions including a main */
+XFCE_PANEL_PLUGIN_REGISTER(applet_construct)
diff --git a/src/text-view.cpp b/src/text-view.cpp
index 8b35e65..8a9ff06 100644
--- a/src/text-view.cpp
+++ b/src/text-view.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -19,6 +19,7 @@
*/
#include <algorithm>
+#include <iostream>
#include <cassert>
#include <gtkmm/label.h>
@@ -106,13 +107,13 @@ void TextView::do_update()
if (file)
{
// One exists - loading readonly settings
- settings = xfce_rc_simple_open(file, true);
+ XfceRc* settings = xfce_rc_simple_open(file, true);
g_free(file);
// Loading font_name
bool font_name_missing = false;
- GLib::ustring font_name = "";
- if (xfce_rc_has_entry(settings, "viewer_font")
+ Glib::ustring font_name = "";
+ if (xfce_rc_has_entry(settings, "viewer_font"))
{
font_name = xfce_rc_read_entry(settings, "viewer_font", "");
}
@@ -137,7 +138,7 @@ void TextView::do_update()
g_free(file);
// Saving viewer size
- xfce_write_entry(settings, "viewer_font", font_name);
+ xfce_rc_write_entry(settings, "viewer_font", font_name.c_str());
// Close settings file
xfce_rc_close(settings);
diff --git a/src/text-view.hpp b/src/text-view.hpp
index d55da5c..115cb98 100644
--- a/src/text-view.hpp
+++ b/src/text-view.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/value-history.cpp b/src/value-history.cpp
index 0a58a00..bae3f21 100644
--- a/src/value-history.cpp
+++ b/src/value-history.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/value-history.hpp b/src/value-history.hpp
index ee94a21..9f8d642 100644
--- a/src/value-history.hpp
+++ b/src/value-history.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/view.cpp b/src/view.cpp
index c819dd1..b898af9 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/view.hpp b/src/view.hpp
index 497ecf5..6ce125d 100644
--- a/src/view.hpp
+++ b/src/view.hpp
@@ -4,7 +4,7 @@
*
* 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 2 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list