[g-a-devel]gnome-mag fixage (patch)

[Michael Meeks <michael ximian com>]

Hi Bill,

	This (appears) to stop the screen magnifier regularly dying for me on
startup; of course there are still some acutely odd things happening
with it but ... ;-)

	May I commit ?

	HTH,

		Michael.
? test/control-client
? test/mag-test
Index: COPYING
===================================================================
RCS file: /cvs/gnome/gnome-mag/COPYING,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 COPYING
--- COPYING	9 May 2002 13:12:55 -0000	1.1.1.1
+++ COPYING	9 Dec 2002 16:58:42 -0000
@@ -1,25 +1,22 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-[This 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.
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -30,347 +27,195 @@ in new free programs; and that you know 
 
   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.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
-  For example, if you distribute copies of 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.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software,
and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-  Also, for each distributor's protection, we want to make certain
+  Also, for each author's protection and ours, 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.
-
+software.  If the software is modified by someone else and passed on,
we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
   Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that 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.
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
-modification follow.  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.
+modification follow.
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		    GNU 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.
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
 
-  Activities other than copying, distribution and modification are not
+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
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
 
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
+    a) You must cause the modified files 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.)
-
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
 These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
+identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
+on the Program, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
+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.
+collective works based on the Program.
 
-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
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
 
-  3. You may 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
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software
interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
-  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.
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
 
-  9. You are not required to accept this License, since you have not
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
+distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+the Program 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
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
+
+  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
+refrain entirely from distribution of the Program.
 
-If any portion of this section is held invalid or unenforceable under
any
-particular circumstance, the balance of the section is intended to
apply,
-and the section as a whole is intended to apply in other circumstances.
+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
+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
@@ -380,103 +225,116 @@ 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.
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new
versions
+of the General Public License from time to time.  Such new versions
will
+be similar in spirit to the present version, but may differ in detail
to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number
of
+this License, you may choose any version ever published by the Free
Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we
sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software
and
+of promoting the sharing and reuse of software generally.
 
 			    NO WARRANTY
 
-  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.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT
WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK
AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT
LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED
BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-           How to Apply These Terms to Your New Libraries
+	    How to Apply These Terms to Your New Programs
 
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of
the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library. 
It is
-safest to attach them to the start of each source file to most
effectively
-convey the exclusion of warranty; and each file should have at least
the
-"copyright" line and a pointer to where the full notice is found.
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the library's name and a brief idea of what it
does.>
+    <one line to give the program's name and a brief idea of what it
does.>
     Copyright (C) <year>  <name of author>
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    This program is free software; you can redistribute it and/or
modify
+    it under the terms of the GNU General Public License as published
by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-    This library is distributed in the hope that it will be useful,
+    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.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
02111-1307  USA
 
-    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.
 
 Also add information on how to contact you by electronic and paper
mail.
 
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
`show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
appropriate
+parts of the General Public License.  Of course, the commands you use
may
+be called something other than `show w' and `show c'; they could even
be
+mouse-clicks or menu items--whatever suits your program.
+
 You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
+school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random
Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
program
+  `Gnomovision' (which makes passes at compilers) written by James
Hacker.
 
-  <signature of Ty Coon>, 1 April 1990
+  <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
-That's all there is to it!
+This General Public License does not permit incorporating your program
into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with
the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-mag/ChangeLog,v
retrieving revision 1.30
diff -u -p -u -r1.30 ChangeLog
--- ChangeLog	12 Nov 2002 18:57:01 -0000	1.30
+++ ChangeLog	9 Dec 2002 16:58:43 -0000
@@ -1,3 +1,46 @@
+2002-12-09  Michael Meeks  <michael ximian com>
+
+	* magnifier/zoom-region.c (zoom_region_paint_cursor),
+	(zoom_region_calculate_scroll_rects),
+	(zoom_region_scroll_smooth): quit if we don't have a cursor.
+
+	* magnifier/magnifier.c (magnifier_get_type): kill.
+	(magnifier_new): upd.
+	(impl_magnifier_dispose): upd.
+	(impl_magnifier_create_zoom_region): plug leak.
+	(magnifier_properties_init): don't leak default args
+	on properties that are non-writeable.
+
+	* magnifier/magnifier-main.c
+	(magnifier_main_test_image): make test_i_foo a
+	local static at least.
+
+	* magnifier/zoom-region.c
+	(impl_zoom_region_set_mag_factor): dup/ref pb.
+	(zoom_region_update_pointer_timeout): remove evil
+	check for ->priv == 0xaaaaaaa ie. what might be
+	in freed memory if you're lucky.
+	(zoom_region_class_init): use GObject dispose,
+	not the epv version.
+	(zoom_region_dispose): fix several evilnesses.
+	(zoom_region_get_type): kill.
+	(zoom_region_finalize): chain to parent.
+	(zoom_region_get_source_subwindow): bin ugly static we
+	re-allocate each time anyway.
+	(impl_zoom_region_dispose): for compat, just do
+	an unref.
+	calm compile warnings, kill PropData, PropIdx
+
+	* magnifier/magnifier.c (impl_magnifier_create_zoom_region),
+	(impl_magnifier_get_properties): dup/ref/rel/unref the pb.
+
+	* magnifier/magnifier-main.c (main): re-write to
+	use bonobo_pbclient stuff.
+	(magnifier_main_refresh_all): release/unref the pb.
+
+	* magnifier/zoom-region.c (impl_zoom_region_dispose):
+	don't g_idle_remove_by_data 3 times.
+
 2002-11-12  Bill Haneman <bill haneman sun com>
 
 	Fixes for bugzilla 95942 and 98236.
Index: magnifier/magnifier-main.c
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/magnifier-main.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 magnifier-main.c
--- magnifier/magnifier-main.c	12 Nov 2002 18:57:05 -0000	1.12
+++ magnifier/magnifier-main.c	9 Dec 2002 16:58:43 -0000
@@ -120,44 +120,39 @@ init_rect_bounds (GNOME_Magnifier_RectBo
 	bounds->y2 = y2;
 }
 
-static int test_i_foo = 0;
-
 static int
 magnifier_main_test_image (gpointer data)
 {
-  Magnifier *magnifier = (Magnifier *) data;
-  GNOME_Magnifier_ZoomRegionList *zoom_regions;
-  GNOME_Magnifier_ZoomRegion zoom_region;
-  CORBA_Environment ev;
-  GNOME_Magnifier_RectBounds roi;
+	static int test_i_foo = 0;
+	Magnifier *magnifier = (Magnifier *) data;
+	GNOME_Magnifier_ZoomRegionList *zoom_regions;
+	CORBA_Environment ev;
+	GNOME_Magnifier_RectBounds roi;
+	CORBA_exception_init (&ev);
 
-  CORBA_exception_init (&ev);
+	roi.x1 = 10 * test_i_foo;
+	roi.y1 = 10 * test_i_foo;
+	roi.x2 = 200 + 10 * test_i_foo;
+	roi.y2 = 200 + 10 * test_i_foo;
+	++test_i_foo;
+
+	if (!IS_MAGNIFIER (magnifier))
+		return FALSE;
+	magnifier->priv->cursor_x = (roi.x2 + roi.x1) / 2;
+	magnifier->priv->cursor_y = (roi.y2 + roi.y1) / 2;
+	zoom_regions =
+		GNOME_Magnifier_Magnifier_getZoomRegions (
+			BONOBO_OBJREF (magnifier),
+			&ev);
 
-  roi.x1 = 10 * test_i_foo;
-  roi.y1 = 10 * test_i_foo;
-  roi.x2 = 200 + 10 * test_i_foo;
-  roi.y2 = 200 + 10 * test_i_foo;
-  ++test_i_foo;
-
-  if (!IS_MAGNIFIER (magnifier)) return FALSE;
-  magnifier->priv->cursor_x = (roi.x2 + roi.x1) / 2;
-  magnifier->priv->cursor_y = (roi.y2 + roi.y1) / 2;
-  zoom_regions =
-	  GNOME_Magnifier_Magnifier_getZoomRegions (
-		  BONOBO_OBJREF (magnifier),
-		  &ev);
-  if (zoom_regions && (zoom_regions->_length > 0)) {
-	  zoom_region = CORBA_Object_duplicate (
-		  ( (CORBA_Object *) (zoom_regions->_buffer))[0], &ev);
-	  if (zoom_region != CORBA_OBJECT_NIL) {
-		  GNOME_Magnifier_ZoomRegion_setROI (zoom_region,
-						     &roi,
-						     &ev);
-	  } else fprintf (stderr, "nil region!\n");
-  }
+	if (zoom_regions && (zoom_regions->_length > 0))
+		GNOME_Magnifier_ZoomRegion_setROI (
+			zoom_regions->_buffer[0], &roi, &ev);
   
-  if (test_i_foo < 50) return TRUE;
-  return FALSE;
+	if (test_i_foo < 50)
+		return TRUE;
+
+	return FALSE;
 }
 
 static int last_x = 0, last_y = 0;
@@ -175,7 +170,7 @@ magnifier_main_pan_image (gpointer data)
   GdkModifierType mask_return;
 
   CORBA_exception_init (&ev);
-  
+
   if (global_options.mouse_follow && IS_MAGNIFIER (magnifier))
   {
 	  gdk_window_get_pointer (
@@ -226,39 +221,46 @@ magnifier_main_pan_image (gpointer data)
 static int
 magnifier_main_refresh_all (gpointer data)
 {
+	int i;
 	Magnifier *magnifier = data;
-	CORBA_Environment ev;
 	CORBA_any *dirty_bounds_any;
-	GNOME_Magnifier_ZoomRegionList *regions;
-	GNOME_Magnifier_RectBounds *dirty_bounds;
-	GNOME_Magnifier_ZoomRegion region;
+	CORBA_Environment ev;
 	Bonobo_PropertyBag properties;
-	int i;
+	GNOME_Magnifier_RectBounds *dirty_bounds;
+	GNOME_Magnifier_ZoomRegionList *regions;
 	
 	CORBA_exception_init (&ev);
 
-	if (!IS_MAGNIFIER (magnifier)) return FALSE;
+	if (!IS_MAGNIFIER (magnifier))
+		return FALSE;
 	
 	regions = GNOME_Magnifier_Magnifier_getZoomRegions (
 		BONOBO_OBJREF (magnifier),
 		&ev);
+#ifdef DEBUG
 	fprintf (stderr, "refreshing %d regions\n", regions->_length);
+#endif
 
 	properties = GNOME_Magnifier_Magnifier_getProperties (BONOBO_OBJREF
(magnifier), &ev);
+
 	dirty_bounds_any = Bonobo_PropertyBag_getValue (properties,
"source-display-size", &ev);
+	if (BONOBO_EX (&ev)) {
+		g_warning ("Error getting source-display-size");
+		bonobo_main_quit ();
+		return FALSE;
+	}
+
 	dirty_bounds = (GNOME_Magnifier_RectBounds *)
dirty_bounds_any->_value;
 	/*
 	  fprintf (stderr, "region to update: %d %d %d %d\n",
 		 dirty_bounds->x1, dirty_bounds->y1, dirty_bounds->x2,
dirty_bounds->y2);
 	*/
-	for (i = 0; i < regions->_length; ++i) {
-		region = CORBA_Object_duplicate (regions->_buffer[i], &ev);
+	for (i = 0; i < regions->_length; ++i)
 		GNOME_Magnifier_ZoomRegion_markDirty (
-			region,
-			ORBit_copy_value (dirty_bounds,
-					  TC_GNOME_Magnifier_RectBounds),
-			&ev);
-	}
+			regions->_buffer [i], dirty_bounds, &ev);
+
+	bonobo_object_release_unref (properties, NULL);
+
 	return TRUE;
 }
 
@@ -302,56 +304,24 @@ main (int argc, char** argv)
   if (ev._major != CORBA_NO_EXCEPTION) fprintf (stderr, "EXCEPTION\n");
 
   if (global_options.source_display)
-  {
-	  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
-	  /* TODO: do we need to free the bonobo arg after this call? */
-	  BONOBO_ARG_SET_STRING (arg, global_options.source_display);
-	  Bonobo_PropertyBag_setValue (properties, "source-display-screen",
-				       arg,
-				       &ev);
-  }
-  if (global_options.target_display)
-  {
-	  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
-	  /* TODO: do we need to free the bonobo arg after this call? */
-	  BONOBO_ARG_SET_STRING (arg, global_options.target_display);
-	  Bonobo_PropertyBag_setValue (properties, "target-display-screen",
-				       arg,
-				       &ev);
-  }
+	  bonobo_pbclient_set_string (properties, "source-display-screen",
+				      global_options.source_display, NULL);
+
   if (global_options.target_display)
-  {
-	  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
-	  /* TODO: do we need to free the bonobo arg after this call? */
-	  BONOBO_ARG_SET_STRING (arg, global_options.cursor_set);
-	  Bonobo_PropertyBag_setValue (properties, "cursor-set",
-				       arg,
-				       &ev);
-  }
+	  bonobo_pbclient_set_string (properties, "target-display-screen",
+				      global_options.target_display, NULL);
+
   if (global_options.cursor_size)
-  {
-	  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_INT);
-	  BONOBO_ARG_SET_INT (arg, global_options.cursor_size);
-	  Bonobo_PropertyBag_setValue (properties, "cursor-size",
-				       arg,
-				       &ev);
-  }
-  else if (global_options.cursor_scale_factor != 1.0F)
-  {
-	  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_FLOAT);
-	  BONOBO_ARG_SET_FLOAT (arg, global_options.cursor_scale_factor);
-	  Bonobo_PropertyBag_setValue (properties, "cursor-scale-factor",
-				       arg,
-				       &ev);
-  }
+	  bonobo_pbclient_set_long (properties, "cursor-size",
+				    global_options.cursor_size, NULL);
+
+  if (global_options.cursor_scale_factor != 1.0F)
+	  bonobo_pbclient_set_float (properties, "cursor-scale-factor",
+				     global_options.cursor_scale_factor, NULL);
+
   if (global_options.cursor_color)
-  {
-	  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_LONG);
-	  BONOBO_ARG_SET_LONG (arg, global_options.cursor_color);
-	  Bonobo_PropertyBag_setValue (properties, "cursor-color",
-				       arg,
-				       &ev);
-  }
+	  bonobo_pbclient_set_long (properties, "cursor-clor",
+				    global_options.cursor_color, NULL);
   w = gdk_screen_get_width (
 	  gdk_display_get_screen (magnifier->target_display,
 				  magnifier->target_screen_num));
@@ -380,12 +350,15 @@ main (int argc, char** argv)
 			       viewport_any,
 			       &ev);
 
+  bonobo_object_release_unref (properties, NULL);
+  properties = NULL;
+
   if (global_options.vertical_split ||
       global_options.horizontal_split ||
       global_options.fullscreen)
   {
-	  GNOME_Magnifier_ZoomRegion zoom_region;
 	  int scroll_policy;
+	  GNOME_Magnifier_ZoomRegion zoom_region;
 	  
 	  fprintf (stderr, "creating an initial zoom region.\n");
 	  init_rect_bounds (roi, 0, 0, 100, 100);
@@ -404,55 +377,52 @@ main (int argc, char** argv)
 	  scroll_policy = global_options.smooth_scroll ?
 		  GNOME_Magnifier_ZoomRegion_SCROLL_SMOOTHEST :
 		  GNOME_Magnifier_ZoomRegion_SCROLL_FASTEST;
-	  if (ev._major != CORBA_NO_EXCEPTION) fprintf (stderr,
"EXCEPTION\n");
-	  Bonobo_PropertyBag_setValue (properties, "smooth-scroll-policy",
-				       bonobo_arg_new_from (
-					       BONOBO_ARG_INT, &scroll_policy),
-				       &ev);
-	  Bonobo_PropertyBag_setValue (properties, "border-size",
-				       bonobo_arg_new_from (
-					       BONOBO_ARG_INT, &global_options.border_width),
-				       &ev);
-	  Bonobo_PropertyBag_setValue (properties, "border-color",
-				       bonobo_arg_new_from (
-					       BONOBO_ARG_LONG, &global_options.border_color),
-				       &ev);
-	  Bonobo_PropertyBag_setValue (properties, "use-test-pattern",
-				       bonobo_arg_new_from (
-					       BONOBO_ARG_BOOLEAN, &global_options.test_pattern),
-				       &ev);
+	  if (BONOBO_EX (&ev))
+		  fprintf (stderr, "EXCEPTION\n");
+
+	  bonobo_pbclient_set_boolean (properties, "smooth-scroll-policy",
+				       scroll_policy, &ev);
+	  bonobo_pbclient_set_long    (properties, "border_size",
+				       global_options.border_width, &ev);
+	  bonobo_pbclient_set_long    (properties, "border-color",
+				       global_options.border_color, &ev);
+	  bonobo_pbclient_set_boolean (properties, "use-test-pattern",
+				       global_options.test_pattern, &ev);
+
 	  if (strcmp (global_options.smoothing_type, "none"))
-	  {
-		  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
-		  /* TODO: do we need to free the bonobo arg after this call? */
-		  BONOBO_ARG_SET_STRING (arg, global_options.smoothing_type);
-		  Bonobo_PropertyBag_setValue (properties, "smoothing-type",
-					       arg,
-				       &ev);
-	  }
+		  bonobo_pbclient_set_string (properties, "smoothing-type",
+					      global_options.smoothing_type, &ev);
+
 	  if (global_options.invert_image)
-		  Bonobo_PropertyBag_setValue (properties, "inverse-video",
-					       bonobo_arg_new_from (
-						       BONOBO_ARG_BOOLEAN,
-						       &global_options.invert_image),
-					       &ev);
+		  bonobo_pbclient_set_boolean (properties, "inverse-video",
+					       global_options.invert_image, NULL);
+
 	  GNOME_Magnifier_Magnifier_addZoomRegion (
 		  BONOBO_OBJREF (magnifier),
 		  zoom_region,
 		  &ev);
-  }
 
-  if (!global_options.timing_test)
-  {
-	  refresh_handle = gtk_timeout_add(global_options.refresh_time,
magnifier_main_refresh_all, magnifier);
-	  pan_handle = gtk_timeout_add(global_options.mouse_poll_time,
magnifier_main_pan_image, magnifier);
+	  bonobo_object_release_unref (properties, &ev);
+	  properties = NULL;
   }
-  else
-	  refresh_handle = gtk_timeout_add(global_options.refresh_time,
magnifier_main_test_image, magnifier);
+
+  if (!global_options.timing_test) {
+	  refresh_handle = gtk_timeout_add (
+		  global_options.refresh_time,
+		  magnifier_main_refresh_all, magnifier);
+
+	  pan_handle = gtk_timeout_add (
+		  global_options.mouse_poll_time,
+		  magnifier_main_pan_image, magnifier);
+  } else
+	  refresh_handle = gtk_timeout_add (
+		  global_options.refresh_time,
+		  magnifier_main_test_image, magnifier);
 
   bonobo_main ();
   
   gtk_timeout_remove (refresh_handle);
+
   if (pan_handle)
 	  gtk_timeout_remove (pan_handle);
   
Index: magnifier/magnifier.c
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/magnifier.c,v
retrieving revision 1.22
diff -u -p -u -r1.22 magnifier.c
--- magnifier/magnifier.c	12 Nov 2002 18:57:05 -0000	1.22
+++ magnifier/magnifier.c	9 Dec 2002 16:58:44 -0000
@@ -34,10 +34,7 @@
 #include "zoom-region-private.h"
 #include "GNOME_Magnifier.h"
 
-/*
- * Our parent GObject type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
+static GObjectClass *parent_class = NULL;
 
 enum {
 	MAGNIFIER_SOURCE_DISPLAY_PROP,
@@ -55,8 +52,6 @@ enum {
 	MAGNIFIER_CROSSWIRE_COLOR_PROP
 } PropIdx;
 
-static BonoboObjectClass *parent_class;
-
 static void
 magnifier_realize (GtkWidget *widget)
 {
@@ -66,8 +61,7 @@ magnifier_realize (GtkWidget *widget)
 	
 	static gboolean initialized = FALSE;
 	
-	if (!initialized)
-	{
+	if (!initialized) {
 		wm_window_protocols[0] = gdk_x11_get_xatom_by_name
("WM_DELETE_WINDOW");
 		wm_window_protocols[1] = gdk_x11_get_xatom_by_name ("_NET_WM_PING");
 		/* use DOCK until Metacity RFE for new window type goes in */
@@ -94,9 +88,9 @@ magnifier_realize (GtkWidget *widget)
 }
 
 static void
-magnifier_exit()
+magnifier_exit ()
 {
-  gtk_exit(0);
+	gtk_exit (0);
 }
 
 static gint
@@ -476,8 +470,9 @@ magnifier_gobject_dispose (GObject *obje
 	if (magnifier->zoom_regions)
 		g_list_free (magnifier->zoom_regions);
 	magnifier->zoom_regions = NULL;
-	G_OBJECT_CLASS (parent_class)->dispose (object);
 	bonobo_main_quit ();
+
+	BONOBO_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
 }
 
 static void
@@ -485,18 +480,17 @@ impl_magnifier_set_source_display (Porta
 				   const CORBA_char *display,
 				   CORBA_Environment *ev)
 {
-  Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant
(servant));
-  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
-  BONOBO_ARG_SET_STRING (arg, display);
-
-  magnifier_set_property (magnifier->property_bag,
-			  arg,
-			  MAGNIFIER_SOURCE_DISPLAY_PROP,
-			  ev,
-			  magnifier);
+	Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant
(servant));
+	BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
+	BONOBO_ARG_SET_STRING (arg, display);
+
+	magnifier_set_property (magnifier->property_bag,
+				arg,
+				MAGNIFIER_SOURCE_DISPLAY_PROP,
+				ev,
+				magnifier);
 
-  bonobo_arg_release (arg);
-  
+	bonobo_arg_release (arg);
 }
 
 static void
@@ -504,18 +498,17 @@ impl_magnifier_set_target_display (Porta
 				   const CORBA_char *display,
 				   CORBA_Environment *ev)
 {
-  Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant
(servant));
-  BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
-  BONOBO_ARG_SET_STRING (arg, display);
-
-  magnifier_set_property (magnifier->property_bag,
-			  arg,
-			  MAGNIFIER_TARGET_DISPLAY_PROP,
-			  ev,
-			  magnifier);
+	Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant
(servant));
+	BonoboArg *arg = bonobo_arg_new (BONOBO_ARG_STRING);
+	BONOBO_ARG_SET_STRING (arg, display);
+
+	magnifier_set_property (magnifier->property_bag,
+				arg,
+				MAGNIFIER_TARGET_DISPLAY_PROP,
+				ev,
+				magnifier);
 
-  bonobo_arg_release (arg);
-  
+	bonobo_arg_release (arg);
 }
 
 static GNOME_Magnifier_ZoomRegion
@@ -526,13 +519,11 @@ impl_magnifier_create_zoom_region (Porta
 				   const GNOME_Magnifier_RectBounds *viewport,
 				   CORBA_Environment *ev)
 {
-	Magnifier *magnifier =
-		MAGNIFIER (bonobo_object_from_servant (servant));
-	GNOME_Magnifier_ZoomRegion retval;
-	CORBA_any *viewport_any =
-		CORBA_any__alloc ();
-	Bonobo_PropertyBag properties;
+	Magnifier *magnifier = MAGNIFIER (bonobo_object (servant));
+	CORBA_any viewport_any;
 	ZoomRegion *zoom_region = zoom_region_new ();
+	Bonobo_PropertyBag properties;
+	GNOME_Magnifier_ZoomRegion retval;
 
 	/* FIXME:
 	 * shouldn't do this here, since it causes the region to get
@@ -544,20 +535,24 @@ impl_magnifier_create_zoom_region (Porta
 	/* XXX: should check ev after each call, below */
 	CORBA_exception_init (ev);
 	GNOME_Magnifier_ZoomRegion_setMagFactor (retval, zx, zy, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) fprintf (stderr, "EXCEPTION
setMagFactor\n");
+
+	if (ev->_major != CORBA_NO_EXCEPTION)
+		fprintf (stderr, "EXCEPTION setMagFactor\n");
+
 	CORBA_exception_init (ev);
 	properties = GNOME_Magnifier_ZoomRegion_getProperties (retval, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) fprintf (stderr, "EXCEPTION
getProperties\n");
-	viewport_any->_type = TC_GNOME_Magnifier_RectBounds;
-	viewport_any->_value = ORBit_copy_value (viewport,
-						TC_GNOME_Magnifier_RectBounds);
+	if (ev->_major != CORBA_NO_EXCEPTION)
+		fprintf (stderr, "EXCEPTION getProperties\n");
+
+	viewport_any._type = TC_GNOME_Magnifier_RectBounds;
+	viewport_any._value = (gpointer) viewport;
 	Bonobo_PropertyBag_setValue (
-		properties,
-		"viewport",
-		viewport_any,
-		ev);	
+		properties, "viewport", &viewport_any, ev);
+
 	GNOME_Magnifier_ZoomRegion_setROI (retval, roi, ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) fprintf (stderr, "EXCEPTION
setROI\n");
+	if (ev->_major != CORBA_NO_EXCEPTION)
+		fprintf (stderr, "EXCEPTION setROI\n");
+
 	CORBA_exception_init (ev);
 
 	gtk_widget_set_size_request (magnifier->priv->canvas,
@@ -565,6 +560,8 @@ impl_magnifier_create_zoom_region (Porta
 			   viewport->y2 - viewport->y1);
 	gtk_widget_show (magnifier->priv->canvas);
 	gtk_widget_show (magnifier->priv->w);
+
+	bonobo_object_release_unref (properties, ev);
 	
 	return CORBA_Object_duplicate (retval, ev);
 }
@@ -575,9 +572,10 @@ impl_magnifier_add_zoom_region (Portable
 				const GNOME_Magnifier_ZoomRegion region,
 				CORBA_Environment * ev)
 {
-	Magnifier *magnifier =
-		MAGNIFIER (bonobo_object_from_servant (servant));
+	Magnifier *magnifier = MAGNIFIER (bonobo_object (servant));
+
 	magnifier->zoom_regions = g_list_append (magnifier->zoom_regions,
region);
+
 	return CORBA_TRUE;
 }
 
@@ -585,10 +583,9 @@ static Bonobo_PropertyBag
 impl_magnifier_get_properties (PortableServer_Servant servant,
 			       CORBA_Environment *ev)
 {
-	Magnifier *magnifier =
-		MAGNIFIER (bonobo_object_from_servant (servant));
+	Magnifier *magnifier = MAGNIFIER (bonobo_object (servant));
 
-	return CORBA_Object_duplicate (
+	return bonobo_object_dup_ref (
 		BONOBO_OBJREF (magnifier->property_bag), ev);
 }
 
@@ -622,21 +619,20 @@ static void
 impl_magnifier_clear_all_zoom_regions (PortableServer_Servant servant,
 				       CORBA_Environment * ev)
 {
-  Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant
(servant));
-  fprintf (stderr, "Destroying all zoom regions!\n");
-  g_list_foreach (magnifier->zoom_regions, magnifier_unref_zoom_region,
magnifier);
-  g_list_free (magnifier->zoom_regions);
-  magnifier->zoom_regions = NULL;
+	Magnifier *magnifier = MAGNIFIER (bonobo_object_from_servant
(servant));
+
+	fprintf (stderr, "Destroying all zoom regions!\n");
+	g_list_foreach (magnifier->zoom_regions,
+			magnifier_unref_zoom_region, magnifier);
+	g_list_free (magnifier->zoom_regions);
+	magnifier->zoom_regions = NULL;
 }
 
 static void
 impl_magnifier_dispose (PortableServer_Servant servant,
 			CORBA_Environment *ev)
 {
-	Magnifier *magnifier =
-		MAGNIFIER (bonobo_object_from_servant (servant));
-	while (IS_MAGNIFIER(magnifier) && G_OBJECT (magnifier)->ref_count)
-		bonobo_object_unref (BONOBO_OBJECT (magnifier));
+	bonobo_object_unref (bonobo_object (servant));
 }
 
 static void
@@ -647,8 +643,6 @@ magnifier_class_init (MagnifierClass *kl
 
 	object_class->dispose  = magnifier_gobject_dispose;
 
-	parent_class = g_type_class_ref (BONOBO_OBJECT_TYPE);	
-
         epv->_set_SourceDisplay = impl_magnifier_set_source_display;
 	epv->_set_TargetDisplay = impl_magnifier_set_target_display;
 	epv->getProperties = impl_magnifier_get_properties;
@@ -677,25 +671,19 @@ magnifier_properties_init (Magnifier *ma
 	bonobo_object_add_interface (BONOBO_OBJECT (magnifier),
 				     BONOBO_OBJECT (magnifier->property_bag));
 
-	def = bonobo_arg_new (BONOBO_ARG_STRING);
-	BONOBO_ARG_SET_STRING (def, getenv ("DISPLAY"));
-	
 	bonobo_property_bag_add (magnifier->property_bag,
 				 "source-display-screen",
 				 MAGNIFIER_SOURCE_DISPLAY_PROP,
 				 BONOBO_ARG_STRING,
-				 def,
+				 NULL,
 				 "source display screen",
 				 Bonobo_PROPERTY_WRITEABLE);
 
-	def = bonobo_arg_new (BONOBO_ARG_STRING);
-	BONOBO_ARG_SET_STRING (def, getenv ("DISPLAY"));
-
 	bonobo_property_bag_add (magnifier->property_bag,
 				 "target-display-screen",
 				 MAGNIFIER_TARGET_DISPLAY_PROP,
 				 BONOBO_ARG_STRING,
-				 def,
+				 NULL,
 				 "target display screen",
 				 Bonobo_PROPERTY_WRITEABLE);
 
@@ -800,7 +788,6 @@ magnifier_properties_init (Magnifier *ma
 				 Bonobo_PROPERTY_WRITEABLE);
 }
 
-
 static void
 magnifier_init (Magnifier *magnifier)
 {
@@ -855,53 +842,18 @@ GdkDrawable *
 magnifier_get_cursor (Magnifier *magnifier)
 {
 	if (!magnifier->priv->cursor)
-	{
 		magnifier_init_cursor (magnifier);
-	}
-	return magnifier->priv->cursor;
-}
 
-GType
-magnifier_get_type (void)
-{
-        static GType type = 0;
-
-        if (!type) {
-                static const GTypeInfo tinfo = {
-                        sizeof (MagnifierClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) magnifier_class_init,
-                        (GClassFinalizeFunc) NULL,
-                        NULL, /* class data */
-                        sizeof (Magnifier),
-                        0, /* n preallocs */
-                        (GInstanceInitFunc) magnifier_init,
-                        NULL /* value table */
-                };
-                /*
-                 *   Here we use bonobo_type_unique instead of
-                 * gtk_type_unique, this auto-generates a load of
-                 * CORBA structures for us. All derived types must
-                 * use bonobo_type_unique.
-                 */
-                type = bonobo_type_unique (
-                        PARENT_TYPE,
-                        POA_GNOME_Magnifier_Magnifier__init,
-                        NULL,
-                        G_STRUCT_OFFSET (MagnifierClass, epv),
-                        &tinfo,
-                        "Magnifier");
-        }
-
-        return type;
+	return magnifier->priv->cursor;
 }
 
 Magnifier *
 magnifier_new (int argc, char **argv)
 {
-  Magnifier *magnifier =
-	  MAGNIFIER (g_object_new (magnifier_get_type(), NULL));
-
-  return magnifier;
+	return g_object_new (magnifier_get_type(), NULL);
 }
+
+BONOBO_TYPE_FUNC_FULL (Magnifier, 
+		       GNOME_Magnifier_Magnifier,
+		       BONOBO_TYPE_OBJECT,
+		       magnifier);
Index: magnifier/zoom-region.c
===================================================================
RCS file: /cvs/gnome/gnome-mag/magnifier/zoom-region.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 zoom-region.c
--- magnifier/zoom-region.c	12 Nov 2002 18:57:05 -0000	1.12
+++ magnifier/zoom-region.c	9 Dec 2002 16:58:45 -0000
@@ -36,10 +36,7 @@
 #include "magnifier.h" /* needed to access parent data */
 #include "magnifier-private.h" /* needed to access parent data */
 
-/*
- * Our parent GObject type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
+static GObjectClass *parent_class = NULL;
 
 enum {
 	ZOOM_REGION_MANAGED_PROP,
@@ -57,20 +54,12 @@ enum {
 	ZOOM_REGION_TESTPATTERN_PROP
 } PropIdx;
 
-typedef union {
-	gint      i;
-	glong     l;
-	gboolean  b;
-	gfloat    f;
-	gdouble   d;
-	char     *s;
-	GNOME_Magnifier_RectBounds r;
-} PropData;
-
+#ifdef TEST_XTST_CURSOR
 static Cursor *x_cursors;
 static Window cursor_window = None;
+#endif
 
-static gboolean can_coalesce = True; /* change this when event
coalescing is working */
+static gboolean can_coalesce = TRUE ; /* change this when event
coalescing is working */
 
 static void zoom_region_sync (ZoomRegion *region);
 static void zoom_region_finalize (GObject *object);
@@ -99,6 +88,7 @@ _debug_announce_rect (char *msg, GdkRect
 		 msg, rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 
+#ifdef TEST_XTST_CURSOR
 /** util stuff **/
 static Cursor *
 _get_x_cursors (Display *display)
@@ -120,6 +110,7 @@ _get_x_cursors (Display *display)
 	}
 	return x_cursors;
 }
+#endif
 
 static gboolean
 _diff_pixbufs (const GdkPixbuf *a, const GdkPixbuf *b)
@@ -136,8 +127,10 @@ _diff_pixbufs (const GdkPixbuf *a, const
 		gdk_pixbuf_get_n_channels (a)/ bits_per_byte;
 	long n_rows = gdk_pixbuf_get_height (a);
 
-	if (gdk_pixbuf_get_height (b) != n_rows) return True;
-	if (gdk_pixbuf_get_width (b) != gdk_pixbuf_get_width (a)) return True;
+	if (gdk_pixbuf_get_height (b) != n_rows)
+		return TRUE;
+	if (gdk_pixbuf_get_width (b) != gdk_pixbuf_get_width (a))
+		return TRUE;
 	for (j = 0; j < n_rows; ++j)
 	{
 		cpa = pa + j * rsa;
@@ -146,13 +139,13 @@ _diff_pixbufs (const GdkPixbuf *a, const
 		{
 			if (*cpa != *cpb)
 			{
-				return True;
+				return TRUE;
 			}
 			cpa++;
 			cpb++;
 		}		
 	}
-	return False;
+	return FALSE;
 }
 
 /** EVENT COALESCING **/
@@ -165,19 +158,19 @@ _diff_pixbufs (const GdkPixbuf *a, const
  * a: the first GdkRectangle, which will be changed to the new bounds
if
  *    coalesce operation can be performed, otherwise unchanged.
  * b: the second GdkRectangle.
- * returns: True if the two are coalesced, False otherwise.
+ * returns: True if the two are coalesced, FALSE otherwise.
  **/
 static gboolean
 _combine_rects (GdkRectangle *a, GdkRectangle *b)
 {
-	gboolean can_combine = False;
+	gboolean can_combine = FALSE;
 	if ((a->x == b->x) && (a->x + a->width == b->x + b->width))
 	{
-		can_combine = True;
+		can_combine = TRUE;
 	}
 	else if ((a->y == b->y) && (a->y + a->height == b->y + b->height))
 	{
-		can_combine = True;
+		can_combine = TRUE;
 	}
 	if (can_combine)
 	{
@@ -187,11 +180,11 @@ _combine_rects (GdkRectangle *a, GdkRect
 		{
 			gdk_rectangle_union (a, b, &c);
 			*a = c;
-			can_combine = True;
+			can_combine = TRUE;
 		}
 		else
 		{
-			can_combine = False;
+			can_combine = FALSE;
 		}
 	}
 	return can_combine;
@@ -207,13 +200,13 @@ _combine_rects (GdkRectangle *a, GdkRect
  * oooooo  into   oooxxx
  * oooooo         oooxxx
  *
- * returns: True if the refactor was performed, False if it could not
be
+ * returns: TRUE if the refactor was performed, FALSE if it could not
be
  *          completed (i.e. if the rectangles did not form a suitable
union).
  **/
 static gboolean
 _refactor_rects (GdkRectangle *p, GdkRectangle *n)
 {
-	gboolean refactored = False;
+	gboolean refactored = FALSE;
 	GdkRectangle *a, *b;
 	if (p->x == n->x)
 	{
@@ -233,14 +226,14 @@ _refactor_rects (GdkRectangle *p, GdkRec
 			a->height += b->height;
 			b->x += a->width;
 			b->width -= a->width;
-			refactored = True;
+			refactored = TRUE;
 		}
 		else if (a->y + a->height == b->y)
 		{
 			a->height += b->height;
 			b->x += a->width;
 			b->width -= a->width;
-			refactored = True;
+			refactored = TRUE;
 		}
 		if (refactored) fprintf (stderr, "REFACTOR 1\n");
 	}		
@@ -262,14 +255,14 @@ _refactor_rects (GdkRectangle *p, GdkRec
 			a->width += b->width;
 			b->y += a->height;
 			b->height -= a->height;
-			refactored = True;
+			refactored = TRUE;
 		}
 		else if (a->x + a->width == b->x)
 		{
 			a->width += b->width;
 			b->y += a->height;
 			b->height -= a->height;
-			refactored = True;
+			refactored = TRUE;
 		}
 		if (refactored) fprintf (stderr, "REFACTOR 2\n");
 	}
@@ -290,13 +283,13 @@ _refactor_rects (GdkRectangle *p, GdkRec
 			a->y -= b->height;
 			a->height += b->height;
 			b->width -= a->width;
-			refactored = True;
+			refactored = TRUE;
 		}
 		else if (a->y + a->height == b->y)
 		{
 			a->height += b->height;
 			b->width -= a->width;
-			refactored = True;
+			refactored = TRUE;
 		}
 		if (refactored) fprintf (stderr, "REFACTOR 3\n");
 	}
@@ -317,13 +310,13 @@ _refactor_rects (GdkRectangle *p, GdkRec
 			a->x -= b->width;
 			a->width += b->width;
 			b->height -= a->height;
-			refactored = True;
+			refactored = TRUE;
 		}
 		else if (a->x + a->width == b->x)
 		{
 			a->width += b->width;
 			b->height -= a->height;
-			refactored = True;
+			refactored = TRUE;
 		}
 		if (refactored) fprintf (stderr, "REFACTOR 4\n");
 	}
@@ -601,7 +594,7 @@ zoom_region_cursor_rect (ZoomRegion *zoo
 		rect = zoom_region_view_rect_from_source_rect (zoom_region, rect);
 		rect.x -= magnifier->cursor_hotspot.x;
 		rect.y -= magnifier->cursor_hotspot.y;
-		gdk_drawable_get_size (magnifier->priv->cursor, &rect.width,
&rect.height);
+		gdk_drawable_get_size (cursor, &rect.width, &rect.height);
 	}
 	return rect;
 }
@@ -642,6 +635,7 @@ zoom_region_paint_crosswire_cursor (Zoom
 	int x_left_clip, x_right_clip = 0, y_top_clip, y_bottom_clip = 0;
 	int csize;
 	GdkRectangle rect;
+	GdkDrawable *cursor;
 	
 	if (!(magnifier && zoom_region->priv->w &&
 	      zoom_region->priv->w->window &&
@@ -670,10 +664,10 @@ zoom_region_paint_crosswire_cursor (Zoom
 	rect = zoom_region_view_rect_from_source_rect (zoom_region, rect);
 	if (clip_rect) gdk_gc_set_clip_rectangle (gc, clip_rect);
 
-	if (magnifier->crosswire_clip)
+	if (magnifier->crosswire_clip &&
+	    (cursor = magnifier_get_cursor (magnifier)))
 	{
-		gdk_drawable_get_size (magnifier_get_cursor (magnifier),
-				       &csize, &csize);
+		gdk_drawable_get_size (cursor, &csize, &csize);
 		y_top_clip = rect.y - magnifier->cursor_hotspot.y -
 			magnifier->crosswire_size;
 		y_bottom_clip = rect.y +
@@ -703,17 +697,17 @@ zoom_region_paint_crosswire_cursor (Zoom
 	{
 		if (magnifier->crosswire_clip )
 		{
-			gdk_draw_rectangle (zoom_region->priv->w->window, gc, True,
+			gdk_draw_rectangle (zoom_region->priv->w->window, gc, TRUE,
 					    rect.x - magnifier->crosswire_size / 2,
 					    0, magnifier->crosswire_size, y_top_clip);
-			gdk_draw_rectangle (zoom_region->priv->w->window, gc, True, 0,
+			gdk_draw_rectangle (zoom_region->priv->w->window, gc, TRUE, 0,
 					    rect.y - magnifier->crosswire_size / 2,
 					    x_left_clip, magnifier->crosswire_size);
 		}
-		gdk_draw_rectangle (zoom_region->priv->w->window, gc, True,
+		gdk_draw_rectangle (zoom_region->priv->w->window, gc, TRUE,
 				    rect.x - magnifier->crosswire_size / 2,
 				    x_right_clip, magnifier->crosswire_size, 4096);
-		gdk_draw_rectangle (zoom_region->priv->w->window, gc, True,
y_bottom_clip,
+		gdk_draw_rectangle (zoom_region->priv->w->window, gc, TRUE,
y_bottom_clip,
 				    rect.y - magnifier->crosswire_size / 2,
 				    4096, magnifier->crosswire_size);
 	}
@@ -744,6 +738,8 @@ zoom_region_paint_cursor (ZoomRegion *zo
 		int width, height;
 		GdkGC *gc = gdk_gc_new (zoom_region->priv->w->window);
 		GdkDrawable *cursor = magnifier_get_cursor (magnifier);
+		if (!cursor)
+			return;
 		zoom_region->priv->cursor_backing_rect = rect;
 		gdk_drawable_get_size (zoom_region->priv->cursor_backing_pixels,
 				       &width, &height);
@@ -831,14 +827,16 @@ zoom_region_paint_border (ZoomRegion *zo
 			color.red = (zoom_region->border_color & 0xFF0000) >> 16;
 			color.green = (zoom_region->border_color & 0xFF00) >> 8;
 			color.blue = zoom_region->border_color & 0xFF;
+#ifdef DEBUG
 			fprintf (stderr, "border color triple RGB=%d|%d|%d",
 				 color.red, color.green, color.blue);
+#endif
 			gdk_gc_set_foreground (zoom_region->priv->border_gc, &color);
 		}
 	/*
 		gdk_draw_rectangle (zoom_region->priv->w->window,
 				    zoom_region->priv->border_gc,
-				    True,
+				    TRUE,
 				    area->x,
 				    area->y,
 				    area->width,
@@ -943,7 +941,10 @@ zoom_region_calculate_scroll_rects (Zoom
 	    zoom_region->priv->w->window)
 		window = zoom_region->priv->w->window;
 	else
-		return False;
+		return FALSE;
+	if (!window)
+		return FALSE;
+
 	gdk_drawable_get_size (GDK_DRAWABLE (window),
 			       &rect.width,
 			       &rect.height);
@@ -1000,6 +1001,9 @@ zoom_region_scroll_smooth (ZoomRegion *z
 {
 	GdkWindow *window = zoom_region->priv->w->window;
 	GdkRectangle window_rect;
+
+	if (!window)
+		return;
 	window_rect.x = 0;
 	window_rect.y = 0;
 	gdk_drawable_get_size (GDK_DRAWABLE (window),
@@ -1080,6 +1084,7 @@ zoom_region_set_cursor_pos (ZoomRegion *
 	}
 }
 
+#ifdef TEST_XTST_CURSOR
 static GdkWindow *
 zoom_region_source_root (ZoomRegion *zoom_region)
 {
@@ -1091,6 +1096,7 @@ zoom_region_source_root (ZoomRegion *zoo
 		return gdk_screen_get_root_window (source_screen);
 	else return NULL;
 }
+#endif
 
 static gboolean
 zoom_region_update_pointer (ZoomRegion *zoom_region, gboolean
draw_cursor)
@@ -1160,7 +1166,7 @@ zoom_region_update_pointer (ZoomRegion *
 					       magnifier->target_display));
 				XSync (GDK_DISPLAY_XDISPLAY (
 					       magnifier->target_display),
-				       False);
+				       FALSE);
 			}
 			XSynchronize (display, FALSE);
 			if (cursor_id >= max_cursors) cursor_id = -1;
@@ -1211,16 +1217,15 @@ static int
 zoom_region_update_pointer_timeout (gpointer data)
 {
 	ZoomRegion *zoom_region = data;
-	/* FIXME: test below is a hack */
-	if (!zoom_region->priv == 0xaaaaaaaa) return FALSE;
+
 	if (zoom_region_update_pointer (zoom_region, TRUE)) {
 	        g_idle_add_full (G_PRIORITY_HIGH_IDLE,
 				 zoom_region_update_pointer_idle,
 				 data,
 				 NULL);
 		return FALSE;
-	}
-	else return TRUE;
+	} else
+		return TRUE;
 }
 
 static void
@@ -1285,9 +1290,6 @@ zoom_region_post_process_pixbuf (ZoomReg
 	 **/
 }
 
-
-static GdkImage *__image = NULL; /* TESTING ONLY */
-
 static GdkPixbuf *
 zoom_region_get_source_subwindow (ZoomRegion *zoom_region,
 				  const GdkRectangle bounds)
@@ -1309,19 +1311,21 @@ zoom_region_get_source_subwindow (ZoomRe
 	if (!zoom_region->priv->source_drawable)
 	{
 		if (zoom_region->priv->test) {
-			__image = gdk_image_new (GDK_IMAGE_FASTEST,
-						 gdk_visual_get_system (),
-						 width,
-						 height);
+			GdkImage *test_image = NULL;
+
+			test_image = gdk_image_new (GDK_IMAGE_FASTEST,
+						    gdk_visual_get_system (),
+						    width,
+						    height);
 			
 			for (i = 0; i < width; ++i)
 				for (j = 0; j < height; ++j)
-					gdk_image_put_pixel (__image, i, j, i*j);
+					gdk_image_put_pixel (test_image, i, j, i*j);
 
 			zoom_region->priv->source_drawable = gdk_pixmap_new (NULL, width,
height, 24);
 			gdk_draw_image (zoom_region->priv->source_drawable,
 					gdk_gc_new (zoom_region->priv->source_drawable),
-					__image,
+					test_image,
 					0, 0,
 					0, 0,
 					width, height);
@@ -1338,7 +1342,7 @@ zoom_region_get_source_subwindow (ZoomRe
 		{
 			zoom_region->priv->source_pixbuf_cache =
 				gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-						False,
+						FALSE,
 						8, /* FIXME: not always 8? */
 						width, height);
 		}
@@ -1555,9 +1559,11 @@ zoom_region_set_viewport (ZoomRegion *zo
 			  const GNOME_Magnifier_RectBounds *viewport)
 {
 	zoom_region->viewport = *viewport;
+#ifdef DEBUG
 	fprintf (stderr, "setting viewport %d,%d - %d,%d\n",
 		 (int) viewport->x1, (int) viewport->y1,
 		 (int) viewport->x2, (int) viewport->y2);
+#endif
 	zoom_region_recompute_exposed_viewport (zoom_region);
 	zoom_region_align (zoom_region);
 	if (!zoom_region->priv->w) {
@@ -1740,7 +1746,6 @@ impl_zoom_region_set_mag_factor (Portabl
 {
 	ZoomRegion *zoom_region =
 		ZOOM_REGION (bonobo_object_from_servant (servant));
-	GNOME_Magnifier_RectBounds *source_bounds;
 	CORBA_any *any;
 	/* TODO: assert that parent is magnifier object */
 	Bonobo_PropertyBag properties =
@@ -1749,27 +1754,30 @@ impl_zoom_region_set_mag_factor (Portabl
 				(Magnifier *) zoom_region->priv->parent), ev);
 	any = Bonobo_PropertyBag_getValue (
 		properties, "source-display-size", ev);
-	source_bounds = (GNOME_Magnifier_RectBounds *) any->_value;
+	if (!BONOBO_EX (ev))
+		zoom_region->priv->source_area =
+			*((GNOME_Magnifier_RectBounds *) any->_value);
 	zoom_region->xscale = mag_factor_x;
 	zoom_region->yscale = mag_factor_y;
 
-	zoom_region->priv->source_area = *source_bounds;
-
 	if (zoom_region->priv->scaled_pixbuf)
 		g_object_unref (zoom_region->priv->scaled_pixbuf);
+
 	zoom_region->priv->scaled_pixbuf = gdk_pixbuf_new (
 		GDK_COLORSPACE_RGB, FALSE, 8,
 		zoom_region->priv->source_area.x2 -
 		zoom_region->priv->source_area.x1 * zoom_region->xscale + 1,
 		zoom_region->priv->source_area.y2 -
 		zoom_region->priv->source_area.y1 * zoom_region->yscale + 1);
-	if (zoom_region->priv->pixmap)
-	{
+
+	if (zoom_region->priv->pixmap) {
 		g_object_unref (zoom_region->priv->pixmap);
 		zoom_region->priv->pixmap = NULL;
 	}
 	zoom_region_update_current (zoom_region);
 	zoom_region_sync (zoom_region);
+
+	bonobo_object_release_unref (properties, NULL);
 }
 
 static void
@@ -1790,8 +1798,7 @@ impl_zoom_region_get_properties (Portabl
 {
 	ZoomRegion *zoom_region =
 		ZOOM_REGION (bonobo_object_from_servant (servant));
-	fprintf (stderr, "getting zoom region property-bag\n");
-	return CORBA_Object_duplicate (
+	return bonobo_object_dup_ref (
 		BONOBO_OBJREF (zoom_region->properties), ev);
 }
 
@@ -1832,16 +1839,22 @@ static void
 impl_zoom_region_dispose (PortableServer_Servant servant,
 			  CORBA_Environment * ev)
 {
-	ZoomRegion *zoom_region =
-		ZOOM_REGION (bonobo_object_from_servant (servant));
-	fprintf (stderr, "zoom region destroyed!\n");
-	gtk_signal_disconnect (GTK_OBJECT (zoom_region->priv->w),
-			       zoom_region->priv->expose_handler_id);
-	g_idle_remove_by_data (zoom_region); /* 3 times? well, we have
several...*/
-	g_idle_remove_by_data (zoom_region);
-	g_idle_remove_by_data (zoom_region);
+	bonobo_object_unref (bonobo_object (servant));
+}
+
+static void
+zoom_region_dispose (GObject *object)
+{
+	ZoomRegion *zoom_region = ZOOM_REGION (object);
+
+	fprintf (stderr, "zoom region dispose!\n");
+
+	g_signal_handler_disconnect (
+		zoom_region->priv->w,
+		zoom_region->priv->expose_handler_id);
 	g_idle_remove_by_data (zoom_region);
-	bonobo_object_unref (BONOBO_OBJECT (zoom_region));
+
+	BONOBO_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
 }
 
 static void
@@ -1849,8 +1862,9 @@ zoom_region_class_init (ZoomRegionClass 
 {
         GObjectClass * object_class = (GObjectClass *) klass;
         POA_GNOME_Magnifier_ZoomRegion__epv *epv = &klass->epv;
-	
-        object_class->finalize = zoom_region_finalize; /* TODO */
+
+	object_class->dispose = zoom_region_dispose;
+        object_class->finalize = zoom_region_finalize;
 	
         epv->setMagFactor = impl_zoom_region_set_mag_factor;
         epv->getMagFactor = impl_zoom_region_get_mag_factor;
@@ -2047,7 +2061,7 @@ zoom_region_private_init (ZoomRegionPriv
 	priv->border_gc = NULL;
 	priv->gdk_interp_type = GDK_INTERP_NEAREST;
 	priv->expose_handler_id = 0;
-	priv->test = False;
+	priv->test = FALSE;
 }
 
 static void
@@ -2056,8 +2070,8 @@ zoom_region_init (ZoomRegion *zoom_regio
 	zoom_region_properties_init (zoom_region);
 	zoom_region->smooth_scroll_policy =
 		GNOME_Magnifier_ZoomRegion_SCROLL_FASTEST;
-	zoom_region->invert = False;
-	zoom_region->cache_source = False;
+	zoom_region->invert = FALSE;
+	zoom_region->cache_source = FALSE;
 	zoom_region->border_size = 0;
 	zoom_region->border_color = 0;
 	zoom_region->roi.x1 = 0;
@@ -2078,65 +2092,35 @@ zoom_region_init (ZoomRegion *zoom_regio
 			    NULL);
 }
 
-GType
-zoom_region_get_type (void)
-{
-        static GType type = 0;
-
-        if (!type) {
-                static const GTypeInfo tinfo = {
-                        sizeof (ZoomRegionClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) zoom_region_class_init,
-                        (GClassFinalizeFunc) NULL,
-                        NULL, /* class data */
-                        sizeof (ZoomRegion),
-                        0, /* n preallocs */
-                        (GInstanceInitFunc) zoom_region_init,
-                        NULL /* value table */
-                };
-                /*
-                 *   Here we use bonobo_type_unique instead of
-                 * gtk_type_unique, this auto-generates a load of
-                 * CORBA structures for us. All derived types must
-                 * use bonobo_type_unique.
-                 */
-                type = bonobo_type_unique (
-                        PARENT_TYPE,
-                        POA_GNOME_Magnifier_ZoomRegion__init,
-                        NULL,
-                        G_STRUCT_OFFSET (ZoomRegionClass, epv),
-                        &tinfo,
-                        "ZoomRegion");
-        }
-
-        return type;
-}
-
 ZoomRegion *
-zoom_region_new ()
+zoom_region_new (void)
 {
-  ZoomRegion *zoom_region =
-	  ZOOM_REGION (g_object_new (zoom_region_get_type(), NULL));
-  return zoom_region;
+	return g_object_new (zoom_region_get_type(), NULL);
 }
 
 static void
 zoom_region_finalize (GObject *region)
 {
-  ZoomRegion *zoom_region = (ZoomRegion *) region;
-  g_list_free (zoom_region->priv->q);
-  gtk_container_remove (GTK_CONTAINER (zoom_region->priv->border),
-			GTK_WIDGET (zoom_region->priv->w));
-  gtk_container_remove (GTK_CONTAINER (((Magnifier *) 
-					zoom_region->priv->parent)->priv->canvas),
-			GTK_WIDGET (zoom_region->priv->border));
-  g_object_unref (G_OBJECT (zoom_region->priv->source_pixbuf_cache));
-  g_object_unref (G_OBJECT (zoom_region->priv->scaled_pixbuf));
-  g_object_unref (G_OBJECT (zoom_region->priv->pixmap));
-  g_object_unref (G_OBJECT (zoom_region->priv->cursor_backing_pixels));
-  g_object_unref (G_OBJECT (zoom_region->priv->border_gc));
-  g_free (zoom_region->priv);
-  zoom_region->priv = NULL;
-}
+	ZoomRegion *zoom_region = (ZoomRegion *) region;
+
+	g_list_free (zoom_region->priv->q);
+	gtk_container_remove (GTK_CONTAINER (zoom_region->priv->border),
+			      GTK_WIDGET (zoom_region->priv->w));
+	gtk_container_remove (GTK_CONTAINER (((Magnifier *) 
+					      zoom_region->priv->parent)->priv->canvas),
+			      GTK_WIDGET (zoom_region->priv->border));
+	g_object_unref (zoom_region->priv->source_pixbuf_cache);
+	g_object_unref (zoom_region->priv->scaled_pixbuf);
+	g_object_unref (zoom_region->priv->pixmap);
+	g_object_unref (zoom_region->priv->cursor_backing_pixels);
+	g_object_unref (zoom_region->priv->border_gc);
+	g_free (zoom_region->priv);
+	zoom_region->priv = NULL;
+
+	BONOBO_CALL_PARENT (G_OBJECT_CLASS, finalize, (region));
+}
+
+BONOBO_TYPE_FUNC_FULL (ZoomRegion, 
+		       GNOME_Magnifier_ZoomRegion,
+		       BONOBO_TYPE_OBJECT,
+		       zoom_region);



-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot