[Xfce4-commits] r25077 - in xfce4-panel/trunk: . config icons icons/16x16 icons/48x48 libxfce4panel mcs-plugin panel plugins plugins/actions plugins/clock plugins/iconbox plugins/launcher plugins/pager plugins/separator plugins/showdesktop plugins/systray plugins/tasklist plugins/windowlist
Nick Schermer
nick at xfce.org
Sat Mar 3 20:26:07 CET 2007
Author: nick
Date: 2007-03-03 19:26:06 +0000 (Sat, 03 Mar 2007)
New Revision: 25077
Added:
xfce4-panel/trunk/COPYING.LIB
xfce4-panel/trunk/TODO
xfce4-panel/trunk/configure.in.in
xfce4-panel/trunk/icons/16x16/
xfce4-panel/trunk/icons/16x16/Makefile.am
xfce4-panel/trunk/icons/16x16/xfce-system-exit.png
xfce4-panel/trunk/icons/16x16/xfce-system-info.png
xfce4-panel/trunk/icons/16x16/xfce-system-lock.png
xfce4-panel/trunk/icons/16x16/xfce-system-settings.png
xfce4-panel/trunk/icons/48x48/
xfce4-panel/trunk/icons/48x48/Makefile.am
xfce4-panel/trunk/icons/48x48/xfce-mouse.png
xfce4-panel/trunk/icons/48x48/xfce4-iconbox.png
xfce4-panel/trunk/icons/48x48/xfce4-panel.png
xfce4-panel/trunk/icons/48x48/xfce4-taskbar.png
xfce4-panel/trunk/plugins/launcher/launcher-exec.c
xfce4-panel/trunk/plugins/launcher/launcher-exec.h
xfce4-panel/trunk/plugins/tasklist/tasklist-dialogs.c
xfce4-panel/trunk/plugins/tasklist/tasklist-dialogs.h
xfce4-panel/trunk/plugins/tasklist/tasklist.h
Removed:
xfce4-panel/trunk/COPYING_LIBS
xfce4-panel/trunk/README.Kiosk
xfce4-panel/trunk/README.Plugins
xfce4-panel/trunk/configure.ac.in
xfce4-panel/trunk/icons/xfce-mail.png
xfce4-panel/trunk/icons/xfce-mouse.png
xfce4-panel/trunk/icons/xfce-system-exit.png
xfce4-panel/trunk/icons/xfce-system-info.png
xfce4-panel/trunk/icons/xfce-system-lock.png
xfce4-panel/trunk/icons/xfce-system-settings.png
xfce4-panel/trunk/icons/xfce4-iconbox.png
xfce4-panel/trunk/icons/xfce4-panel.png
xfce4-panel/trunk/icons/xfce4-taskbar.png
Modified:
xfce4-panel/trunk/AUTHORS
xfce4-panel/trunk/COPYING
xfce4-panel/trunk/ChangeLog
xfce4-panel/trunk/HACKING
xfce4-panel/trunk/Makefile.am
xfce4-panel/trunk/NEWS
xfce4-panel/trunk/README
xfce4-panel/trunk/autogen.sh
xfce4-panel/trunk/config/Makefile.am
xfce4-panel/trunk/config/launcher-10.rc.in
xfce4-panel/trunk/config/launcher-7.rc.in
xfce4-panel/trunk/config/launcher-8.rc.in
xfce4-panel/trunk/config/launcher-9.rc.in
xfce4-panel/trunk/icons/Makefile.am
xfce4-panel/trunk/libxfce4panel/Makefile.am
xfce4-panel/trunk/libxfce4panel/libxfce4panel-1.0.pc.in
xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c
xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.h
xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c
xfce4-panel/trunk/libxfce4panel/xfce-hvbox.h
xfce4-panel/trunk/libxfce4panel/xfce-itembar.c
xfce4-panel/trunk/libxfce4panel/xfce-itembar.h
xfce4-panel/trunk/libxfce4panel/xfce-marshal.list
xfce4-panel/trunk/libxfce4panel/xfce-panel-convenience.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-convenience.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-enums.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-external-item.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-external-item.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-external-plugin.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-external-plugin.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-internal-plugin.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-internal-plugin.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-item-iface.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-item-iface.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface-private.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-messages.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-messages.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-window.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-window.h
xfce4-panel/trunk/mcs-plugin/Makefile.am
xfce4-panel/trunk/mcs-plugin/plugin.c
xfce4-panel/trunk/panel/Makefile.am
xfce4-panel/trunk/panel/main.c
xfce4-panel/trunk/plugins/Makefile.am
xfce4-panel/trunk/plugins/actions/Makefile.am
xfce4-panel/trunk/plugins/actions/actions.c
xfce4-panel/trunk/plugins/actions/actions.desktop.in.in
xfce4-panel/trunk/plugins/clock/Makefile.am
xfce4-panel/trunk/plugins/clock/clock.c
xfce4-panel/trunk/plugins/clock/clock.desktop.in.in
xfce4-panel/trunk/plugins/iconbox/Makefile.am
xfce4-panel/trunk/plugins/iconbox/iconbox.c
xfce4-panel/trunk/plugins/iconbox/iconbox.desktop.in.in
xfce4-panel/trunk/plugins/launcher/Makefile.am
xfce4-panel/trunk/plugins/launcher/launcher-dialog.c
xfce4-panel/trunk/plugins/launcher/launcher-dialog.h
xfce4-panel/trunk/plugins/launcher/launcher.c
xfce4-panel/trunk/plugins/launcher/launcher.desktop.in.in
xfce4-panel/trunk/plugins/launcher/launcher.h
xfce4-panel/trunk/plugins/pager/Makefile.am
xfce4-panel/trunk/plugins/pager/pager.c
xfce4-panel/trunk/plugins/pager/pager.desktop.in.in
xfce4-panel/trunk/plugins/separator/Makefile.am
xfce4-panel/trunk/plugins/separator/separator.c
xfce4-panel/trunk/plugins/separator/separator.desktop.in.in
xfce4-panel/trunk/plugins/showdesktop/Makefile.am
xfce4-panel/trunk/plugins/showdesktop/showdesktop.c
xfce4-panel/trunk/plugins/showdesktop/showdesktop.desktop.in.in
xfce4-panel/trunk/plugins/systray/Makefile.am
xfce4-panel/trunk/plugins/systray/systray.c
xfce4-panel/trunk/plugins/systray/systray.desktop.in.in
xfce4-panel/trunk/plugins/tasklist/Makefile.am
xfce4-panel/trunk/plugins/tasklist/tasklist.c
xfce4-panel/trunk/plugins/tasklist/tasklist.desktop.in.in
xfce4-panel/trunk/plugins/windowlist/Makefile.am
xfce4-panel/trunk/plugins/windowlist/windowlist-dialog.c
xfce4-panel/trunk/plugins/windowlist/windowlist.c
xfce4-panel/trunk/plugins/windowlist/windowlist.desktop.in.in
xfce4-panel/trunk/plugins/windowlist/windowlist.h
xfce4-panel/trunk/xfce4-panel.spec.in
Log:
* Import my 4_5_nick branch into trunk:
- Completely rewritten launcher (Bugs 2336, 2365, 1323, 2262 and 1225)
- Various improvements in libxfce4panel (memory leaks, G_GNUC_INTERNAL,
GSList, canonical strings and fixed pedantic warnings).
- Libxfce4panel does no longer depend on libxfcegui4. This might cause
some problems with plugins. Plugin developers should add libxfcegui4
to the dependencies of their package (including cflags and libadd in
the makefiles).
Modified: xfce4-panel/trunk/AUTHORS
===================================================================
--- xfce4-panel/trunk/AUTHORS 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/AUTHORS 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,7 +1,7 @@
Maintainers
===========
-Jasper Huijsmans <jasper at xfce.org>
-Nick Schermer <nick at xfce.org>
+Jasper Huijsmans <jasper at xfce.org>
+Nick Schermer <nick at xfce.org>
Contributors
============
Modified: xfce4-panel/trunk/COPYING
===================================================================
--- xfce4-panel/trunk/COPYING 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/COPYING 2007-03-03 19:26:06 UTC (rev 25077)
@@ -55,7 +55,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@
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
@@ -168,7 +168,7 @@
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
@@ -225,7 +225,7 @@
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
@@ -278,7 +278,7 @@
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
Added: xfce4-panel/trunk/COPYING.LIB
===================================================================
--- xfce4-panel/trunk/COPYING.LIB (rev 0)
+++ xfce4-panel/trunk/COPYING.LIB 2007-03-03 19:26:06 UTC (rev 25077)
@@ -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
Deleted: xfce4-panel/trunk/COPYING_LIBS
Modified: xfce4-panel/trunk/ChangeLog
===================================================================
--- xfce4-panel/trunk/ChangeLog 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/ChangeLog 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,3 +1,14 @@
+2007-03-03 21:00 nick
+
+ * Import my 4_5_nick branch into trunk:
+ - Completely rewritten launcher (Bugs 2336, 2365, 1323, 2262 and 1225)
+ - Various improvements in libxfce4panel (memory leaks, G_GNUC_INTERNAL,
+ GSList, canonical strings and fixed pedantic warnings).
+ - Libxfce4panel does no longer depend on libxfcegui4. This might cause
+ some problems with plugins. Plugin developers should add libxfcegui4
+ to the dependencies of their package (including cflags and libadd in
+ the makefiles).
+
2007-01-19 19:59 nick
* NEWS: Update NEWS
Modified: xfce4-panel/trunk/HACKING
===================================================================
--- xfce4-panel/trunk/HACKING 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/HACKING 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,58 +1,85 @@
-This file describes the coding style I prefer for the panel. If you want to
-help out with panel development, please try to conform to these 'rules'.
--- Jasper
+Bug tracking system
+===================
-* 2006-12-26
+To report bugs or file feature requests for xfce4-panel, please
+use the Xfce bugzilla at http://bugzilla.xfce.org/. The product
+is Xfce, component xfce4-panel.
+Before reporting the bug, please search the bug tracker, to make
+sure it wasn't reported already before.
-Nick prefers to align variable declarations, so here is an updated set of rules:
-- Coding style:
- o Indentation is 4 spaces. Expand tabs, i.e. only use spaces for indentation.
- o Braces are on a new line. For one-line if statements braces may be omitted.
- o Return type of function definitions on a separate line.
- o Function arguments on separate lines with the same alignment rules as
- variable declarations.
- o Variable declarations are aligned on the variable name. Short variable
- declarations may be combined. Example:
+Patches
+=======
- static gboolean
- example_function (GtkWidget *widget,
- Panel *panel,
- int value)
- {
- XfceHandleType type;
- const char *string;
- int important_value;
- int i, n, x, y;
- /* ... */
- }
+Please submit patches to the Xfce bug tracking system or use the
+xfce4-dev mailinglists.
- o In header files and for static prototypes, you may align functions names as
- well as arguments. No need to limit the line length. Example:
+Please send a patch againts a recent version of xfce4-panel. Patches
+against the Subversion trunk branch are most preferable. You can always
+access the trunk branch from
- static gboolean xfce_panel_long_name_for_example_function (GtkWidget *widget,
- Panel *panel,
- int value);
+ http://svn.xfce.org/svn/xfce/xfce4-panel/trunk
- static void example_function_2 (Panel *panel,
- const char *value);
+or using an installed Subversion client
-- ChangeLog: I use the svn2cl package to create the changelog from the SVN log
- messages.
- o Website: http://ch.tudelft.nl/~arthur/svn2cl/ .
- o Current version: 0.8.
- o Command line: svn2cl.sh --linelen=74 --break-before-msg .
- Note: I don't care about linelen, but with this parameter the changes with
- previous ChangeLog were smallest.
+ svn co http://svn.xfce.org/svn/xfce/xfce4-panel/trunk xfce4-panel
-- Patches: use 'svn diff' to create patches if possible, or 'diff -u'.
+Coding Style
+============
+
+ - Always expand tabs, so the code is not dependent from a gives tab
+ setting.
+ - Braces are on a new line. For one-line if statements braces may be omitted.
+ - Return type of function definitions on a separate line.
+ - Function arguments on separate lines with the same alignment rules as
+ variable declarations.
+ - Use 3 empty lines between functions.
+ - Variable declarations are aligned on the variable name. Short variable
+ declarations may be combined. Example:
+
+ static gboolean
+ example_function (GtkWidget *widget,
+ Panel *panel,
+ gint value)
+ {
+ XfceHandleType type;
+ const gchar *string;
+ gint important_value;
+ gint i, n, x, y;
+ /* ... */
+ }
+
+ - In header files and for static prototypes, you may align functions names as
+ well as arguments. No need to limit the line length. Example:
+
+ static gboolean xfce_panel_long_name_for_example_function (GtkWidget *widget,
+ Panel *panel,
+ gint value);
+ static void example_function_2 (Panel *panel,
+ const gchar *value);
+ - Write ChangeLog entries.
+
+
+ChangeLogs
+==========
+
+I use the svn2cl package to create the changelog from the SVN log messages.
+
+ - Website: http://ch.tudelft.nl/~arthur/svn2cl/ .
+ - Current version: 0.8.
+ - Command line: svn2cl.sh --linelen=74 --break-before-msg.
+
+Note: I don't care about linelen, but with this parameter the changes with
+ previous ChangeLog were smallest.
+
+
+Misc
+====
- If you have SVN access it is ok to commit trivial changes directly, but
please send a patch to the mailing list for discussion for any non-trivial
or non-obvious changes.
-
- As an exception to the rule above, if you are managing an Xfce release, feel
free to do anything you need to achieve that goal.
-
- Managing the po/ directory, including the ChangeLog found there is left
completely in the hands of the Xfce Translation Team.
Modified: xfce4-panel/trunk/Makefile.am
===================================================================
--- xfce4-panel/trunk/Makefile.am 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/Makefile.am 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,30 +1,5 @@
# $Id$
-EXTRA_DIST = \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- AUTHORS \
- COPYING \
- COPYING_LIBS \
- ChangeLog \
- HACKING \
- INSTALL \
- NEWS \
- README \
- README.Kiosk \
- README.Plugins \
- .indent.pro \
- xfce4-panel.spec
-
-DISTCLEANFILES = \
- configure.ac \
- intltool-extract \
- intltool-merge \
- intltool-update
-
-# docs should be at the end to make sure the library is build before
-# scanning it.
SUBDIRS = \
config \
icons \
@@ -35,12 +10,8 @@
po \
docs
-AUTOMAKE_OPTIONS = \
- 1.8 \
- dist-bzip2
-
distclean-local:
- rm -rf *.cache *~
+ rm -rf *.spec *.cache *~
rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@@ -49,6 +20,24 @@
html:
make -C docs html
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+EXTRA_DIST = \
+ README \
+ COPYING \
+ COPYING.LIB \
+ HACKING \
+ INSTALL \
+ xfce4-panel.spec.in \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in
+DISTCLEANFILES = \
+ xfce4-panel.spec \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
+
+DISTCHECK_CONFIGURE_FLAGS = \
+ --enable-gtk-doc
+
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Modified: xfce4-panel/trunk/NEWS
===================================================================
--- xfce4-panel/trunk/NEWS 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/NEWS 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,44 +1,51 @@
-NEWS for xfce4-panel
-====================
-
-4.4.0
+4.5.x
=====
-- Many fixes when using the panel in a multiscreen setup (Jasper, Nick)
-- Update or add blinking for urgent windows in taslist, windowlist and iconbox.
- (Jasper)
-- Move test plugin to Xfce Goodies. (Nick)
-- Several fixes for (re)sizing and positioning behavior. (Jasper)
-- Lots of small fixes and polish. (Jasper, Nick, Olivier, Benedikt)
-- Update manual. (Jasper)
-- Many translation updates. (Xfce Translation Team)
+- Completely rewritten launcher (Bugs 2336, 2365, 1323, 2262 and 1225)
+- Various improvements in libxfce4panel (memory leaks, G_GNUC_INTERNAL,
+ GSList, canonical strings and fixed pedantic warnings).
+- Libxfce4panel does no longer depend on libxfcegui4. This might cause
+ some problems with plugins. Plugin developers should add libxfcegui4
+ to the dependencies of their package (including cflags and libadd in
+ the makefiles).
-4.3.99.2 (4.4-RC2)
-==================
-- Adjust the plugin system to improve support for other platforms
- (read: windows). (Jasper, Olivier)
-- Many small fixes. (Jasper, Nick, Olivier, Jean-Francois)
-- Translation updates. (Xfce Translation Team)
-
-
-4.3.99.1 (4.4-RC1)
-==================
-- Add helper utility to open windowlist, useful for keyboard shortcuts.
- Patch by Darren Salt. (Jasper)
-- Create dummy scripts for obsolete xftaskbar4 and xfce4-iconbox.
-- Change unix signal handling to use a pipe with an io watch, instead
- of a timeout. (Jasper)
-- Add search box to new item dialog. Patch by Benedikt. (Jasper)
-- Fixes and improvements to memory management, and timeout handling.
- (Nick, Jasper)
-- Translation updates. (Xfce Translation Team)
-
-
-4.3.x (changes from 4.2.x)
-==========================
-- Major rewrite of the panel
-- New plugin API supporting out-of-process plugins
-- Support for multiple panels
+4.3.99.3 (4.4-RC3)
+==================
+- Update or add blinking for urgent windows in taslist, windowlist and iconbox.
+ (Jasper)
+- Move test plugin to Xfce Goodies. (Nick)
+- Several fixes for (re)sizing and positioning behavior. (Jasper)
+- Lots of small fixes and polish. (Jasper, Nick, Olivier, Benedikt)
+- Update manual. (Jasper)
+- Many translation updates. (Xfce Translation Team)
+
+
+4.3.99.2 (4.4-RC2)
+==================
+- Adjust the plugin system to improve support for other platforms
+ (read: windows). (Jasper, Olivier)
+- Many small fixes. (Jasper, Nick, Olivier, Jean-Francois)
+- Translation updates. (Xfce Translation Team)
+
+
+4.3.99.1 (4.4-RC1)
+==================
+- Add helper utility to open windowlist, useful for keyboard shortcuts.
+ Patch by Darren Salt. (Jasper)
+- Create dummy scripts for obsolete xftaskbar4 and xfce4-iconbox.
+- Change unix signal handling to use a pipe with an io watch, instead
+ of a timeout. (Jasper)
+- Add search box to new item dialog. Patch by Benedikt. (Jasper)
+- Fixes and improvements to memory management, and timeout handling.
+ (Nick, Jasper)
+- Translation updates. (Xfce Translation Team)
+
+
+4.3.x (changes from 4.2.x)
+==========================
+- Major rewrite of the panel
+- New plugin API supporting out-of-process plugins
+- Support for multiple panels
- Xinerama and multi-head support
Modified: xfce4-panel/trunk/README
===================================================================
--- xfce4-panel/trunk/README 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/README 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,11 +1,9 @@
-README for xfce version 4.4.x
-=============================
+What is it?
+===========
-WHAT IS IT ?
-------------
'xfce4-panel' is the panel of the Xfce Desktop Environment. It is no longer
modeled after the CDE panel like the first versions of xfce.
-This version is based on GTK2 and should have all the advantages that come
+This version is based on GTK+ and should have all the advantages that come
with this toolkit (see http://www.gtk.org).
The panel provides program lauchers with, optionally, non-hierarchical menus
@@ -13,3 +11,49 @@
pager. Additional plugins may be installed separately.
+Installation
+============
+
+The file 'INSTALL' contains generic installation instructions.
+
+
+Plugins
+=======
+
+Starting from version 4.4, the Xfce Panel support two types of plugins:
+ * Internal plugins. These are loadable modules, using the gmodule interface.
+ * External plugins. These are separate programs that are embedded into the
+ panel using the GtkPlug/GtkSocket mechanism.
+
+For more information about the panel plugins framework, you can read the API
+documentation (http://www.xfce.org/documentation/4.4/api/libxfce4panel/) or
+the panel plugins how to (http://wiki.xfce.org/panel_plugins_howto).
+
+
+KIOSK mode
+==========
+
+The Xfce Panel supports the KIOSK mode introduced with libxfce4util 4.1.13.
+It provides the following KIOSK capabilities:
+
+CustomizePanel: Only users with this capability will be allowed to customize
+their panel (add panel plugins, configure panel plugins, add launchers, etc.).
+This is similar to setting the environment va- riable XFCE_DISABLE_USER_CONFIG
+with the old panel.
+
+So a sample xfce4-panel section in your kioskrc might look like this:
+
+<-- start snip -->
+[xfce4-panel]
+CustomizePanel=%powerusers,foo
+<-- end snip -->
+
+This allows only users in the group powerusers and the user foo to customize
+their panels.
+
+
+How to report bugs?
+===================
+
+Bugs should be reported to the Xfce bug tracking system:
+(http://bugzilla.xfce.org, product Xfce, component xfce4-panel).
Deleted: xfce4-panel/trunk/README.Kiosk
Deleted: xfce4-panel/trunk/README.Plugins
Added: xfce4-panel/trunk/TODO
===================================================================
--- xfce4-panel/trunk/TODO (rev 0)
+++ xfce4-panel/trunk/TODO 2007-03-03 19:26:06 UTC (rev 25077)
@@ -0,0 +1,46 @@
+General
+=======
+* Improve the code layout, so it is consistent and easy to read. We should also
+ add more comments inside functions. (Nick & Jasper)
+
+Launcher
+========
+* Finish the orientation code. I have no idea what to do here, because we
+ have no solution for the customizable arrow direction yet. (Nick)
+* We also need a good way to popup the launcher menu when we drag over the
+ button. (Nick)
+
+
+Panel
+=====
+* Re-evaluate interfaces. Make sure not too much implementation detail is
+ visible between separate parts of the panel.
+
+
+Libxfce4panel
+=============
+* In xfce-panel-plugin-iface we use g_object_{get,set} all over the place,
+ this should be changed to reduce the number of relocations.
+* Create some macros for common used code in plugins. This should make writing
+ consistent plugins easier.
+
+
+Tasklist
+========
+* We're going to rewrite the tasklist, see bug #2680 for more information. (Nick)
+
+
+--- End of sane plans ---
+
+Blue Sky
+========
+
+* Transparency. The way cairo is integrated into gtk means we will need to
+ write our own widgets for panel plugins, because every widget with a window
+ needs to handle this separately :( See
+ http://www.loculus.nl/xfce/files/panel-cairo-20070125.patch for a quick
+ hack.
+ It would be much nicer if transparency were a style property, configurable
+ by a gtkrc file, but I don't think that will happen any time soon...
+
+
Modified: xfce4-panel/trunk/autogen.sh
===================================================================
--- xfce4-panel/trunk/autogen.sh 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/autogen.sh 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: autogen.sh 4312 2005-01-27 10:10:04Z jasper $
+# $Id: autogen.sh 25025 2007-02-24 09:54:07Z jasper $
#
# Copyright (c) 2002-2005
# The Xfce development team. All rights reserved.
@@ -32,13 +32,13 @@
revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
- < "configure.ac.in" > "configure.ac"
+ < "configure.in.in" > "configure.in"
xdt-autogen $@
# xdt-autogen clean does not remove all generated files
(test x"clean" = x"$1") && {
- rm -f configure.ac
+ rm -f configure.in
rm -f INSTALL
} || true
# vi:set ts=2 sw=2 et ai:
Modified: xfce4-panel/trunk/config/Makefile.am
===================================================================
--- xfce4-panel/trunk/config/Makefile.am 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/config/Makefile.am 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,3 +1,8 @@
+# $Id$
+
+confdir = \
+ $(sysconfdir)/xdg/xfce4/panel
+
conf_in_files = \
launcher-7.rc.in \
launcher-8.rc.in \
@@ -4,15 +9,27 @@
launcher-9.rc.in \
launcher-10.rc.in
-conf_files = $(conf_in_files:.rc.in=.rc)
+conf_files = \
+ $(conf_in_files:.rc.in=.rc)
-confdir = $(sysconfdir)/xdg/xfce4/panel
-conf_DATA = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_files)
+conf_DATA = \
+ panels.xml \
+ systray-4.rc \
+ xfce4-menu-5.rc \
+ clock-14.rc \
+ $(conf_files)
# copied from INTLTOOL_DESKTOP_RULE
%.rc: %.rc.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-EXTRA_DIST = panels.xml systray-4.rc xfce4-menu-5.rc clock-14.rc $(conf_in_files)
+EXTRA_DIST = \
+ panels.xml \
+ systray-4.rc \
+ xfce4-menu-5.rc \
+ clock-14.rc \
+ $(conf_in_files)
-distclean-local:
+distclean-local:
rm -f $(conf_files)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-panel/trunk/config/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-panel/trunk/config/launcher-10.rc.in
===================================================================
--- xfce4-panel/trunk/config/launcher-10.rc.in 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/config/launcher-10.rc.in 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,8 +1,11 @@
+[Global]
+MoveFirst=false
+
[Entry 0]
_Name=Web Browser
+_Comment=Surf the internet
+Icon=internet-web-browser
Exec=exo-open --launch WebBrowser
Terminal=false
StartupNotify=false
-_Comment=Surf the internet
-X-XFCE-IconCategory=7
Modified: xfce4-panel/trunk/config/launcher-7.rc.in
===================================================================
--- xfce4-panel/trunk/config/launcher-7.rc.in 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/config/launcher-7.rc.in 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,8 +1,10 @@
+[Global]
+MoveFirst=false
+
[Entry 0]
_Name=Command Prompt
+_Comment=X terminal emulator
+Icon=utilities-terminal
Exec=Terminal
Terminal=false
StartupNotify=true
-_Comment=X terminal emulator
-X-XFCE-IconCategory=13
-
Modified: xfce4-panel/trunk/config/launcher-8.rc.in
===================================================================
--- xfce4-panel/trunk/config/launcher-8.rc.in 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/config/launcher-8.rc.in 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,8 +1,11 @@
+[Global]
+MoveFirst=false
+
[Entry 0]
_Name=Editor
+_Comment=Edit text files
+Icon=accessories-text-editor
Exec=mousepad
Terminal=false
StartupNotify=true
-_Comment=Edit text files
-X-XFCE-IconCategory=1
Modified: xfce4-panel/trunk/config/launcher-9.rc.in
===================================================================
--- xfce4-panel/trunk/config/launcher-9.rc.in 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/config/launcher-9.rc.in 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,8 +1,11 @@
+[Global]
+MoveFirst=false
+
[Entry 0]
_Name=File Manager
+_Comment=Manage files and folders
+Icon=Thunar
Exec=thunar
Terminal=false
StartupNotify=true
-_Comment=Manage files and folders
-X-XFCE-IconCategory=2
Deleted: xfce4-panel/trunk/configure.ac.in
Added: xfce4-panel/trunk/configure.in.in
===================================================================
--- xfce4-panel/trunk/configure.in.in (rev 0)
+++ xfce4-panel/trunk/configure.in.in 2007-03-03 19:26:06 UTC (rev 25077)
@@ -0,0 +1,205 @@
+dnl $Id$
+dnl
+dnl Copyright (c) 2004-2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl 2005-2007 Jasper Huijsmans <jasper at xfce.org>
+dnl 2006-2007 Nick Schermer <nick at xfce.org>
+dnl
+
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([libxfce4panel_verinfo], [2:2:1])
+m4_define([xfce4_panel_version_major], [4])
+m4_define([xfce4_panel_version_minor], [5])
+m4_define([xfce4_panel_version_micro], [0])
+m4_define([xfce4_panel_version_nano], [2]) dnl leave this empty to have no nano version
+m4_define([xfce4_panel_version_build], [r at REVISION@])
+m4_define([xfce4_panel_version_tag], [svn])
+m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [svn], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
+
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2002-2007
+ The Xfce development team. All rights reserved.
+
+Written for Xfce by Jasper Huijsmans <jasper at xfce.org>.])
+AC_INIT([xfce4-panel], [xfce4_panel_version()], [http://bugzilla.xfce.org/], [xfce4-panel])
+AC_PREREQ([2.50])
+AC_REVISION([$Id$])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_MAINTAINER_MODE()
+
+dnl *******************************
+dnl *** Check for UNIX variants ***
+dnl *******************************
+AC_AIX()
+AC_ISC_POSIX()
+AC_MINIX()
+AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
+
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_INSTALL()
+AC_PROG_LN_S()
+AC_PROG_INTLTOOL([0.31], [no-xml])
+
+dnl **************************
+dnl *** Initialize libtool ***
+dnl **************************
+AC_DISABLE_STATIC()
+AC_PROG_LIBTOOL()
+
+dnl ****************************
+dnl *** Intltool-update hack ***
+dnl ****************************
+AC_CONFIG_COMMANDS([intltool-update],
+ [(sed -e 's/^\("desktop.*".*\)/\1\n"rc(?:\\\\.in)+|"\./' intltool-update > intltool-update-tmp &&
+ mv intltool-update-tmp intltool-update && chmod 755 intltool-update)])
+
+dnl **************************************
+dnl *** Substitute version information ***
+dnl **************************************
+LIBXFCE4PANEL_VERINFO=libxfce4panel_verinfo()
+AC_SUBST([LIBXFCE4PANEL_VERINFO])
+
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
+AC_CHECK_HEADERS([stdlib.h unistd.h locale.h stdio.h fcntl.h errno.h \
+ math.h signal.h stddef.h sys/wait.h sys/stat.h \
+ sys/type.h sys/mman.h time.h string.h])
+
+dnl ************************************
+dnl *** Check for standard functions ***
+dnl ************************************
+AC_FUNC_MMAP()
+AC_CHECK_FUNCS([sigaction])
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
+dnl *******************************
+dnl *** Check for X11 installed ***
+dnl *******************************
+XDT_CHECK_LIBX11_REQUIRE()
+XDT_CHECK_LIBSM()
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.4])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.11])
+
+dnl ***********************************
+dnl *** Check for optional packages ***
+dnl ***********************************
+XDT_CHECK_OPTIONAL_PACKAGE([XFCE_MCS_MANAGER],
+ [xfce-mcs-manager],
+ [4.4.0], [mcs-plugin],
+ [xfce-mcs-manager], [yes])
+
+XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
+ [libstartup-notification-1.0],
+ [0.5], [startup-notification],
+ [startup notification library], [yes])
+
+dnl *******************************
+dnl *** Check for dummy scripts ***
+dnl *******************************
+AC_ARG_ENABLE([dummy-scripts],
+ AC_HELP_STRING([--enable-dummy-scripts],
+ [Install empty scripts for the deprecated xftaskbar4 and xfce4-iconbox @<:@default=enabled@:>@]),
+ [enable_dummy_scripts=$enableval],
+ [enable_dummy_scripts=yes])
+AM_CONDITIONAL([ENABLE_DUMMY_SCRIPTS], [test x"$enable_dummy_scripts" = x"yes"])
+
+
+dnl *************************
+dnl *** Check for gtk-doc ***
+dnl *************************
+GTK_DOC_CHECK([1.0])
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+XDT_FEATURE_DEBUG()
+
+dnl *********************************
+dnl *** Substitute platform flags ***
+dnl *********************************
+AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
+AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS])
+AC_MSG_CHECKING([PLATFORM_CFLAGS])
+AC_MSG_RESULT([$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_CFLAGS])
+AC_MSG_CHECKING([PLATFORM_LDFLAGS])
+AC_MSG_RESULT([$PLATFORM_LDFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS])
+
+AC_OUTPUT([
+xfce4-panel.spec
+Makefile
+config/Makefile
+icons/Makefile
+icons/16x16/Makefile
+icons/48x48/Makefile
+libxfce4panel/Makefile
+libxfce4panel/libxfce4panel-1.0.pc
+panel/Makefile
+plugins/actions/Makefile
+plugins/clock/Makefile
+plugins/iconbox/Makefile
+plugins/launcher/Makefile
+plugins/Makefile
+plugins/pager/Makefile
+plugins/separator/Makefile
+plugins/showdesktop/Makefile
+plugins/systray/Makefile
+plugins/tasklist/Makefile
+plugins/windowlist/Makefile
+mcs-plugin/Makefile
+po/Makefile.in
+docs/Makefile
+docs/API/Makefile
+docs/API/version.xml
+docs/manual/Makefile
+docs/manual/C/Makefile
+docs/manual/C/images/Makefile
+])
+
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+if test x"$LIBSTARTUP_NOTIFICATION_FOUND" = x"yes"; then
+echo "* Startup Notification: yes"
+else
+echo "* Startup Notification: no"
+fi
+if test x"$XFCE_MCS_MANAGER_FOUND" = x"yes"; then
+echo "* Xfce Settings Manager plugin: yes"
+else
+echo "* Xfce Settings Manager plugin: no"
+fi
+echo "* Debugging Support: $enable_debug"
+echo "* Dummy Scripts: $enable_dummy_scripts"
+echo
Property changes on: xfce4-panel/trunk/configure.in.in
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-panel/trunk/icons/16x16/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/16x16/Makefile.am (rev 0)
+++ xfce4-panel/trunk/icons/16x16/Makefile.am 2007-03-03 19:26:06 UTC (rev 25077)
@@ -0,0 +1,15 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+
+icons_DATA = \
+ xfce-system-settings.png \
+ xfce-system-lock.png \
+ xfce-system-info.png \
+ xfce-system-exit.png
+
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-panel/trunk/icons/16x16/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-panel/trunk/icons/16x16/xfce-system-exit.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/16x16/xfce-system-exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/16x16/xfce-system-info.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/16x16/xfce-system-info.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/16x16/xfce-system-lock.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/16x16/xfce-system-lock.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/16x16/xfce-system-settings.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/16x16/xfce-system-settings.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/48x48/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/48x48/Makefile.am (rev 0)
+++ xfce4-panel/trunk/icons/48x48/Makefile.am 2007-03-03 19:26:06 UTC (rev 25077)
@@ -0,0 +1,14 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA = \
+ xfce4-panel.png \
+ xfce4-iconbox.png \
+ xfce4-taskbar.png \
+ xfce-mouse.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-panel/trunk/icons/48x48/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-panel/trunk/icons/48x48/xfce-mouse.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/48x48/xfce-mouse.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/48x48/xfce4-iconbox.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/48x48/xfce4-iconbox.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/48x48/xfce4-panel.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/48x48/xfce4-panel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/48x48/xfce4-taskbar.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/48x48/xfce4-taskbar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: xfce4-panel/trunk/icons/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/Makefile.am 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/icons/Makefile.am 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,24 +1,9 @@
# $Id$
-hicolor48dir = $(datadir)/icons/hicolor/48x48/apps
+SUBDIRS = \
+ 16x16 \
+ 48x48
-hicolor16dir = $(datadir)/icons/hicolor/16x16/apps
-
-hicolor48_DATA = \
- xfce4-panel.png \
- xfce4-iconbox.png \
- xfce4-taskbar.png \
- xfce-mouse.png \
- xfce-mail.png
-
-hicolor16_DATA = \
- xfce-system-exit.png \
- xfce-system-info.png \
- xfce-system-lock.png \
- xfce-system-settings.png
-
-EXTRA_DIST = $(hicolor48_DATA) $(hicolor16_DATA)
-
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook:
@@ -32,4 +17,4 @@
echo "***"; \
fi
-# vi:set ts=8 sw=8 noet ai nocindent:
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Deleted: xfce4-panel/trunk/icons/xfce-mail.png
Deleted: xfce4-panel/trunk/icons/xfce-mouse.png
Deleted: xfce4-panel/trunk/icons/xfce-system-exit.png
Deleted: xfce4-panel/trunk/icons/xfce-system-info.png
Deleted: xfce4-panel/trunk/icons/xfce-system-lock.png
Deleted: xfce4-panel/trunk/icons/xfce-system-settings.png
Deleted: xfce4-panel/trunk/icons/xfce4-iconbox.png
Deleted: xfce4-panel/trunk/icons/xfce4-panel.png
Deleted: xfce4-panel/trunk/icons/xfce4-taskbar.png
Modified: xfce4-panel/trunk/libxfce4panel/Makefile.am
===================================================================
--- xfce4-panel/trunk/libxfce4panel/Makefile.am 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/Makefile.am 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,94 +1,106 @@
-lib_LTLIBRARIES = libxfce4panel.la
+# $Id: Makefile.am 24484 2007-01-15 17:20:39Z nick $
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfce4panel-1.0.pc
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"libxfce4panel\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ $(PLATFORM_CPPFLAGS)
-generated_files = \
- xfce-panel-enum-types.c \
- xfce-panel-enum-types.h \
- xfce-marshal.c \
- xfce-marshal.h
+lib_LTLIBRARIES = \
+ libxfce4panel.la
-libxfce4panel_la_SOURCES = \
- $(generated_files) \
- xfce-panel-window.c \
- xfce-panel-window.h \
- xfce-arrow-button.c \
- xfce-arrow-button.h \
- xfce-itembar.c \
- xfce-itembar.h \
- xfce-hvbox.c \
- xfce-hvbox.h \
- xfce-panel-enums.h \
- xfce-panel-convenience.c \
- xfce-panel-convenience.h \
- xfce-panel-external-item.c \
- xfce-panel-external-item.h \
- xfce-panel-external-plugin.c \
- xfce-panel-external-plugin.h \
- xfce-panel-internal-plugin.c \
- xfce-panel-internal-plugin.h \
- xfce-panel-item-iface.c \
- xfce-panel-item-iface.h \
- xfce-panel-plugin-iface.c \
- xfce-panel-plugin-iface.h \
- xfce-panel-plugin-iface-private.h \
- xfce-panel-plugin-messages.c \
+libxfce4panel_la_SOURCES = \
+ $(generated_files) \
+ xfce-panel-window.c \
+ xfce-panel-window.h \
+ xfce-arrow-button.c \
+ xfce-arrow-button.h \
+ xfce-itembar.c \
+ xfce-itembar.h \
+ xfce-hvbox.c \
+ xfce-hvbox.h \
+ xfce-panel-enums.h \
+ xfce-panel-convenience.c \
+ xfce-panel-convenience.h \
+ xfce-panel-external-item.c \
+ xfce-panel-external-item.h \
+ xfce-panel-external-plugin.c \
+ xfce-panel-external-plugin.h \
+ xfce-panel-internal-plugin.c \
+ xfce-panel-internal-plugin.h \
+ xfce-panel-item-iface.c \
+ xfce-panel-item-iface.h \
+ xfce-panel-plugin-iface.c \
+ xfce-panel-plugin-iface.h \
+ xfce-panel-plugin-iface-private.h \
+ xfce-panel-plugin-messages.c \
xfce-panel-plugin-messages.h
-xfce4_panelincludedir = $(includedir)/xfce4/libxfce4panel
+xfce4_panelincludedir = \
+ $(includedir)/xfce4/libxfce4panel
-xfce4_panelinclude_HEADERS = \
- xfce-panel-enum-types.h \
- xfce-panel-window.h \
- xfce-arrow-button.h \
- xfce-itembar.h \
- xfce-hvbox.h \
- xfce-panel-enums.h \
- xfce-panel-convenience.h \
- xfce-panel-plugin-iface.h \
- xfce-panel-internal-plugin.h \
- xfce-panel-external-plugin.h \
- xfce-panel-macros.h \
+xfce4_panelinclude_HEADERS = \
+ xfce-panel-enum-types.h \
+ xfce-panel-window.h \
+ xfce-arrow-button.h \
+ xfce-itembar.h \
+ xfce-hvbox.h \
+ xfce-panel-enums.h \
+ xfce-panel-convenience.h \
+ xfce-panel-plugin-iface.h \
+ xfce-panel-internal-plugin.h \
+ xfce-panel-external-plugin.h \
+ xfce-panel-macros.h \
xfce-panel-plugin.h
-
-libxfce4panel_la_CFLAGS = \
- -I$(top_srcdir) \
- -DLOCALEDIR=\"$(localedir)\" \
- @LIBXFCE4UTIL_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@
-
-libxfce4panel_la_LDFLAGS = \
- -export-dynamic \
- -version-info @LIBXFCE4PANEL_VERINFO@
-libxfce4panel_la_LIBADD = \
- @LIBXFCEGUI4_LIBS@ \
- @LIBXFCE4UTIL_LIBS@
+libxfce4panel_la_CFLAGS = \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+libxfce4panel_la_LDFLAGS = \
+ -export-dynamic \
+ -version-info $(LIBXFCE4PANEL_VERINFO) \
+ $(PLATFORM_LDFLAGS)
+
if HAVE_CYGWIN
- libxfce4panel_la_LDFLAGS += -no-undefined
- libxfce4panel_la_LIBADD += @GTK_LIBS@
- libxfce4panel_la_CFLAGS += @GTK_CFLAGS@
+libxfce4panel_la_LDFLAGS += \
+ -no-undefined
endif
-EXTRA_DIST = \
- xfce-marshal.list \
+libxfce4panel_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(LIBXFCE4UTIL_LIBS)
+
+pkgconfigdir = \
+ $(libdir)/pkgconfig
+
+pkgconfig_DATA = \
+ libxfce4panel-1.0.pc
+
+generated_files = \
+ xfce-panel-enum-types.c \
+ xfce-panel-enum-types.h \
+ xfce-marshal.c \
+ xfce-marshal.h
+
+EXTRA_DIST = \
+ xfce-marshal.list \
$(generated_files)
-DISTCLEANFILES = \
+DISTCLEANFILES = \
$(generated_files)
-xfce_headers = \
- $(srcdir)/xfce-panel-window.h \
+xfce_headers = \
+ $(srcdir)/xfce-panel-window.h \
$(srcdir)/xfce-panel-enums.h
xfce-panel-enum-types.h: $(xfce_headers)
( cd $(srcdir) && glib-mkenums \
- --fhead "#ifndef _XFCE_PANEL_ENUM_TYPES_H\n#define _XFCE_PANEL_ENUM_TYPES_H\n#include <libxfce4util/libxfce4util.h>\nG_BEGIN_DECLS\n" \
+ --fhead "#ifndef __XFCE_PANEL_ENUM_TYPES_H__\n#define __XFCE_PANEL_ENUM_TYPES_H__\n#include <libxfce4util/libxfce4util.h>\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n#include <libxfce4panel/@filename@>\n" \
- --vhead "GType @enum_name at _get_type (void);\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* _XFCE_PANEL_ENUM_TYPES_H__ */" \
+ --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
+ --ftail "G_END_DECLS\n\n#endif /* !__XFCE_PANEL_ENUM_TYPES_H__ */" \
$(xfce_headers) ) >> xgen \
&& (cmp -s xgen xfce-panel-enum-types.h || cp xgen xfce-panel-enum-types.h ) \
&& rm -f xgen xgen~
@@ -97,22 +109,26 @@
( cd $(srcdir) && glib-mkenums \
--fhead "#include <xfce-panel-enum-types.h>\n" \
--fprod "\n/* enumerations from \"@filename@\" */\n" \
- --vhead "GType\n at enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G at Type@Value values[] = {"\
+ --vhead "GType\n at enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G at Type@Value values[] = {" \
--vprod "\t{ @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail "\t{ 0, NULL, NULL }\n\t};\n\ttype = g_ at type@_register_static (\"@EnumName@\", values);\n }\n\treturn type;\n}\n" \
$(xfce_headers) ) > xgen \
- && cp xgen xfce-panel-enum-types.c \
+ && cp xgen xfce-panel-enum-types.c \
&& rm -f xgen xgen~
xfce-marshal.h: $(srcdir)/xfce-marshal.list
- glib-genmarshal --header --prefix="_xfce_marshal" \
- $(srcdir)/xfce-marshal.list > tmp-marshal.h && \
- cp tmp-marshal.h $(@F) && \
- rm -f tmp-marshal.h tmp-marshal.h~
-
+ ( cd $(srcdir) && glib-genmarshal \
+ --prefix="_xfce_marshal" \
+ --header xfce-marshal.list \
+ | sed -e 's/marshal_data);$$/marshal_data) G_GNUC_INTERNAL;/' ) > xgen-xpmh \
+ && cp xgen-xpmh $(@F) \
+ && rm -f xgen-xpmh xgen-xpmh~
+
xfce-marshal.c: xfce-marshal.h
- glib-genmarshal --body --prefix="_xfce_marshal" \
- $(srcdir)/xfce-marshal.list > tmp-marshal.c && \
- cp tmp-marshal.c $(@F) && \
- rm -f tmp-marshal.c tmp-marshal.c~
+ ( cd $(srcdir) && glib-genmarshal \
+ --prefix="_xfce_marshal" \
+ --body xfce-marshal.list ) > xgen-xpmc \
+ && cp xgen-xpmc xfce-marshal.c \
+ && rm -f xgen-xpmc xgen-xpmc~
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Modified: xfce4-panel/trunk/libxfce4panel/libxfce4panel-1.0.pc.in
===================================================================
--- xfce4-panel/trunk/libxfce4panel/libxfce4panel-1.0.pc.in 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/libxfce4panel-1.0.pc.in 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,18 +1,11 @@
prefix=@prefix@
-datadir=@datadir@
exec_prefix=@exec_prefix@
libdir=@libdir@
-libexecdir=@libexecdir@
includedir=@includedir@
-localedir=@localedir@
-internalplugindir=${libdir}/xfce4/panel-plugins
-externalplugindir=${libexecdir}/xfce4/panel-plugins
-desktopdatadir=${datadir}/xfce4/panel-plugins
-
Name: libxfce4panel
Description: Library for the Xfce Panel
-Requires: libxfcegui4-1.0 libxfce4util-1.0
-Version: @VERSION@
+Requires: libxfce4util-1.0 libxfcegui4-1.0
+Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lxfce4panel
Cflags: -I${includedir}/xfce4/
Modified: xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,22 +1,21 @@
-/* vim: set expandtab ts=8 sw=4: */
-
-/* $Id$
+/* $Id$
*
- * Copyright © 2004-2005 Jasper Huijsmans <jasper at xfce.org>
+ * Copyright (c) 2004-2007 Jasper Huijsmans <jasper at xfce.org>
*
- * This program 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 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 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.
+ * 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -29,6 +28,7 @@
#include <gtk/gtk.h>
#include "xfce-marshal.h"
+#include "xfce-panel-macros.h"
#include "xfce-panel-enum-types.h"
#include "xfce-arrow-button.h"
@@ -53,73 +53,66 @@
PROP_ARROW_TYPE
};
+static void xfce_arrow_button_class_init (XfceArrowButtonClass *klass);
+static void xfce_arrow_button_init (XfceArrowButton *button);
+static void xfce_arrow_button_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void xfce_arrow_button_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static gint xfce_arrow_button_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+static void xfce_arrow_button_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void xfce_arrow_button_add (GtkContainer *container,
+ GtkWidget *child);
+static GType xfce_arrow_button_child_type (GtkContainer *container);
-static void xfce_arrow_button_class_init (XfceArrowButtonClass * klass);
-static void xfce_arrow_button_init (XfceArrowButton * button);
-static void xfce_arrow_button_set_property (GObject * object,
- guint prop_id,
- const GValue * value,
- GParamSpec * pspec);
-
-static void xfce_arrow_button_get_property (GObject * object,
- guint prop_id,
- GValue * value,
- GParamSpec * pspec);
-
-static int xfce_arrow_button_expose (GtkWidget * widget,
- GdkEventExpose * event);
-
-static void xfce_arrow_button_size_request (GtkWidget * widget,
- GtkRequisition * requisition);
-
-static void xfce_arrow_button_add (GtkContainer * container,
- GtkWidget *child);
-
-static GType xfce_arrow_button_child_type (GtkContainer * container);
-
-
-
/* global vars */
static GtkToggleButtonClass *parent_class = NULL;
+static guint arrow_button_signals[LAST_SIGNAL] = { 0 };
-static guint arrow_button_signals[LAST_SIGNAL] = { 0 };
GType
xfce_arrow_button_get_type (void)
{
- static GtkType type = 0;
+ static GtkType type = G_TYPE_INVALID;
- if (!type)
+ if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- static const GTypeInfo type_info = {
- sizeof (XfceArrowButtonClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) xfce_arrow_button_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (XfceArrowButton),
- 0, /* n_preallocs */
- (GInstanceInitFunc) xfce_arrow_button_init,
+ static const GTypeInfo type_info = {
+ sizeof (XfceArrowButtonClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) xfce_arrow_button_class_init,
+ NULL,
+ NULL,
+ sizeof (XfceArrowButton),
+ 0,
+ (GInstanceInitFunc) xfce_arrow_button_init,
NULL
- };
+ };
- type = g_type_register_static (GTK_TYPE_TOGGLE_BUTTON,
- "XfceArrowButton", &type_info, 0);
+ type =
+ g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, I_("XfceArrowButton"), &type_info, 0);
}
return type;
}
+
static void
xfce_arrow_button_class_init (XfceArrowButtonClass * klass)
{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
+ GObjectClass *gobject_class;
+ GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
parent_class = g_type_class_peek_parent (klass);
@@ -130,9 +123,9 @@
gobject_class->get_property = xfce_arrow_button_get_property;
gobject_class->set_property = xfce_arrow_button_set_property;
- widget_class->expose_event = xfce_arrow_button_expose;
- widget_class->size_request = xfce_arrow_button_size_request;
-
+ widget_class->expose_event = xfce_arrow_button_expose;
+ widget_class->size_request = xfce_arrow_button_size_request;
+
container_class->add = xfce_arrow_button_add;
container_class->child_type = xfce_arrow_button_child_type;
@@ -147,14 +140,14 @@
* This value also determines the direction of the popup menu.
**/
arrow_button_signals[ARROW_TYPE_CHANGED] =
- g_signal_new ("arrow-type-changed",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (XfceArrowButtonClass,
- arrow_type_changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__ENUM,
- G_TYPE_NONE, 1, GTK_TYPE_ARROW_TYPE);
+ g_signal_new (I_("arrow-type-changed"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (XfceArrowButtonClass,
+ arrow_type_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__ENUM,
+ G_TYPE_NONE, 1, GTK_TYPE_ARROW_TYPE);
/* properties */
@@ -164,16 +157,18 @@
* The arrow type of the button. This value also determines the direction
* of the popup menu.
**/
- g_object_class_install_property (gobject_class,
- PROP_ARROW_TYPE,
- g_param_spec_enum ("arrow-type",
- "Arrow type",
- "The arrow type of the menu button",
- GTK_TYPE_ARROW_TYPE,
- GTK_ARROW_UP,
- G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class,
+ PROP_ARROW_TYPE,
+ g_param_spec_enum ("arrow-type",
+ "Arrow type",
+ "The arrow type of the menu button",
+ GTK_TYPE_ARROW_TYPE,
+ GTK_ARROW_UP,
+ G_PARAM_READWRITE));
}
+
+
static void
xfce_arrow_button_init (XfceArrowButton * arrow_button)
{
@@ -182,58 +177,65 @@
arrow_button->arrow_type = DEFAULT_ARROW_TYPE;
}
+
+
static void
-xfce_arrow_button_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
+xfce_arrow_button_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
XfceArrowButton *button = XFCE_ARROW_BUTTON (object);
switch (prop_id)
{
- case PROP_ARROW_TYPE:
- xfce_arrow_button_set_arrow_type (button,
- g_value_get_enum (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_ARROW_TYPE:
+ xfce_arrow_button_set_arrow_type (button, g_value_get_enum (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
+
+
static void
-xfce_arrow_button_get_property (GObject * object,
- guint prop_id, GValue * value,
- GParamSpec * pspec)
+xfce_arrow_button_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
XfceArrowButton *button = XFCE_ARROW_BUTTON (object);
switch (prop_id)
{
- case PROP_ARROW_TYPE:
- g_value_set_enum (value, button->arrow_type);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_ARROW_TYPE:
+ g_value_set_enum (value, button->arrow_type);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
-static int
-xfce_arrow_button_expose (GtkWidget * widget, GdkEventExpose *event)
+
+
+static gint
+xfce_arrow_button_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
- if (GTK_WIDGET_DRAWABLE (widget))
+ gint x, y, w;
+
+ if (G_LIKELY (GTK_WIDGET_DRAWABLE (widget)))
{
- int x, y, w;
-
- w = MIN (widget->allocation.height - 2 * widget->style->ythickness,
+ w = MIN (widget->allocation.height - 2 * widget->style->ythickness,
widget->allocation.width - 2 * widget->style->xthickness);
+ w = MIN (w, ARROW_WIDTH);
- w = MIN (w, ARROW_WIDTH);
-
x = widget->allocation.x + (widget->allocation.width - w) / 2;
-
y = widget->allocation.y + (widget->allocation.height - w) / 2;
-
+
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
gtk_paint_arrow (widget->style, widget->window,
@@ -246,27 +248,37 @@
return TRUE;
}
+
+
static void
-xfce_arrow_button_size_request (GtkWidget * widget,
- GtkRequisition * requisition)
+xfce_arrow_button_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
{
- int size = ARROW_WIDTH + ARROW_PADDING +
- 2 * MAX (widget->style->xthickness, widget->style->ythickness);
-
+ gint size = ARROW_WIDTH + ARROW_PADDING +
+ 2 * MAX (widget->style->xthickness, widget->style->ythickness);
+
requisition->width = requisition->height = size;
}
-static void xfce_arrow_button_add (GtkContainer * container, GtkWidget *child)
+
+
+static void
+xfce_arrow_button_add (GtkContainer *container,
+ GtkWidget *child)
{
g_warning ("XfceArrowButton cannot contain any children");
}
-static GType xfce_arrow_button_child_type (GtkContainer * container)
+
+
+static GType
+xfce_arrow_button_child_type (GtkContainer *container)
{
return GTK_TYPE_NONE;
}
+
/* public interface */
/**
@@ -285,6 +297,8 @@
return GTK_WIDGET (button);
}
+
+
/**
* xfce_arrow_button_set_arrow_type:
* @button : an #XfceArrowButton
@@ -293,21 +307,22 @@
* Sets the arrow type for @button.
**/
void
-xfce_arrow_button_set_arrow_type (XfceArrowButton * button,
- GtkArrowType type)
+xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
+ GtkArrowType type)
{
g_return_if_fail (XFCE_IS_ARROW_BUTTON (button));
-
+
button->arrow_type = type;
- g_signal_emit (button, arrow_button_signals[ARROW_TYPE_CHANGED],
- 0, type);
+ g_signal_emit (button, arrow_button_signals[ARROW_TYPE_CHANGED], 0, type);
g_object_notify (G_OBJECT (button), "arrow_type");
gtk_widget_queue_draw (GTK_WIDGET (button));
}
+
+
/**
* xfce_arrow_button_get_arrow_type:
* @button : an #XfceArrowButton
@@ -315,10 +330,9 @@
* Returns: the #GtkArrowType of @button.
**/
GtkArrowType
-xfce_arrow_button_get_arrow_type (XfceArrowButton * button)
+xfce_arrow_button_get_arrow_type (XfceArrowButton *button)
{
- g_return_val_if_fail (XFCE_IS_ARROW_BUTTON (button),
- DEFAULT_ARROW_TYPE);
+ g_return_val_if_fail (XFCE_IS_ARROW_BUTTON (button), DEFAULT_ARROW_TYPE);
return button->arrow_type;
}
Modified: xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.h
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.h 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.h 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,30 +1,34 @@
-/* vim: set expandtab ts=8 sw=4: */
-
-/* $Id$
+/* $Id$
*
- * Copyright © 2004-2005 Jasper Huijsmans <jasper at xfce.org>
+ * Copyright (c) 2004-2007 Jasper Huijsmans <jasper at xfce.org>
*
- * This program 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 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 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.
+ * 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
-#ifndef _XFCE_ARROW_BUTTON_H
-#define _XFCE_ARROW_BUTTON_H
+#ifndef __XFCE_ARROW_BUTTON_H__
+#define __XFCE_ARROW_BUTTON_H__
#include <gtk/gtkenums.h>
#include <gtk/gtktogglebutton.h>
+G_BEGIN_DECLS
+
+typedef struct _XfceArrowButton XfceArrowButton;
+typedef struct _XfceArrowButtonClass XfceArrowButtonClass;
+
#define XFCE_TYPE_ARROW_BUTTON (xfce_arrow_button_get_type ())
#define XFCE_ARROW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_ARROW_BUTTON, XfceArrowButton))
#define XFCE_ARROW_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_ARROW_BUTTON, XfceArrowButtonClass))
@@ -32,17 +36,10 @@
#define XFCE_IS_ARROW_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_ARROW_BUTTON))
#define XFCE_ARROW_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_ARROW_BUTTON, XfceArrowButtonClass))
-
-G_BEGIN_DECLS
-
-typedef struct _XfceArrowButton XfceArrowButton;
-typedef struct _XfceArrowButtonClass XfceArrowButtonClass;
-
struct _XfceArrowButton
{
GtkToggleButton parent;
-
- GtkArrowType arrow_type;
+ GtkArrowType arrow_type;
};
struct _XfceArrowButtonClass
@@ -50,20 +47,16 @@
GtkToggleButtonClass parent_class;
/* signals */
- void (*arrow_type_changed) (GtkWidget * widget,
- GtkArrowType type);
+ void (*arrow_type_changed) (GtkWidget *widget,
+ GtkArrowType type);
};
+GType xfce_arrow_button_get_type (void) G_GNUC_CONST;
+GtkWidget *xfce_arrow_button_new (GtkArrowType type) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+void xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
+ GtkArrowType type);
+GtkArrowType xfce_arrow_button_get_arrow_type (XfceArrowButton *button);
-GType xfce_arrow_button_get_type (void) G_GNUC_CONST;
-
-GtkWidget *xfce_arrow_button_new (GtkArrowType type);
-
-void xfce_arrow_button_set_arrow_type (XfceArrowButton * button,
- GtkArrowType type);
-
-GtkArrowType xfce_arrow_button_get_arrow_type (XfceArrowButton * button);
-
G_END_DECLS
-#endif /* _XFCE_ARROW_BUTTON_H */
+#endif /* !__XFCE_ARROW_BUTTON_H__ */
Modified: xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,12 +1,9 @@
-/* vim: set expandtab ts=8 sw=4: */
-
/* $Id$
*
- * OBox Copyright © 2002 Red Hat Inc. based on GtkHBox
- * Copyright © 2006 Jani Monoses (jani at ubuntu.com)
- * Copyright © 2006 Jasper Huijsmans <jasper at xfce.org>
+ * OBox Copyright (c) 2002 Red Hat Inc. based on GtkHBox
+ * Copyright (c) 2006 Jani Monoses <jani at ubuntu.com>
+ * Copyright (c) 2006-2007 Jasper Huijsmans <jasper at xfce.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
@@ -31,66 +28,73 @@
#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
+#include "xfce-panel-macros.h"
#include "xfce-hvbox.h"
-/* Forward declarations */
-static void xfce_hvbox_class_init (XfceHVBoxClass * class);
-static void xfce_hvbox_init (XfceHVBox * hvbox);
+/* prototypes */
+static void xfce_hvbox_class_init (XfceHVBoxClass *klass);
+static void xfce_hvbox_init (XfceHVBox *hvbox);
+static void xfce_hvbox_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void xfce_hvbox_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
-static void xfce_hvbox_size_request (GtkWidget * widget,
- GtkRequisition * requisition);
-static void xfce_hvbox_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation);
-
GtkType
xfce_hvbox_get_type (void)
{
- static GtkType hvbox_type = 0;
+ static GtkType hvbox_type = G_TYPE_INVALID;
- if (!hvbox_type)
+ if (G_UNLIKELY (hvbox_type == G_TYPE_INVALID))
{
static const GTypeInfo hvbox_info = {
sizeof (XfceHVBoxClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
+ NULL,
+ NULL,
(GClassInitFunc) xfce_hvbox_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
+ NULL,
+ NULL,
sizeof (XfceHVBox),
- 0, /* n_preallocs */
+ 0,
(GInstanceInitFunc) xfce_hvbox_init,
- NULL /* value_table */
+ NULL
};
- hvbox_type =
- g_type_register_static (GTK_TYPE_BOX, "XfceHVBox", &hvbox_info, 0);
+ hvbox_type =
+ g_type_register_static (GTK_TYPE_BOX, I_("XfceHVBox"), &hvbox_info, 0);
}
return hvbox_type;
}
+
+
static void
-xfce_hvbox_class_init (XfceHVBoxClass * class)
+xfce_hvbox_class_init (XfceHVBoxClass *klass)
{
GtkWidgetClass *widget_class;
- widget_class = (GtkWidgetClass *) class;
+ widget_class = (GtkWidgetClass *) klass;
widget_class->size_request = xfce_hvbox_size_request;
widget_class->size_allocate = xfce_hvbox_size_allocate;
}
+
+
static void
-xfce_hvbox_init (XfceHVBox * hvbox)
+xfce_hvbox_init (XfceHVBox *hvbox)
{
+ /* empty */
}
+
+
static GtkWidgetClass *
-get_class (XfceHVBox * hvbox)
+get_class (XfceHVBox *hvbox)
{
GtkWidgetClass *klass;
@@ -111,11 +115,14 @@
return klass;
}
+
+
static void
-xfce_hvbox_size_request (GtkWidget * widget, GtkRequisition * requisition)
+xfce_hvbox_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
{
GtkWidgetClass *klass;
- XfceHVBox *hvbox;
+ XfceHVBox *hvbox;
hvbox = XFCE_HVBOX (widget);
@@ -124,11 +131,14 @@
klass->size_request (widget, requisition);
}
+
+
static void
-xfce_hvbox_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
+xfce_hvbox_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
GtkWidgetClass *klass;
- XfceHVBox *hvbox;
+ XfceHVBox *hvbox;
hvbox = XFCE_HVBOX (widget);
@@ -137,11 +147,11 @@
klass->size_allocate (widget, allocation);
}
-/* public interface */
+
/**
* xfce_hvbox_new:
- * @orientation : Orientation of the #XfceHVBox
+ * @orienation : Orientation of the #XfceHVBox
* @homogeneous : whether all children should be allocated the same size
* @spacing : spacing between #XfceHVBox children
*
@@ -150,7 +160,9 @@
* Return value: the newly allocated #XfceHVBox container widget.
**/
GtkWidget *
-xfce_hvbox_new (GtkOrientation orientation, gboolean homogeneous, int spacing)
+xfce_hvbox_new (GtkOrientation orientation,
+ gboolean homogeneous,
+ gint spacing)
{
GtkWidget *box = GTK_WIDGET (g_object_new (xfce_hvbox_get_type (), NULL));
@@ -161,12 +173,22 @@
return box;
}
+
+
+/**
+ * xfce_hvbox_set_orientation:
+ * @hvbox : #XfceHVBox
+ * @orientation : the new orientation of the #XfceHVBox
+ *
+ * Set the new orientation of the #XfceHVBox container widget.
+ **/
void
-xfce_hvbox_set_orientation (XfceHVBox * hvbox, GtkOrientation orientation)
+xfce_hvbox_set_orientation (XfceHVBox *hvbox,
+ GtkOrientation orientation)
{
g_return_if_fail (XFCE_IS_HVBOX (hvbox));
- if (hvbox->orientation == orientation)
+ if (G_UNLIKELY (hvbox->orientation == orientation))
return;
hvbox->orientation = orientation;
Modified: xfce4-panel/trunk/libxfce4panel/xfce-hvbox.h
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-hvbox.h 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/xfce-hvbox.h 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,10 +1,8 @@
-/* vim: set expandtab ts=8 sw=4: */
-
/* $Id$
*
- * OBox Copyright © 2002 Red Hat Inc. based on GtkHBox
- * Copyright © 2006 Jani Monoses (jani at ubuntu.com)
- * Copyright © 2006 Jasper Huijsmans <jasper at xfce.org>
+ * OBox Copyright (c) 2002 Red Hat Inc. based on GtkHBox
+ * Copyright (c) 2006 Jani Monoses <jani at ubuntu.com>
+ * Copyright (c) 2006-2007 Jasper Huijsmans <jasper at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -22,26 +20,26 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef _XFCE_HVBOX_H
-#define _XFCE_HVBOX_H
+#ifndef __XFCE_HVBOX_H__
+#define __XFCE_HVBOX_H__
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
+typedef struct _XfceHVBox XfceHVBox;
+typedef struct _XfceHVBoxClass XfceHVBoxClass;
+
#define XFCE_TYPE_HVBOX (xfce_hvbox_get_type())
#define XFCE_HVBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_hvbox_get_type (), XfceHVBox))
-#define XFCE_HVBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, xfce_hvbox_get_type (), XfceHVBoxClass))
+#define XFCE_HVBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, xfce_hvbox_get_type (), XfceHVBoxClass))
#define XFCE_IS_HVBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, xfce_hvbox_get_type ()))
#define XFCE_IS_HVBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_HVBOX))
#define XFCE_HVBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_HVBOX, TrayOBoxClass))
-typedef struct _XfceHVBox XfceHVBox;
-typedef struct _XfceHVBoxClass XfceHVBoxClass;
-
struct _XfceHVBox
{
- GtkBox hvbox;
+ GtkBox hvbox;
GtkOrientation orientation;
};
@@ -50,15 +48,12 @@
GtkBoxClass parent_class;
};
-GType xfce_hvbox_get_type (void) G_GNUC_CONST;
-
-GtkWidget *xfce_hvbox_new (GtkOrientation orientation,
- gboolean homogeneous,
- int spacing);
-
-void xfce_hvbox_set_orientation (XfceHVBox * hvbox,
- GtkOrientation orientation);
-
+GType xfce_hvbox_get_type (void) G_GNUC_CONST;
+GtkWidget *xfce_hvbox_new (GtkOrientation orientation,
+ gboolean homogeneous,
+ gint spacing) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+void xfce_hvbox_set_orientation (XfceHVBox *hvbox,
+ GtkOrientation orientation);
G_END_DECLS
-#endif /* __XFCE_HVBOX_H__ */
+#endif /* !__XFCE_HVBOX_H__ */
Modified: xfce4-panel/trunk/libxfce4panel/xfce-itembar.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-itembar.c 2007-03-03 19:04:08 UTC (rev 25076)
+++ xfce4-panel/trunk/libxfce4panel/xfce-itembar.c 2007-03-03 19:26:06 UTC (rev 25077)
@@ -1,28 +1,26 @@
-/* vim: set expandtab ts=8 sw=4: */
-
-/* $Id$
+/* $Id$
*
- * Copyright © 2004-2005 Jasper Huijsmans <jasper at xfce.org>
+ * Copyright (c) 2004-2007 Jasper Huijsmans <jasper at xfce.org>
*
- * This program 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 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 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.
+ * 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Partly based on code from GTK+. Copyright (c) 1997-2000 The GTK+ Team
+ * licensed under the LGPL.
*/
-/* Partly based on code from GTK+. Copyright © 1997-2000 The GTK+ Team
- * licensed under the LGPL.
- */
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -62,146 +60,125 @@
CHILD_PROP_EXPAND
};
+
+
typedef struct _XfceItembarChild XfceItembarChild;
typedef struct _XfceItembarPrivate XfceItembarPrivate;
-struct _XfceItembarPrivate
+struct _XfceItembarPrivate
{
- GtkOrientation orientation;
- GList *children;
-
- GdkWindow *event_window;
- GdkWindow *drag_highlight;
-
- int drop_index;
- guint raised:1;
+ GtkOrientation orientation;
+ GSList *children;
+
+ GdkWindow *event_window;
+ GdkWindow *drag_highlight;
+
+ gint drop_index;
+ guint raised : 1;
};
struct _XfceItembarChild
{
GtkWidget *widget;
- guint expand:1;
+ guint expand : 1;
};
-/* init */
-static void xfce_itembar_class_init (XfceItembarClass * klass);
-static void xfce_itembar_init (XfceItembar * itembar);
-/* GObject */
-static void xfce_itembar_finalize (GObject *object);
+static void xfce_itembar_class_init (XfceItembarClass *klass);
+static void xfce_itembar_init (XfceItembar *itembar);
+static void xfce_itembar_finalize (GObject *object);
+static void xfce_itembar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void xfce_itembar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static gint xfce_itembar_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+static void xfce_itembar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void xfce_itembar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void xfce_itembar_realize (GtkWidget *widget);
+static void xfce_itembar_unrealize (GtkWidget *widget);
+static void xfce_itembar_map (GtkWidget *widget);
+static void xfce_itembar_unmap (GtkWidget *widget);
+static void xfce_itembar_drag_leave (GtkWidget *widget,
+ GdkDragContext *context,
+ guint time_);
+static gboolean xfce_itembar_drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time_);
+static void xfce_itembar_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
+static GType xfce_itembar_child_type (GtkContainer *container);
+static void xfce_itembar_add (GtkContainer *container,
+ GtkWidget *child);
+static void xfce_itembar_remove (GtkContainer *container,
+ GtkWidget *child);
+static void xfce_itembar_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void xfce_itembar_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static gint _find_drop_index (XfceItembar *itembar,
+ gint x,
+ gint y);
-static void xfce_itembar_set_property (GObject * object,
- guint prop_id,
- const GValue * value,
- GParamSpec * pspec);
-
-static void xfce_itembar_get_property (GObject * object,
- guint prop_id,
- GValue * value,
- GParamSpec * pspec);
-
-/* widget */
-static int xfce_itembar_expose (GtkWidget * widget,
- GdkEventExpose * event);
-
-static void xfce_itembar_size_request (GtkWidget * widget,
- GtkRequisition * requisition);
-
-static void xfce_itembar_size_allocate (GtkWidget * widget,
- GtkAllocation * allocation);
-
-static void xfce_itembar_realize (GtkWidget * widget);
-
-static void xfce_itembar_unrealize (GtkWidget * widget);
-
-static void xfce_itembar_map (GtkWidget * widget);
-
-static void xfce_itembar_unmap (GtkWidget * widget);
-
-static void xfce_itembar_drag_leave (GtkWidget * widget,
- GdkDragContext * context,
- guint time_);
-
-static gboolean xfce_itembar_drag_motion (GtkWidget * widget,
- GdkDragContext * context,
- int x,
- int y,
- guint time_);
-
-
-/* container */
-static void xfce_itembar_forall (GtkContainer * container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
-
-static GType xfce_itembar_child_type (GtkContainer * container);
-
-static void xfce_itembar_add (GtkContainer * container,
- GtkWidget * child);
-
-static void xfce_itembar_remove (GtkContainer * container,
- GtkWidget * child);
-
-static void xfce_itembar_set_child_property (GtkContainer * container,
- GtkWidget * child,
- guint prop_id,
- const GValue * value,
- GParamSpec * pspec);
-
-static void xfce_itembar_get_child_property (GtkContainer * container,
- GtkWidget * child,
- guint prop_id,
- GValue * value,
- GParamSpec * pspec);
-
-/* internal functions */
-static int _find_drop_index (XfceItembar * itembar,
- int x,
- int y);
-
/* global vars */
static GtkContainerClass *parent_class = NULL;
+static guint itembar_signals[LAST_SIGNAL] = { 0 };
-static guint itembar_signals[LAST_SIGNAL] = { 0 };
/* public GType function */
GType
xfce_itembar_get_type (void)
{
- static GtkType type = 0;
+ static GtkType type = G_TYPE_INVALID;
- if (!type)
+ if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- static const GTypeInfo type_info = {
- sizeof (XfceItembarClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) xfce_itembar_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (XfceItembar),
- 0, /* n_preallocs */
- (GInstanceInitFunc) xfce_itembar_init,
+ static const GTypeInfo type_info = {
+ sizeof (XfceItembarClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) xfce_itembar_class_init,
+ NULL,
+ NULL,
+ sizeof (XfceItembar),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) xfce_itembar_init,
NULL
- };
+ };
- type = g_type_register_static (GTK_TYPE_CONTAINER, "XfceItembar",
- &type_info, 0);
+ type =
+ g_type_register_static (GTK_TYPE_CONTAINER, I_("XfceItembar"), &type_info, 0);
}
return type;
}
+
/* init */
static void
-xfce_itembar_class_init (XfceItembarClass * klass)
+xfce_itembar_class_init (XfceItembarClass *klass)
{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
+ GObjectClass *gobject_class;
+ GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
g_type_class_add_private (klass, sizeof (XfceItembarPrivate));
@@ -215,9 +192,9 @@
gobject_class->get_property = xfce_itembar_get_property;
gobject_class->set_property = xfce_itembar_set_property;
- widget_class->expose_event = xfce_itembar_expose;
- widget_class->size_request = xfce_itembar_size_request;
- widget_class->size_allocate = xfce_itembar_size_allocate;
+ widget_class->expose_event = xfce_itembar_expose;
+ widget_class->size_request = xfce_itembar_size_request;
+ widget_class->size_allocate = xfce_itembar_size_allocate;
widget_class->realize = xfce_itembar_realize;
widget_class->unrealize = xfce_itembar_unrealize;
widget_class->map = xfce_itembar_map;
@@ -242,15 +219,15 @@
* Emitted when the orientation of the itembar changes.
**/
itembar_signals[ORIENTATION_CHANGED] =
- g_signal_new ("orientation-changed",
+ g_signal_new (I_("orientation-changed"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (XfceItembarClass,
+ G_STRUCT_OFFSET (XfceItembarClass,
orientation_changed),
NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
G_TYPE_NONE, 1, GTK_TYPE_ORIENTATION);
-
+
/**
* XfceItembar::contents-changed:
* @itembar : the object which emitted the signal
@@ -259,15 +236,15 @@
* a child, removing a child, or reordering a child.
**/
itembar_signals[CONTENTS_CHANGED] =
- g_signal_new ("contents-changed",
+ g_signal_new (I_("contents-changed"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (XfceItembarClass,
+ G_STRUCT_OFFSET (XfceItembarClass,
contents_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-
+
/* properties */
/**
@@ -275,15 +252,15 @@
*
* The orientation of the #XfceItembar.
**/
- g_object_class_install_property (gobject_class,
- PROP_ORIENTATION,
- g_param_spec_enum ("orientation",
- "Orientation",
- "The orientation of the itembar",
- GTK_TYPE_ORIENTATION,
- DEFAULT_ORIENTATION,
- G_PARAM_READWRITE));
-
+ g_object_class_install_property (gobject_class,
+ PROP_ORIENTATION,
+ g_param_spec_enum ("orientation",
+ "Orientation",
+ "The orientation of the itembar",
+ GTK_TYPE_ORIENTATION,
+ DEFAULT_ORIENTATION,
+ G_PARAM_READWRITE));
+
/* child properties */
/**
@@ -292,39 +269,47 @@
* Whether the child of the #XfceItembar should fill available space.
**/
gtk_container_class_install_child_property (container_class,
- CHILD_PROP_EXPAND,
- g_param_spec_boolean ("expand",
- "Expand",
- "Whether to grow with parent",
- DEFAULT_CHILD_EXPAND,
- G_PARAM_READWRITE));
+ CHILD_PROP_EXPAND,
+ g_param_spec_boolean ("expand",
+ "Expand",
+ "Whether to grow with parent",
+ DEFAULT_CHILD_EXPAND,
+ G_PARAM_READWRITE));
}
+
+
static void
-xfce_itembar_init (XfceItembar * itembar)
+xfce_itembar_init (XfceItembar *itembar)
{
XfceItembarPrivate *priv = XFCE_ITEMBAR_GET_PRIVATE (itembar);
-
+
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (itembar), GTK_NO_WINDOW);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (itembar), FALSE);
- priv->orientation = DEFAULT_ORIENTATION;
- priv->children = NULL;
- priv->event_window = NULL;
- priv->drag_highlight = NULL;
- priv->drop_index = -1;
+ priv->orientation = DEFAULT_ORIENTATION;
+ priv->children = NULL;
+ priv->event_window = NULL;
+ priv->drag_highlight = NULL;
+ priv->drop_index = -1;
}
+
+
/* GObject */
static void
-xfce_itembar_finalize (GObject * object)
+xfce_itembar_finalize (GObject *object)
{
G_OBJECT_CLASS (parent_class)->finalize (object);
}
+
+
static void
-xfce_itembar_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
+xfce_itembar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
XfceItembar *itembar = XFCE_ITEMBAR (object);
@@ -339,9 +324,13 @@
}
}
+
+
static void
-xfce_itembar_get_property (GObject * object, guint prop_id, GValue * value,
- GParamSpec * pspec)
+xfce_itembar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
XfceItembar *itembar = XFCE_ITEMBAR (object);
@@ -357,12 +346,13 @@
}
+
/* GtkWidget */
-static int
-xfce_itembar_expose (GtkWidget * widget, GdkEventExpose *event)
+static gint
+xfce_itembar_expose (GtkWidget *widget,
+ GdkEventExpose *event)
{
- XfceItembarPrivate *priv =
- XFCE_ITEMBAR_GET_PRIVATE (XFCE_ITEMBAR (widget));
+ XfceItembarPrivate *priv = XFCE_ITEMBAR_GET_PRIVATE (XFCE_ITEMBAR (widget));
GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
@@ -372,29 +362,32 @@
return TRUE;
}
+
+
static void
-xfce_itembar_size_request (GtkWidget * widget, GtkRequisition * requisition)
+xfce_itembar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
{
- XfceItembarPrivate *priv =
- XFCE_ITEMBAR_GET_PRIVATE (XFCE_ITEMBAR (widget));
- GList *l;
- int max, other_size;
+ XfceItembarPrivate *priv = XFCE_ITEMBAR_GET_PRIVATE (XFCE_ITEMBAR (widget));
+ XfceItembarChild *child;
+ GSList *l;
+ GtkRequisition req;
+ gint max, other_size;
- requisition->width = requisition->height =
+ requisition->width = requisition->height =
2 * GTK_CONTAINER (widget)->border_width;
-
+
max = other_size = 0;
-
+
for (l = priv->children; l != NULL; l = l->next)
{
- XfceItembarChild *child = l->data;
- GtkRequisition req;
+ child = l->data;
if (!GTK_WIDGET_VISIBLE (child->widget))
continue;
gtk_widget_size_request (child->widget, &req);
-
+
if (GTK_ORIENTATION_HORIZONTAL == priv->orientation)
{
max = MAX (max, req.height);
@@ -421,31 +414,39 @@
}
}
+
+
static void
-xfce_itembar_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+xfce_itembar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
- XfceItembarPrivate *priv =
- XFCE_ITEMBAR_GET_PRIVATE (XFCE_ITEMBAR (widget));
- int n, i, x, y, bar_height, total_size;
- int n_expand, expand_width, max_expand, total_expand;
- int border_width;
- GList *l;
- GtkTextDirection direction;
- struct ItemProps {
+ XfceItembarPrivate *priv = XFCE_ITEMBAR_GET_PRIVATE (XFCE_ITEMBAR (widget));
+ XfceItembarChild *child;
+ gint n, i, x, y, bar_height, total_size;
+ gint n_expand, expand_width, max_expand, total_expand;
+ gint border_width;
+ GSList *l;
+ gint width, height;
+ gint real_expand_width, size;
+ GtkRequisition req;
+ GtkTextDirection direction;
+
+ struct ItemProps
+ {
GtkAllocation allocation;
- gboolean expand;
+ guint expand : 1;
} *props;
-
+
widget->allocation = *allocation;
border_width = GTK_CONTAINER (widget)->border_width;
-
+
n_expand = expand_width = max_expand = 0;
bar_height = total_size = 0;
x = allocation->x + border_width;
y = allocation->y + border_width;
-
+
if (GTK_ORIENTATION_HORIZONTAL == priv->orientation)
{
expand_width = allocation->width - 2 * border_width;
@@ -453,7 +454,7 @@
if (priv->event_window != NULL)
{
- gdk_window_move_resize (priv->event_window,
+ gdk_window_move_resize (priv->event_window,
x, y, expand_width, bar_height);
}
}
@@ -464,7 +465,7 @@
if (priv->event_window != NULL)
{
- gdk_window_move_resize (priv->event_window,
+ gdk_window_move_resize (priv->event_window,
x, y, bar_height, expand_width);
}
}
@@ -472,23 +473,21 @@
total_size = expand_width;
direction = gtk_widget_get_direction (widget);
- n = g_list_length (priv->children);
+ n = g_slist_length (priv->children);
props = g_new (