[Goodies-commits] r1974 - in xfce4-battery-plugin/trunk: . panel-plugin po
Nick Schermer
nick at xfce.org
Wed Sep 6 11:50:29 CEST 2006
Author: nick
Date: 2006-09-06 09:50:27 +0000 (Wed, 06 Sep 2006)
New Revision: 1974
Added:
xfce4-battery-plugin/trunk/COPYING.LIB
Modified:
xfce4-battery-plugin/trunk/COPYING
xfce4-battery-plugin/trunk/ChangeLog
xfce4-battery-plugin/trunk/Makefile.am
xfce4-battery-plugin/trunk/autogen.sh
xfce4-battery-plugin/trunk/configure.in.in
xfce4-battery-plugin/trunk/panel-plugin/Makefile.am
xfce4-battery-plugin/trunk/panel-plugin/battery.c
xfce4-battery-plugin/trunk/panel-plugin/battery.h
xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in
xfce4-battery-plugin/trunk/panel-plugin/libacpi.c
xfce4-battery-plugin/trunk/panel-plugin/libacpi.h
xfce4-battery-plugin/trunk/panel-plugin/libapm.c
xfce4-battery-plugin/trunk/panel-plugin/libapm.h
xfce4-battery-plugin/trunk/po/POTFILES.in
xfce4-battery-plugin/trunk/po/cs.po
xfce4-battery-plugin/trunk/po/xfce4-battery-plugin.pot
Log:
* Added $Id$ using svn:keywords
* Added COPYING.LIB for libacpi and libapm
* Updated the copyright text in all *.c and *.h files
* Regenerated po files
* Some improvements in build files
Modified: xfce4-battery-plugin/trunk/COPYING
===================================================================
--- xfce4-battery-plugin/trunk/COPYING 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/COPYING 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,20 +1,340 @@
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 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
+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.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies 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
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+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:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, 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.
Added: xfce4-battery-plugin/trunk/COPYING.LIB
===================================================================
--- xfce4-battery-plugin/trunk/COPYING.LIB (rev 0)
+++ xfce4-battery-plugin/trunk/COPYING.LIB 2006-09-06 09:50:27 UTC (rev 1974)
@@ -0,0 +1,437 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, 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.
+
+ 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 library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, 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 companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, 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 library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+ 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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+ If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. 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.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+ 9. 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 Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+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 Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
Modified: xfce4-battery-plugin/trunk/ChangeLog
===================================================================
--- xfce4-battery-plugin/trunk/ChangeLog 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/ChangeLog 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,3 +1,11 @@
+2006-09-06 11:43 nick
+
+ * Added $Id$ using svn:keywords
+ * Added COPYING.LIB for libacpi and libapm
+ * Updated the copyright text in all *.c and *.h files
+ * Regenerated po files
+ * Some improvements in build files
+
2006-09-02 20:17 nick
* configure.in.in, Makefile.am, panel-plugin/Makefile.am: Improvements
Modified: xfce4-battery-plugin/trunk/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/Makefile.am 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/Makefile.am 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,14 +1,20 @@
-SUBDIRS = panel-plugin po
+# $Id$
+SUBDIRS = \
+ panel-plugin \
+ po
+
+AUTOMAKE_OPTIONS = \
+ 1.8 \
+ dist-bzip2
+
distclean-local:
rm -rf *.cache *~
-dist-bz2: dist
- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+rpm: dist
+ rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+ @rm -f $(PACKAGE)-$(VERSION).tar.gz
-distcheck-bz2: distcheck
- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-
EXTRA_DIST = \
README \
intltool-extract.in \
Property changes on: xfce4-battery-plugin/trunk/Makefile.am
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Property changes on: xfce4-battery-plugin/trunk/autogen.sh
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/configure.in.in
===================================================================
--- xfce4-battery-plugin/trunk/configure.in.in 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/configure.in.in 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,8 +1,8 @@
-dnl configure.ac
+dnl $Id$
dnl
-dnl xfce4-battery-plugin - Battery monitor for the XFce4 panel
+dnl xfce4-battery-plugin - Battery monitor for the Xfce4 panel
dnl
-dnl 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+dnl 2003 Benedikt Meurer <benny at xfce.org>
dnl
m4_define([battmon_version], [0.4.90.2])
Property changes on: xfce4-battery-plugin/trunk/configure.in.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/Makefile.am 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/Makefile.am 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,3 +1,5 @@
+# $Id$
+
plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-battery-plugin
@@ -2,3 +4,3 @@
xfce4_battery_plugin_SOURCES = \
- battery.h \
+ battery.h \
battery.c \
@@ -23,28 +25,17 @@
$(LIBXFCE4UTIL_LIBS) \
$(GTK_LIBS)
-# .desktop file
-#
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-#
+desktopdir = $(datadir)/xfce4/panel-plugins
desktop_in_in_files = battmon.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
+%.desktop.in: %.desktop.in.in
+ sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
+EXTRA_DIST = \
$(desktop_in_in_files)
-DISTCLEANFILES = \
- $(desktop_DATA) $(desktop_in_files)
-
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
- $< > $@
-
+CLEANFILES = \
+ $(desktop_in_files) \
+ $(desktop_DATA)
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/Makefile.am
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/battery.c
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/battery.c 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/battery.c 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,29 +1,24 @@
-/*
+/* $Id$
+ *
* Copyright (c) 2003 Nicholas Penwarden <toth64 at yahoo.com>
* Copyright (c) 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
* Copyright (c) 2003 edscott wilson garcia <edscott at users.sourceforge.net>
* Copyright (c) 2005 Eduard Roccatello <eduard at xfce.org>
+ * Copyright (c) 2006 Nick Schermer <nick at xfce.org>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * 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 (at your option)
+ * any later version.
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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
*/
#ifdef HAVE_CONFIG_H
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/battery.c
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/battery.h
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/battery.h 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/battery.h 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,12 +1,32 @@
-/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+/* $Id$
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * 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 (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
#ifdef __SUNPRO_C
#pragma align 4 (battery_pixbuf)
#endif
#ifdef __GNUC__
-static const guint8 battery_pixbuf[] __attribute__ ((__aligned__ (4))) =
+static const guint8 battery_pixbuf[] __attribute__ ((__aligned__ (4))) =
#else
-static const guint8 battery_pixbuf[] =
+static const guint8 battery_pixbuf[] =
#endif
{ ""
/* Pixbuf magic (0x47646b50) */
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/battery.h
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/battmon.desktop.in.in 2006-09-06 09:50:27 UTC (rev 1974)
@@ -4,5 +4,4 @@
_Name=Battery Monitor
_Comment=Show and monitor the battery status
Icon=xfce-mouse
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-battery-plugin
-
+X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-battery-plugin
Modified: xfce4-battery-plugin/trunk/panel-plugin/libacpi.c
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/libacpi.c 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/libacpi.c 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,34 +1,24 @@
-/***************************************************************************
- libacpi.c - description
- -------------------
- August 2003 C. edscott wilson garcia <edscott at imp.mx>: BSD acpi stuff
- begin : Feb 10 2003
- copyright : (C) 2003 by Noberasco Michele
- e-mail : 2001s098 at educ.disi.unige.it
- ***************************************************************************/
+/* $Id$
+ *
+ * Copyright (c) 2002 Costantino Pistagna <valvoline at vrlteam.org>
+ * Copyright (c) 2003 Noberasco Michele <2001s098 at educ.disi.unige.it>
+ * Copyright (c) 2003 Edscott Wilson Garcia <edscott at imp.mx>
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
-/***************************************************************************
- * *
- * 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- * *
- ***************************************************************************/
-
- /***************************************************************************
- Originally written by Costantino Pistagna for his wmacpimon
- ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/libacpi.c
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/libacpi.h
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/libacpi.h 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/libacpi.h 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,35 +1,24 @@
-/***************************************************************************
- libacpi.h - description
- -------------------
- begin : Feb 10 2003
- copyright : (C) 2003 by Noberasco Michele
- : (C) 2003 edscott wilson garcia with xfce4 modifications
- e-mail : 2001s098 at educ.disi.unige.it
- ***************************************************************************/
+/* $Id$
+ *
+ * Copyright (c) 2002 Costantino Pistagna <valvoline at vrlteam.org>
+ * Copyright (c) 2003 Noberasco Michele <2001s098 at educ.disi.unige.it>
+ * Copyright (c) 2003 Edscott Wilson Garcia <edscott at imp.mx>
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
-/***************************************************************************
- * *
- * 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- * *
- ***************************************************************************/
-
- /***************************************************************************
- Originally written by Costantino Pistagna for his wmacpimon
- ***************************************************************************/
-
#define MAXBATT 8
typedef enum
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/libacpi.h
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/libapm.c
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/libapm.c 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/libapm.c 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,23 +1,22 @@
-/* apmlib.c -- Sample APM interface routines
- * Created: Mon Jan 8 10:28:16 1996 by faith at acm.org
- * Revised: Fri Dec 26 21:38:29 1997 by faith at acm.org
- * Copyright 1996, 1997 Rickard E. Faith (faith at acm.org)
- *
+/* $Id$
+ *
+ * Copyright (c) 1996, 1997 Rickard E. Faith <faith at acm.org>
+ *
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published
* by the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
*/
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -56,7 +55,7 @@
/* Read information from /proc/apm. Return 0 on success, 1 if APM not
- * installed, 2 if APM installed, but old version.
+ * installed, 2 if APM installed, but old version.
*/
int apm_read(apm_info * i)
{
@@ -146,7 +145,7 @@
}
/* Fix possible kernel bug -- percentage
- * set to 0xff (==255) instead of -1.
+ * set to 0xff (==255) instead of -1.
*/
if (i->battery_percentage > 100)
i->battery_percentage = -1;
@@ -198,7 +197,7 @@
/* Return a file descriptor for the apm_bios device, or -1 if there is an
* error. Is this method secure? Should we make the device in /dev
- * instead of /tmp?
+ * instead of /tmp?
*
* apenwarr 2001/05/11: just throw out the weird temporary device file stuff.
* It was only for ancient kernel versions anyway.
@@ -224,10 +223,10 @@
}
fd = open(APM_DEVICE, O_RDWR);
}
-
+
return fd;
}
-
+
return -1;
}
@@ -329,7 +328,7 @@
const char *apm_error_name( unsigned int err )
{
int i;
-
+
for(i=0; i<ERROR_COUNT; i++)
if(err == error_table[i].key) return(error_table[i].msg);
@@ -339,7 +338,7 @@
int apm_reject( int fd )
{
#ifdef APM_IOC_REJECT
- if ( ioctl( fd, APM_IOC_REJECT, NULL ) )
+ if ( ioctl( fd, APM_IOC_REJECT, NULL ) )
return apm_last_error( fd );
else
#endif
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/libapm.c
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/panel-plugin/libapm.h
===================================================================
--- xfce4-battery-plugin/trunk/panel-plugin/libapm.h 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/panel-plugin/libapm.h 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,25 +1,22 @@
-/* apm.h -- Header file for sample APM interface routines
- * Created: Mon Jan 8 11:40:50 1996 by r.faith at ieee.org
- * Revised: Thu Apr 4 21:57:31 1996 by r.faith at ieee.org
- * Copyright 1996 Rickard E. Faith (r.faith at ieee.org)
+/* $Id$
*
+ * Copyright (c) 1996, 1997 Rickard E. Faith <faith at acm.org>
+ *
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published
* by the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- *
*/
+
#include <linux/apm_bios.h>
#include <sys/types.h>
Property changes on: xfce4-battery-plugin/trunk/panel-plugin/libapm.h
___________________________________________________________________
Name: svn:keywords
- author date id revision
+ Id
Modified: xfce4-battery-plugin/trunk/po/POTFILES.in
===================================================================
--- xfce4-battery-plugin/trunk/po/POTFILES.in 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/po/POTFILES.in 2006-09-06 09:50:27 UTC (rev 1974)
@@ -1,3 +1,2 @@
-panel-plugin/battmon.c
+panel-plugin/battery.c
panel-plugin/battmon.desktop.in.in
-
Modified: xfce4-battery-plugin/trunk/po/cs.po
===================================================================
--- xfce4-battery-plugin/trunk/po/cs.po 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/po/cs.po 2006-09-06 09:50:27 UTC (rev 1974)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-battery-plugin 0.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-01 12:16+0200\n"
+"POT-Creation-Date: 2006-09-06 11:38+0200\n"
"PO-Revision-Date: 2006-08-26 21:03+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,34 +16,34 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../panel-plugin/battmon.c:401
+#: ../panel-plugin/battery.c:401
msgid "(Charging from AC)"
msgstr "(Nabíjení ze sítě)"
-#: ../panel-plugin/battmon.c:401
+#: ../panel-plugin/battery.c:401
msgid "(AC on-line)"
msgstr "(Připojeno do sítě)"
-#: ../panel-plugin/battmon.c:410
+#: ../panel-plugin/battery.c:410
#, c-format
msgid "%d%% (%02d:%02d) remaining"
msgstr "Zbývá %d%% (%02d:%02d)"
-#: ../panel-plugin/battmon.c:412
+#: ../panel-plugin/battery.c:412
#, c-format
msgid "%02d:%02d remaining"
msgstr "Zbývá %02d:%02d"
-#: ../panel-plugin/battmon.c:414
+#: ../panel-plugin/battery.c:414
#, c-format
msgid "%d%% remaining"
msgstr "Zbývá %d%%"
-#: ../panel-plugin/battmon.c:416
+#: ../panel-plugin/battery.c:416
msgid "AC off-line"
msgstr "Napájení odpojeno"
-#: ../panel-plugin/battmon.c:479
+#: ../panel-plugin/battery.c:480
msgid ""
"WARNING: Your battery has reached critical status. You should plug in or "
"shutdown your computer now to avoid possible data loss."
@@ -51,7 +51,7 @@
"VAROVÁNÍ: Baterie dosáhla kritického stavu. Měli byste připojit počítač do "
"elektrické sítě nebo jej vypnout, abyste předešli možné ztrátě dat."
-#: ../panel-plugin/battmon.c:493
+#: ../panel-plugin/battery.c:494
msgid ""
"WARNING: Your battery is running low. You should consider plugging in or "
"shutting down your computer soon to avoid possible data loss."
@@ -60,84 +60,84 @@
"počítače do elektrické sítě nebo jej v dohledné době vypnout, abyste "
"předešli ztrátě dat."
-#: ../panel-plugin/battmon.c:581
+#: ../panel-plugin/battery.c:582
msgid "Battery"
msgstr "Baterie"
-#: ../panel-plugin/battmon.c:981
+#: ../panel-plugin/battery.c:982
msgid "Select file"
msgstr "Vyberte soubor"
-#: ../panel-plugin/battmon.c:1022
+#: ../panel-plugin/battery.c:1023
msgid "Select command"
msgstr "Vyberte příkaz"
-#: ../panel-plugin/battmon.c:1052 ../panel-plugin/battmon.desktop.in.in.h:1
+#: ../panel-plugin/battery.c:1053 ../panel-plugin/battmon.desktop.in.in.h:1
msgid "Battery Monitor"
msgstr "Sledování baterie"
-#: ../panel-plugin/battmon.c:1080
+#: ../panel-plugin/battery.c:1081
msgid "Low percentage:"
msgstr "Nízký stav:"
-#: ../panel-plugin/battmon.c:1091
+#: ../panel-plugin/battery.c:1092
msgid "Critical percentage:"
msgstr "Kritický stav:"
-#: ../panel-plugin/battmon.c:1104
+#: ../panel-plugin/battery.c:1105
msgid "Low battery action:"
msgstr "Akce při nízkém stavu:"
-#: ../panel-plugin/battmon.c:1110 ../panel-plugin/battmon.c:1150
+#: ../panel-plugin/battery.c:1111 ../panel-plugin/battery.c:1151
msgid "Do nothing"
msgstr "Žádná akce"
-#: ../panel-plugin/battmon.c:1112 ../panel-plugin/battmon.c:1152
+#: ../panel-plugin/battery.c:1113 ../panel-plugin/battery.c:1153
msgid "Display a warning message"
msgstr "Zobrazit varování"
-#: ../panel-plugin/battmon.c:1114 ../panel-plugin/battmon.c:1154
+#: ../panel-plugin/battery.c:1115 ../panel-plugin/battery.c:1155
msgid "Run command"
msgstr "Spustit příkaz"
-#: ../panel-plugin/battmon.c:1116 ../panel-plugin/battmon.c:1156
+#: ../panel-plugin/battery.c:1117 ../panel-plugin/battery.c:1157
msgid "Run command in terminal"
msgstr "Spustit příkaz v terminálu"
-#: ../panel-plugin/battmon.c:1128 ../panel-plugin/battmon.c:1168
+#: ../panel-plugin/battery.c:1129 ../panel-plugin/battery.c:1169
msgid "Command:"
msgstr "Příkaz:"
-#: ../panel-plugin/battmon.c:1144
+#: ../panel-plugin/battery.c:1145
msgid "Critical battery action:"
msgstr "Akce při kritickém stavu:"
-#: ../panel-plugin/battmon.c:1191
+#: ../panel-plugin/battery.c:1192
msgid "Display label"
msgstr "Zobrazit popisek"
-#: ../panel-plugin/battmon.c:1194
+#: ../panel-plugin/battery.c:1195
msgid "Display percentage"
msgstr "Zobrazit údaj v procentech"
-#: ../panel-plugin/battmon.c:1197
+#: ../panel-plugin/battery.c:1198
#, fuzzy
msgid "Display time"
msgstr "Zobrazit ikonu"
-#: ../panel-plugin/battmon.c:1200
+#: ../panel-plugin/battery.c:1201
msgid "Display percentage in tooltip"
msgstr "Zobrazit údaj v procentech jako tip"
-#: ../panel-plugin/battmon.c:1203
+#: ../panel-plugin/battery.c:1204
msgid "Display time remaining in tooltip"
msgstr "Zobrazit zbývající čas jako tip"
-#: ../panel-plugin/battmon.c:1206
+#: ../panel-plugin/battery.c:1207
msgid "Display power"
msgstr "Zobrazit úroveň nabití"
-#: ../panel-plugin/battmon.c:1209
+#: ../panel-plugin/battery.c:1210
msgid "Display icon"
msgstr "Zobrazit ikonu"
Modified: xfce4-battery-plugin/trunk/po/xfce4-battery-plugin.pot
===================================================================
--- xfce4-battery-plugin/trunk/po/xfce4-battery-plugin.pot 2006-09-06 08:58:22 UTC (rev 1973)
+++ xfce4-battery-plugin/trunk/po/xfce4-battery-plugin.pot 2006-09-06 09:50:27 UTC (rev 1974)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-01 12:16+0200\n"
+"POT-Creation-Date: 2006-09-06 11:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,122 +16,122 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/battmon.c:401
+#: ../panel-plugin/battery.c:401
msgid "(Charging from AC)"
msgstr ""
-#: ../panel-plugin/battmon.c:401
+#: ../panel-plugin/battery.c:401
msgid "(AC on-line)"
msgstr ""
-#: ../panel-plugin/battmon.c:410
+#: ../panel-plugin/battery.c:410
#, c-format
msgid "%d%% (%02d:%02d) remaining"
msgstr ""
-#: ../panel-plugin/battmon.c:412
+#: ../panel-plugin/battery.c:412
#, c-format
msgid "%02d:%02d remaining"
msgstr ""
-#: ../panel-plugin/battmon.c:414
+#: ../panel-plugin/battery.c:414
#, c-format
msgid "%d%% remaining"
msgstr ""
-#: ../panel-plugin/battmon.c:416
+#: ../panel-plugin/battery.c:416
msgid "AC off-line"
msgstr ""
-#: ../panel-plugin/battmon.c:479
+#: ../panel-plugin/battery.c:480
msgid ""
"WARNING: Your battery has reached critical status. You should plug in or "
"shutdown your computer now to avoid possible data loss."
msgstr ""
-#: ../panel-plugin/battmon.c:493
+#: ../panel-plugin/battery.c:494
msgid ""
"WARNING: Your battery is running low. You should consider plugging in or "
"shutting down your computer soon to avoid possible data loss."
msgstr ""
-#: ../panel-plugin/battmon.c:581
+#: ../panel-plugin/battery.c:582
msgid "Battery"
msgstr ""
-#: ../panel-plugin/battmon.c:981
+#: ../panel-plugin/battery.c:982
msgid "Select file"
msgstr ""
-#: ../panel-plugin/battmon.c:1022
+#: ../panel-plugin/battery.c:1023
msgid "Select command"
msgstr ""
-#: ../panel-plugin/battmon.c:1052 ../panel-plugin/battmon.desktop.in.in.h:1
+#: ../panel-plugin/battery.c:1053 ../panel-plugin/battmon.desktop.in.in.h:1
msgid "Battery Monitor"
msgstr ""
-#: ../panel-plugin/battmon.c:1080
+#: ../panel-plugin/battery.c:1081
msgid "Low percentage:"
msgstr ""
-#: ../panel-plugin/battmon.c:1091
+#: ../panel-plugin/battery.c:1092
msgid "Critical percentage:"
msgstr ""
-#: ../panel-plugin/battmon.c:1104
+#: ../panel-plugin/battery.c:1105
msgid "Low battery action:"
msgstr ""
-#: ../panel-plugin/battmon.c:1110 ../panel-plugin/battmon.c:1150
+#: ../panel-plugin/battery.c:1111 ../panel-plugin/battery.c:1151
msgid "Do nothing"
msgstr ""
-#: ../panel-plugin/battmon.c:1112 ../panel-plugin/battmon.c:1152
+#: ../panel-plugin/battery.c:1113 ../panel-plugin/battery.c:1153
msgid "Display a warning message"
msgstr ""
-#: ../panel-plugin/battmon.c:1114 ../panel-plugin/battmon.c:1154
+#: ../panel-plugin/battery.c:1115 ../panel-plugin/battery.c:1155
msgid "Run command"
msgstr ""
-#: ../panel-plugin/battmon.c:1116 ../panel-plugin/battmon.c:1156
+#: ../panel-plugin/battery.c:1117 ../panel-plugin/battery.c:1157
msgid "Run command in terminal"
msgstr ""
-#: ../panel-plugin/battmon.c:1128 ../panel-plugin/battmon.c:1168
+#: ../panel-plugin/battery.c:1129 ../panel-plugin/battery.c:1169
msgid "Command:"
msgstr ""
-#: ../panel-plugin/battmon.c:1144
+#: ../panel-plugin/battery.c:1145
msgid "Critical battery action:"
msgstr ""
-#: ../panel-plugin/battmon.c:1191
+#: ../panel-plugin/battery.c:1192
msgid "Display label"
msgstr ""
-#: ../panel-plugin/battmon.c:1194
+#: ../panel-plugin/battery.c:1195
msgid "Display percentage"
msgstr ""
-#: ../panel-plugin/battmon.c:1197
+#: ../panel-plugin/battery.c:1198
msgid "Display time"
msgstr ""
-#: ../panel-plugin/battmon.c:1200
+#: ../panel-plugin/battery.c:1201
msgid "Display percentage in tooltip"
msgstr ""
-#: ../panel-plugin/battmon.c:1203
+#: ../panel-plugin/battery.c:1204
msgid "Display time remaining in tooltip"
msgstr ""
-#: ../panel-plugin/battmon.c:1206
+#: ../panel-plugin/battery.c:1207
msgid "Display power"
msgstr ""
-#: ../panel-plugin/battmon.c:1209
+#: ../panel-plugin/battery.c:1210
msgid "Display icon"
msgstr ""
More information about the Goodies-commits
mailing list