Commit Graph

15807 Commits

Author SHA1 Message Date
Matthias Clasen
bceb3fcc73 Bug 535250 - GtkToolButton reference page says "label" where
it should say "icon", uses underscores

        * gtk/tmpl/gtktoolbutton.sgml: Improve introduction

svn path=/trunk/; revision=20227
2008-05-29 03:07:01 +00:00
Jorge Gonzalez Gonzalez
fb7faf4d19 Updated Spanish translation
svn path=/trunk/; revision=20226
2008-05-28 17:06:21 +00:00
Michael Natterer
2c5f8a5c2b whitespace cleanup: remove trailing whitespace and excess newlines and
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gtk/gtk*.h: whitespace cleanup: remove trailing whitespace and
	excess newlines and sprinkled some newlines where needed. Zero
	code or formatting changes included.


svn path=/trunk/; revision=20225
2008-05-28 15:35:43 +00:00
Michael Natterer
0bf59ed22e fix formatting of details_acquired() signal.
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkprinter.h: fix formatting of details_acquired() signal.


svn path=/trunk/; revision=20224
2008-05-28 15:25:36 +00:00
Michael Natterer
9172d33782 fix comment: the widget is called GtkColorButton, not
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkcolorbutton.h: fix comment: the widget is called
	GtkColorButton, not GtkColorSelectButton. Remove trailing
	whitespace and excess newlines.


svn path=/trunk/; revision=20223
2008-05-28 15:20:05 +00:00
Michael Natterer
e9d9670e92 last but not least, add G_DISABLE_SINGLE_INCLUDES,
2008-05-28  Michael Natterer  <mitch@gimp.org>

	* configure.in: last but not least, add G_DISABLE_SINGLE_INCLUDES,
	GDK_PIXBUF_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES
	to CPPFLAGS so it's impossible to commit code that would break
	apps which use DISABLE_INCLUDE defines.


svn path=/trunk/; revision=20222
2008-05-28 15:08:57 +00:00
Michael Natterer
eff99c282c define __GTK_H_INSIDE__ around including all other headers.
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gtk/gtk.h: define __GTK_H_INSIDE__ around including all other
	headers.

	* gtk/gtktypebuiltins.h.template
	* gtk/gtkversion.h.in
	* gtk/gtk*.h: add single-include guards that #error out if
	GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
	included individually.

	* gtk/gtkprintbackend.h
	* gtk/gtkprinter-private.h
	* gtk/gtktextlayout.h
	* gtk/gtktexttagprivate.h
	* gtk/gtktexttypes.h
	* gtk/gtktreedatalist.h: include <gtk/gtk.h> instead of individual
	headers in these private or semi-private headers.

	* gtk/gtkimmodule.h: also here because it's not in gtk.h.

	* gtk/gtkpagesetupunixdialog.h
	* gtk/gtkprinter.h
	* gtk/gtkprintjob.h
	* gtk/gtkprintunixdialog.h: likewise in the gtkunixprint headers.

	* gtk/gtkclist.h
	* gtk/gtkcombo.h
	* gtk/gtkctree.h
	* gtk/gtkfilesel.h
	* gtk/gtkitemfactory.h
	* gtk/gtklist.h
	* gtk/gtklistitem.h
	* gtk/gtkoldeditable.h
	* gtk/gtkoptionmenu.h
	* gtk/gtkpixmap.h
	* gtk/gtkpreview.h
	* gtk/gtksignal.h
	* gtk/gtktipsquery.h: whenever possible, include only <gtk/gtk.h>
	instead of individual headers in these deprecated headers. They
	don't get included at all when GTK_DISABLE_DEPRECATED is defined,
	so if an app needs them anyway, it must undef GTK_DISABLE_DEPRECATED
	and include them individually, which should continue to work.

	* gtk/gtkclist.c: include "gtkctree.h" because of the change
	above.


svn path=/trunk/; revision=20221
2008-05-28 15:07:04 +00:00
Kristian Rietveld
e7df0579c2 Bug 449625 - crash in gtk_tree_view_real_move_cursor at gtktreeview.c:9641
2008-05-28  Kristian Rietveld  <kris@imendio.com>

	Bug 449625 - crash in gtk_tree_view_real_move_cursor at
	gtktreeview.c:9641

	* gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down):
	cursor_offset *must* be larger than background height of the cursor
	node, not just equal otherwise there is no guarantee there is a next
	node.


svn path=/trunk/; revision=20219
2008-05-28 14:47:50 +00:00
Michael Natterer
53366c1c0e don't include <gdk/gdktestutils.h>.
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktestutils.c: don't include <gdk/gdktestutils.h>.


svn path=/trunk/; revision=20218
2008-05-28 14:47:06 +00:00
Michael Natterer
791ac426d7 define __GDK_H_INSIDE__ around including all other headers.
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gdk/gdk.h: define __GDK_H_INSIDE__ around including all other
	headers.

	* gdk/gdkenumtypes.h.template
	* gdk/gdk*.h: add single-include guards that #error out if
	GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
	included individually. Also removed some redundant includes and
	did some tiny trailing whitespace removal that's not worth to
	commit separately.

	* gdk/gdkprivate.h: include <gdk/gdk.h> instead of individual
	files.

	* gdk/win32/gdkwin32.h
	* gdk/x11/gdkx.h: only include <gdk/gdkprivate.h> and remove all
	other includes.


svn path=/trunk/; revision=20217
2008-05-28 14:01:57 +00:00
Kristian Rietveld
382ce2f138 Bug 504087 - make gtk_tooltip_set_custom a no-op for setting the current
2008-05-28  Kristian Rietveld  <kris@imendio.com>

	Bug 504087 - make gtk_tooltip_set_custom a no-op for setting the
	current widget again.

	* gtk/gtktooltip.c (gtk_tooltip_set_custom),
	(gtk_tooltip_reset), (gtk_tooltip_run_requery): use a
	custom_was_reset field to check if the custom widget is set again in
	the query-tooltip callback; if not, we set it to NULL.  Based on a
	patch by Xavier Claessens, insightful comments from Jean-Yves Lefort
	and Christian Persch.


svn path=/trunk/; revision=20215
2008-05-28 14:00:31 +00:00
Michael Natterer
83b215f9ea define GDK_PIXBUF_H_INSIDE around including all other headers.
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gdk-pixbuf.h: define GDK_PIXBUF_H_INSIDE around including all
	other headers.

	* gdk-pixbuf-animation.h
	* gdk-pixbuf-core.h
	* gdk-pixbuf-enum-types.h.template
	* gdk-pixbuf-features.h.in
	* gdk-pixbuf-io.h
	* gdk-pixbuf-loader.h
	* gdk-pixbuf-simple-anim.h
	* gdk-pixbuf-transform.h: add single-include guards that #error
	out if GDK_PIXBUF_DISABLE_SINGLE_INCLUDES is defined and any of
	these files is included individually.

	* gdk-pixbuf-private.h: don't incude "gdk-pixbuf-io.h".

	* gdk-pixbuf-csource.c: #define __GTK_H_INSIDE__ around including
	"../gtk/gtkversion.h". Ugly but needed in this special case.


svn path=/trunk/; revision=20214
2008-05-28 13:39:52 +00:00
Michael Natterer
2650257f3b Move ChangeLog entry to right file.
svn path=/trunk/; revision=20213
2008-05-28 13:23:18 +00:00
Michael Natterer
e628ab8e84 Fix ChangeLog.
svn path=/trunk/; revision=20212
2008-05-28 13:01:15 +00:00
Michael Natterer
da042c898d include <gtk/gtk.h> instead of <gtk/gtkaccessible.h>
2008-05-28  Michael Natterer  <mitch@gimp.org>

	* modules/other/gail/gailwidget.h: include <gtk/gtk.h> instead of
	<gtk/gtkaccessible.h>

	* modules/other/gail/*.h: don't include anyting from gtk since all
	headers indirectly include gailwidget.h.

	* modules/other/gail/gailcellparent.c: include <gtk/gtk.h> instead
	of individual files.

	* modules/other/gail/gailcheckmenuitem.c
	* modules/other/gail/gailmenu.c
	* modules/other/gail/gailtreeview.c: remove all gtk includes since
	it's always included by including any gail header.


svn path=/trunk/; revision=20211
2008-05-28 12:59:48 +00:00
Michael Natterer
6720ef6d80 modules/printbackends/cups/gtkcupsutils.c
2008-05-28  Michael Natterer  <mitch@gimp.org>

	* modules/printbackends/cups/gtkcupsutils.c
	* modules/printbackends/cups/gtkprintbackendcups.c
	* modules/printbackends/file/gtkprintbackendfile.c
	* modules/printbackends/lpr/gtkprintbackendlpr.c: include
	<gtk/gtk.h> instead of individual files.


svn path=/trunk/; revision=20210
2008-05-28 12:49:11 +00:00
Michael Natterer
0130bc33fd include <gdk-pixbuf/gdk-pixbuf.h> instead of individual files.
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* demos/testpixbuf.c: include <gdk-pixbuf/gdk-pixbuf.h> instead of
	individual files.


svn path=/trunk/; revision=20209
2008-05-28 12:47:37 +00:00
Kristian Rietveld
45f0ad8cf5 Bug 498010 - gtk_tree_view_set_cursor fails if model!=NULL.
2008-05-28  Kristian Rietveld  <kris@imendio.com>

	Bug 498010 - gtk_tree_view_set_cursor fails if model!=NULL.

	* gtk/gtktreeview.c (gtk_tree_view_set_cursor_on_cell): return if fail
	->priv->tree != NULL.  Suggestion from Stefan Kost.


svn path=/trunk/; revision=20208
2008-05-28 12:20:38 +00:00
Kristian Rietveld
9078a149a8 Dear Kris, we live in 2008 now, not 2006.
svn path=/trunk/; revision=20207
2008-05-28 12:18:39 +00:00
Kristian Rietveld
3ed120ebf8 Bug 324282 - add selected signal to cell renderer combo.
2006-05-28  Kristian Rietveld  <kris@imendio.com>

	Bug 324282 - add selected signal to cell renderer combo.

	* gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_class_init),
	(gtk_cell_renderer_combo_changed),
	(gtk_cell_renderer_combo_start_editing): add a new "changed" signal
	that will be emitted as soon as the combo box emitted changed and has
	an active iterator.  (Modified patch based on work by James
	Pelletier).

	* gtk/gtkmarshalers.list: add marshaler.


svn path=/trunk/; revision=20206
2008-05-28 11:49:20 +00:00
Kristian Rietveld
1fa5cda0a9 Refactor expand/collapse timeout handling (amendment to bug 511217).
2008-05-28  Kristian Rietveld  <kris@imendio.com>

	Refactor expand/collapse timeout handling (amendment to bug 511217).

	* gtk/gtktreeview.c (add_expand_collapse_timeout),
	(remove_expand_collapse_timeout): new functions, the remove function
	also clears expanded_collapsed_node,
	(cancel_arrow_animation): moved to be next to the add/remove timeout
	functions,
	(gtk_tree_view_unrealize),
	(gtk_tree_view_row_deleted),
	(gtk_tree_view_set_model),
	(cancel_arrow_animation),
	(gtk_tree_view_real_expand_row),
	(gtk_tree_view_real_collapse_row): use the new add/remove functions.


svn path=/trunk/; revision=20205
2008-05-28 09:26:13 +00:00
Kristian Rietveld
e72827b2cd Amendment of bug 485218 - Strange warning encountered.
2008-05-28  Kristian Rietveld  <kris@imendio.com>

	Amendment of bug 485218 - Strange warning encountered.

	* gtk/gtktreemodelsort.[ch]
	(gtk_tree_model_sort_convert_child_iter_to_iter): return a boolean
	indication whether or not the conversion had succeeded.


svn path=/trunk/; revision=20204
2008-05-28 09:02:29 +00:00
Matthias Clasen
10f642b99f Bug 509788 – GTK+ should use CUPS to set Postscript level of PS output
* modules/printbackends/cups/gtkprintbackendcups.c
        (cups_printer_create_cairo_surface): Fall back to PostScript level 2
        if the printer does not support level 3. Patch by Marek Kašík.


svn path=/trunk/; revision=20203
2008-05-28 01:43:34 +00:00
Matthias Clasen
81320ba90b Bug 404571 – Scroll arrow backgrounds should be painted with different
detail

        * gtk/gtkmenu.c (gtk_menu_paint): Use "menu_scroll_arrow_up/down"
        as detail when drawing scroll arrow backgrounds. Proposed by
        Tommi Komulainen.


svn path=/trunk/; revision=20202
2008-05-28 01:30:37 +00:00
Matthias Clasen
6c993cf8d2 Bug 511217 - potential memory corruption after refreshing a tree_view
* gtk/gtktreeview.c (cancel_arrow_animation): Reset
        expanded_collapsed_node when canceling the animation.
        Patch by Nicholas Setton.


svn path=/trunk/; revision=20201
2008-05-28 00:33:49 +00:00
Michael Natterer
d6ef4416f5 modules/input/gtkimcontextime.h modules/input/gtkimcontextmultipress.h
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* modules/input/gtkimcontextime.h
	* modules/input/gtkimcontextmultipress.h
	* modules/input/gtkimcontextthai.h
	* modules/input/gtkimcontextxim.h: include <gtk/gtk.h> instead of
	individual files.

	* modules/input/gtkimcontextime.c
	* modules/input/gtkimcontextmultipress.c
	* modules/input/gtkimcontextxim.c
	* modules/input/imam-et.c
	* modules/input/imcedilla.c
	* modules/input/imcyrillic-translit.c
	* modules/input/iminuktitut.c
	* modules/input/imipa.c
	* modules/input/imti-er.c
	* modules/input/imti-et.c
	* modules/input/imviqr.c: ditto. Some minor cleanups like moving
	"gtk/gtkintl.h" to the end of includes.


svn path=/trunk/; revision=20200
2008-05-27 23:55:28 +00:00
Michael Natterer
b3a72695b7 modules/engines/pixbuf/pixbuf-style.h include <gtk/gtk.h> instead of
2008-05-28  Michael Natterer  <mitch@imendio.com>

	* modules/engines/pixbuf/pixbuf-style.h
	* modules/engines/pixbuf/pixbuf-rc-style.h: include <gtk/gtk.h>
	instead of individual files.


svn path=/trunk/; revision=20199
2008-05-27 23:45:36 +00:00
Matthias Clasen
ea9c6f301d Bug 485218 - Strange warning encountered
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted):
        (gtk_tree_model_sort_convert_child_iter_to_iter):
        (gtk_tree_model_sort_build_level): Better warnings. Patch
        by Kristian Rietveld.


svn path=/trunk/; revision=20198
2008-05-27 23:16:06 +00:00
Matthias Clasen
2855f81636 Fixes
svn path=/trunk/; revision=20197
2008-05-27 23:02:02 +00:00
Matthias Clasen
8d5e58b632 106574 - Inconsistent increment behavior for gtkspinbutton
* gtk/gtkspinbutton.c (gtk_spin_button_real_value_change):
        Commit the entry text before doing an increment. Patch by
        Björn Lindqvist.


svn path=/trunk/; revision=20196
2008-05-27 22:50:49 +00:00
Federico Mena Quintero
4b1bba8af1 bgo533891 - disallow DnD from the file list into itself
2008-05-27  Federico Mena Quintero  <federico@novell.com>

	http://bugzilla.gnome.org/show_bug.cgi?id=533891 - Don't allow
	drag and drop from the file list into itself, as it doesn't make
	sense (it would just change the current folder).

	* gtk/gtkfilechooserdefault.c (file_list_dest_targets): Use
	GTK_TARGET_OTHER_WIDGET so we don't DnD from the file list into
	itself.

Signed-off-by: Federico Mena Quintero <federico@novell.com>

svn path=/trunk/; revision=20194
2008-05-27 20:33:23 +00:00
Matthias Clasen
58cca43189 Bug 531887 - GtkTooltips is deprecated, but what should I use?
* gtk/tmpl/gtktooltips.sgml: Add a hint for what to use instead

svn path=/trunk/; revision=20193
2008-05-27 20:27:40 +00:00
Tor Lillqvist
59596e699f Use explicit G_MODULE_EXPORT decoration when building the loader in
2008-05-27  Tor Lillqvist  <tml@novell.com>

	* io-*.c: Use explicit G_MODULE_EXPORT decoration when building
	the loader in question as a module.

	* gdk-pixbuf-io.c: Enable included build of the icns and jasper
	loaders.


svn path=/trunk/; revision=20192
2008-05-27 16:51:33 +00:00
Michael Natterer
a4f8d6ccff move deprecated guards around everything, including includes and include
2008-05-27  Michael Natterer  <mitch@imendio.com>

	* gtk/gtksignal.h: move deprecated guards around everything,
	including includes and include guards (just as in all other
	deprecated files).


svn path=/trunk/; revision=20191
2008-05-27 15:07:26 +00:00
Tor Lillqvist
ff89f9050d Use simpler mode for open() on Windows. (No S_I?GRP and S_I?OTH bits are
2008-05-27  Tor Lillqvist  <tml@novell.com>

	* gtk/updateiconcache.c (build_cache): Use simpler mode for open()
	on Windows. (No S_I?GRP and S_I?OTH bits are defined in
	<sys/stat.h> on Windows, and the mode used in open() doesn't
	matter much as there are no rwxrwxrwx bits on Windows anyway.)
	Open file in binary mode. Passing "b" to fdopen() later isn't
	enough.


svn path=/trunk/; revision=20190
2008-05-27 13:03:49 +00:00
Michael Natterer
4449e5032c put back the #define, but call it GDK_PIXBUF_C_COMPILATION.
2008-05-27  Michael Natterer  <mitch@imendio.com>

	* gdk-pixbuf.c: put back the #define, but call it
	GDK_PIXBUF_C_COMPILATION.

	* gdk-pixbuf-features.h.in: make variable export depend on that
	define instead of GDK_PIXBUF_COMPILATION.


svn path=/trunk/; revision=20189
2008-05-27 12:50:45 +00:00
Michael Natterer
f498fc887f Fix and simplify definition of GDK_PIXBUF_VAR:
2008-05-27  Michael Natterer  <mitch@imendio.com>

	Fix and simplify definition of GDK_PIXBUF_VAR:

	* Makefile.am: add -DGDK_PIXBUF_COMPILATION to INCLUDES.

	* gdk-pixbuf.c: don't #define it here. Remove GDK_PIXBUF_VAR from
	the definition of the version variables.

	* gdk-pixbuf-features.h.in: in the !G_PLATFORM_WIN32 case, always
	define GDK_PIXBUF_VAR to "extern". Remove redundant #ifndef
	GDK_PIXBUF_VAR around the whole block, the header itself already
	has include guards.


svn path=/trunk/; revision=20188
2008-05-27 12:05:14 +00:00
10:33:41 Tim Janik
727a7dbf46 guard gtk_widget_get_snapshot() against invalid or invisible widgets.
2008-05-27 10:33:41  Tim Janik  <timj@imendio.com>

        * gtk/gtkwidget.c: guard gtk_widget_get_snapshot() against
        invalid or invisible widgets.


svn path=/trunk/; revision=20187
2008-05-27 08:35:24 +00:00
Matthias Clasen
3f26314d0f Bug 531008 – Crash in gtkprintunixdialog.c
* gtk/gtkprintunixdialog.c: Disconnect signal handlers when
        the dialog closes. Patch by Yevgen Muntyan.


svn path=/trunk/; revision=20186
2008-05-27 04:48:31 +00:00
Matthias Clasen
fd5035c2bd RH bug 248245: cups client printing from gnome applications fail
* modules/printbackends/cups/gtkprintbackendcups.c
        (gtk_print_backend_cups_print_stream): Specify the right server.


svn path=/trunk/; revision=20185
2008-05-27 04:43:41 +00:00
Carlos Garnacho
cdaca42be3 Enable rubberbanding when "select-multiple" is TRUE. Bug #446068.
2008-05-27  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtkfilechooserdefault.c (set_select_multiple): Enable
        rubberbanding when "select-multiple" is TRUE. Bug #446068.

svn path=/trunk/; revision=20184
2008-05-27 00:20:18 +00:00
Carlos Garnacho
5d224f01e6 Enable correctly dialog buttons sensitivity when the anonymous option is
2008-05-27  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): Enable
        correctly dialog buttons sensitivity when the anonymous option is
        enabled by default. Bug #531865.

svn path=/trunk/; revision=20183
2008-05-27 00:12:33 +00:00
Carlos Garnacho
416bda1204 Set password dialog modal and transient for the parent window also if it
2008-05-27  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtkmountoperation.c (gtk_mount_operation_ask_password): Set
        password dialog modal and transient for the parent window also if it
        was specified in the constructor. Bug #531864.

svn path=/trunk/; revision=20182
2008-05-27 00:08:00 +00:00
Richard Hult
f3a6fecb67 Try setting the default font, might need to tweak this.
2008-05-26  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c: (gdk_screen_get_setting): Try
	setting the default font, might need to tweak this.

svn path=/trunk/; revision=20181
2008-05-26 18:51:35 +00:00
Michael Natterer
c9d073570e gdk-pixbuf-xlib.h use G_BEGIN/END_DECLS.
2008-05-26  Michael Natterer  <mitch@imendio.com>

	* gdk-pixbuf-xlib.h
	* gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS.


svn path=/trunk/; revision=20180
2008-05-26 15:14:41 +00:00
Michael Natterer
a21f711c67 examples/gtkdial/gtkdial.h use G_BEGIN/END_DECLS.
2008-05-26  Michael Natterer  <mitch@imendio.com>

	* examples/gtkdial/gtkdial.h
	* modules/input/gtkimcontextthai.h: use G_BEGIN/END_DECLS.


svn path=/trunk/; revision=20179
2008-05-26 14:34:24 +00:00
Michael Natterer
5327e28edd libgail-util/gailmisc.h use G_BEGIN/END_DECLS.
2008-05-26  Michael Natterer  <mitch@imendio.com>

	* libgail-util/gailmisc.h
	* libgail-util/gailtextutil.h: use G_BEGIN/END_DECLS.


svn path=/trunk/; revision=20178
2008-05-26 14:23:33 +00:00
Michael Natterer
49bd7edac0 fix indentation.
2008-05-26  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkimmodule.h: fix indentation.


svn path=/trunk/; revision=20177
2008-05-26 13:07:38 +00:00
Michael Natterer
27dbd9a425 include "gdk/gdk.h" instead of "gdk/gdkscreen.h"
2008-05-26  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkshow.h: include "gdk/gdk.h" instead of "gdk/gdkscreen.h"

	* gtk/gtkshow.c: remove inclusion of single files from gdk/

	Removed trailing whitespace in both files.


svn path=/trunk/; revision=20176
2008-05-26 09:51:48 +00:00
Richard Hult
6fb474f223 Bug 530353 – Mac-like gtk_accelerator_get_label()
2008-05-26  Richard Hult  <richard@imendio.com>

	Bug 530353 – Mac-like gtk_accelerator_get_label()

	* gtk/gtkaccellabel.c: (gtk_accel_label_class_init),
	(append_keyval_symbol), (_gtk_accel_label_class_get_accelerator_label):
	On quartz, make gtk_accelerator_get_label() format a Mac-like
	string, using unicode characters for modifier keys, arrows, delete
	etc. Patch from Yevgen Muntyan.

svn path=/trunk/; revision=20175
2008-05-26 08:54:00 +00:00