Commit Graph

2348 Commits

Author SHA1 Message Date
Cody Russell
ca2987a0f9 Check window state for GDK_WINDOW_STATE_ICONIFIED before doing ShowWindow
2008-03-23  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c (show_window_recurse):
        Check window state for GDK_WINDOW_STATE_ICONIFIED before doing
        ShowWindow (SW_RESTORE).  This fixes a problem where tearing off
        menus from a maximized window would force the window to restore
        its size. (#518846)


svn path=/trunk/; revision=19926
2008-03-23 15:37:40 +00:00
Michael Natterer
57fa18345f gdk/gdkspawn.h gtk/gtkbuilderprivate.h gtk/gtkfilechoosersettings.c
2008-03-14  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkspawn.h
	* gtk/gtkbuilderprivate.h
	* gtk/gtkfilechoosersettings.c
	* gtk/gtksearchenginesimple.c
	* gtk/tests/liststore.c
	* gtk/tests/treestore.c: remove single-file includes of GLib
	headers or replace them by <glib.h> where needed.


svn path=/trunk/; revision=19877
2008-03-14 20:38:58 +00:00
Tor Lillqvist
ea87c926e2 Drop the support for the MSH_MOUSEWHEEL message that MSDN says is used
2008-03-14  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkevents-win32.c: Drop the support for the
	MSH_MOUSEWHEEL message that MSDN says is used only on NT 3.51 and
	Win95. Thanks to mitch for noticing this obsolete code.


svn path=/trunk/; revision=19874
2008-03-14 16:11:50 +00:00
Richard Hult
1438c5623b Patch from Paul Davis, only flush the toplevel once per update.
2008-03-14  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c:
	(gdk_window_quartz_process_all_updates): Patch from Paul Davis,
	only flush the toplevel once per update.

svn path=/trunk/; revision=19871
2008-03-14 10:20:55 +00:00
Michael Natterer
e8c3fbf4d8 removed linux-fb backend files.
2008-03-11  Michael Natterer  <mitch@imendio.com>

	* gdk/linux-fb/*: removed linux-fb backend files.

	* acconfig.h
	* config.h.win32.in
	* docs/README.linux-fb
	* gtk/Makefile.am: remove remaining traces of linux-fb.

	* gtk/gtkwindow-decorate.c: same here. There is some code that
	calls into linux-fb to set window move/resize callbacks. I put it
	in #if 0 as a reminder because we did use decorated windows with
	the DirectFB backend and it did work, so I don't really know why
	this code is needed or how it could work with DirectFB back then.
	The file does actually compile now if DECORATE_WINDOWS is defined,
	but I didn't test with DirectFB to check if it does anything.


svn path=/trunk/; revision=19749
2008-03-11 17:14:00 +00:00
Richard Hult
62f084869d Implement gdk_window_reparent.
2008-03-11  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: Implement gdk_window_reparent.

svn path=/trunk/; revision=19746
2008-03-11 10:14:47 +00:00
Tor Lillqvist
0f7099e308 Bug 520286 - Non-deletable window has no minimize / maximize buttons
2008-03-10  Tor Lillqvist  <tml@novell.com>

	Bug 520286 - Non-deletable window has no minimize / maximize buttons

	* gdk/win32/gdkmain-win32.c (_gdk_win32_window_style_to_string):
	New debugging output function that decodes a set of WS_* bits.

	* gdk/win32/gdkprivate-win32.h: Declare it.

	* gdk/win32/gdkwindow-win32.c (update_single_system_menu_entry):
	New function that enables or disables one menu entry in the system
	menu of a top-level window. (The corresponding decoration will
	then also be enabled or disabled (grayed).)

	(update_style_bits): Do as the comment says and don't try to
	update the window style based on the GdkWMFunctions set for the
	window.
		   
	(update_system_menu): New function that enables or disables the
	system menu entries based on a window's stored set of
	GdkWMFunctions.

	(gdk_window_set_functions): Call update_system_menu() instead of
	update_style_bits().


svn path=/trunk/; revision=19743
2008-03-10 15:48:06 +00:00
Simos Xenitellis
11abc0d691 Fix #321896 - Synch gtkimcontextsimple.c with Xorg
svn path=/trunk/; revision=19706
2008-03-04 11:21:48 +00:00
Richard Hult
f14bf84699 Fix performance regression for borderless transparent windows with shadow.
2008-02-27  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.c:
	* gdk/quartz/GdkQuartzView.h:
	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_set_decorations):
	Fix performance regression for borderless transparent windows
	with shadow.

svn path=/trunk/; revision=19666
2008-02-27 10:49:22 +00:00
Richard Hult
837aec97bb Fix build on tiger.
2008-02-25  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c
	(_gdk_quartz_events_trigger_crossing_events): Fix build on tiger.

svn path=/trunk/; revision=19644
2008-02-25 12:45:56 +00:00
Richard Hult
6dc6aaeaf1 Prevent hidden windows from being shown without gdk's control when
2008-02-24  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzWindow.c: Prevent hidden windows from being
	shown without gdk's control when clicking the dock icon.

svn path=/trunk/; revision=19638
2008-02-24 17:51:22 +00:00
Richard Hult
4dbd9d23d7 Use the subtype field for the custom event that is used to wake up the
2008-02-24  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkprivate-quartz.h:
	* gdk/quartz/gdkeventloop-quartz.c: (got_fd_activity), (poll_func):
	Use the subtype field for the custom event that is used to wake up
	the mainloop so we can have other custom event types.

	* gdk/quartz/gdkevents-quartz.c:
	(_gdk_quartz_events_trigger_crossing_events):
	* gdk/quartz/gdkwindow-quartz.c: (show_window_internal): Create
	crossing events after showing a window if necessary, to work
	around problems with the tracking rect API.

svn path=/trunk/; revision=19637
2008-02-24 17:45:29 +00:00
Richard Hult
fbe4c4f8b6 Set the right window level and shadow after recreating the window.
2008-02-20  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_set_decorations): Set
	the right window level and shadow after recreating the window.

	* gdk/quartz/GdkQuartzView.c: (drawRect): Invalidate the shadow if
	necessary after drawing (bug #517338).

svn path=/trunk/; revision=19622
2008-02-20 20:10:30 +00:00
Richard Hult
66fc6a5fb2 Update the position after showing the window since the window manager
2008-02-17  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzWindow.c: (showAndMakeKey): Update the
	position after showing the window since the window manager might
	not place it where we requested in the first places.

svn path=/trunk/; revision=19605
2008-02-17 10:11:11 +00:00
Richard Hult
8a37bb9364 Clear the toplevel ordering list in all places where the order is
2008-02-17  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (show_window_internal),
	(_gdk_quartz_window_detach_from_parent),
	(_gdk_quartz_window_attach_to_parent), (gdk_window_focus): Clear
	the toplevel ordering list in all places where the order is
	potentially changed. Fixes mouse focus issues for windows with
	a transient parent set.

svn path=/trunk/; revision=19604
2008-02-17 10:01:52 +00:00
Richard Hult
c17e6f1fa2 Highlight the mouse window when event debugging is enabled.
2008-02-17  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c
	(_gdk_quartz_events_update_mouse_window): Highlight the mouse
	window when event debugging is enabled.

svn path=/trunk/; revision=19603
2008-02-17 09:54:57 +00:00
Richard Hult
ccc8afdbf2 Add state to the scroll event (bug #516757, Paul Davis).
2008-02-16  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c (create_scroll_event): Add state
	to the scroll event (bug #516757, Paul Davis).

svn path=/trunk/; revision=19598
2008-02-16 09:49:52 +00:00
Matthias Clasen
580ae3106d Don't install private headers. (#463510)
2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * gdk/Makefile.am: Don't install private headers. (#463510)

        * gdk/gdkinternal.h: Include gdkmedialib.h here, not in
        the installed header gdkprivate.h.



svn path=/trunk/; revision=19595
2008-02-16 04:33:48 +00:00
Richard Hult
2dd5dd6340 Add debugging code to highlight a gdkwindow.
2008-02-16  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkprivate-quartz.h:
	* gdk/quartz/gdkwindow-quartz.c: Add debugging code to highlight a
	gdkwindow.

svn path=/trunk/; revision=19587
2008-02-16 00:27:29 +00:00
Matthias Clasen
45e33fe9c2 Go back to 2.13.0 as version for now, as there was no consensus to do the
2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Go back to 2.13.0 as version for now,
        as there was no consensus to do the jump.

        * many other places: Update Since: tags.



svn path=/trunk/; revision=19586
2008-02-15 23:42:42 +00:00
Richard Hult
db38664512 Adapt to the change to use frame instead of bounds when resizing windows.
2008-02-15  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.c: Adapt to the change to use frame
	instead of bounds when resizing windows.

svn path=/trunk/; revision=19580
2008-02-15 19:06:49 +00:00
Matthias Clasen
741cd0e2ae Fix a small doc issues.
2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkkeys-x11.c:
        * gdk/x11/gdkcolor-x11.c:
        * gdk/gdkpolyreg-generic.c: Fix a small doc issues.


svn path=/trunk/; revision=19579
2008-02-15 19:02:44 +00:00
Matthias Clasen
a8d1c9808c Documentation fixes
svn path=/trunk/; revision=19577
2008-02-15 18:37:34 +00:00
Richard Hult
aa8b00a923 Using makeKeyWindow unfortunately doesn't work in all cases, we must use
2008-02-14  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_focus): Using
	makeKeyWindow unfortunately doesn't work in all cases, we must use
	makeKeyAndOrderFront.

svn path=/trunk/; revision=19568
2008-02-14 21:48:41 +00:00
Richard Hult
b9d88ac6e5 Make sure we leave fullscreen mode if the window is hidden.
2008-02-14  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (get_fullscreen_geometry),
	(gdk_window_hide), (gdk_window_fullscreen),
	(gdk_window_unfullscreen): Make sure we leave fullscreen mode if
	the window is hidden.

svn path=/trunk/; revision=19567
2008-02-14 21:41:59 +00:00
Richard Hult
59687608aa Set frame, not bounds when resizing to be consistent and to avoid
2008-02-14  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzWindow.c: Set frame, not bounds when
	resizing to be consistent and to avoid introducing an internal
	transform in the view.

svn path=/trunk/; revision=19566
2008-02-14 21:34:54 +00:00
Richard Hult
5737e8f78f Coding style fix.
2008-02-14  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkdisplay-quartz.c: (gdk_display_open): Coding style
	fix.

svn path=/trunk/; revision=19565
2008-02-14 15:51:13 +00:00
Johan Dahlin
ddf4a07053 gdk/gdktestutils.h Remove ; trailing G_BEGIN/END_DECLS
2008-02-14  Johan Dahlin  <johan@gnome.org>

    * gdk/gdktestutils.h
    * gtk/gtktestutils.h: Remove ; trailing G_BEGIN/END_DECLS


svn path=/trunk/; revision=19564
2008-02-14 15:48:35 +00:00
Richard Hult
8e66480c6c Fix the return value (return number of colors that failed), and handle
2008-02-13  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkcolor-quartz.c: (gdk_colormap_alloc_colors): Fix
	the return value (return number of colors that failed), and handle
	RGBA colormap.
	(gdk_colormap_free_colors): Fix typo in comment.

svn path=/trunk/; revision=19557
2008-02-13 14:20:51 +00:00
Richard Hult
d6098bb41a Ignore the delta from the NSEvent for now, generating multiple scroll
2008-02-08  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Ignore the
	delta from the NSEvent for now, generating multiple scroll events
	results in a lot of events getting queued up and things get really
	slow.

svn path=/trunk/; revision=19499
2008-02-08 19:08:40 +00:00
Cody Russell
e97c716a21 gdk/win32/gdkevents-win32.c Fixed two declarations in the middle of a
2008-02-07  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c
        * gdk/win32/gdkwindow-win32.c: Fixed two declarations in the middle
        of a block that were causing compile problems on old
        compilers. (#515053, reported by Kazuki IWAMOTO)


svn path=/trunk/; revision=19493
2008-02-07 19:25:07 +00:00
Christian Persch
08856e5af9 If the pixbuf has an alpha channel, use gdk_draw_rgb_32_image to draw it
2008-02-07  Christian Persch  <chpe@gnome.org>

	* gdk/gdkpixbuf-render.c:
	(gdk_pixbuf_render_pixmap_and_mask_for_colormap): If the pixbuf has an
	alpha channel, use gdk_draw_rgb_32_image to draw it to the pixmap;
	otherwise there will be random pixel values in the semi-transparent
	area of the pixbuf within the mask. Bug #487865.

svn path=/trunk/; revision=19488
2008-02-06 23:08:07 +00:00
Cody Russell
6e03989a4c Also check that the window is not mapped.
svn path=/trunk/; revision=19485
2008-02-06 17:01:47 +00:00
Cody Russell
84dd6a99b8 Check if the window is a temp window, otherwise things get wonky when you
2008-02-06  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c: Check if the window is a temp window,
        otherwise things get wonky when you click on a menu.  This fixes
        a regression caused in #505928.  Thanks to Tor for spotting this
        one!  (#514789)


svn path=/trunk/; revision=19482
2008-02-06 16:32:41 +00:00
Cody Russell
275760cd0c Walk down the stack until we get to a window that is mapped. Otherwise
2008-02-05  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkwindow-win32.c (_gdk_modal_current): Walk
        down the stack until we get to a window that is mapped.
        Otherwise hiding a window will cause all windows in the app
        to be blocked. (#514643)


svn path=/trunk/; revision=19477
2008-02-05 23:46:35 +00:00
Cody Russell
db58254c5c gdk/win32/gdkprivate-win32.h gdk/win32/gdkevents-win32.c
2008-02-05  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkprivate-win32.h
        * gdk/win32/gdkevents-win32.c
        * gdk/win32/gdkwindow-win32.c
        * gdk/win32/gdkwindow-win32.h
        * gdk/win32/gdkwin32.h:
        Modal window rework.  (#455627 and #511111)


svn path=/trunk/; revision=19463
2008-02-05 16:47:24 +00:00
Cody Russell
857fe308f5 Refactored some of the window hiding/showing code from WM_ACTIVATE to
2008-01-31  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c:
        Refactored some of the window hiding/showing code from
        WM_ACTIVATE to WM_SIZE and WM_SYSCOMMAND.  Having this
        under WM_ACTIVATE was causing the application to go into
        a weird state when the user right-clicked on the taskbar
        entry of a window that was minimized.  (#505928)


svn path=/trunk/; revision=19451
2008-01-31 22:40:37 +00:00
Sven Neumann
53fa8e3174 applied patch from Denis Oliver Kropp <dok@directfb.org>.
2008-01-31  Sven Neumann  <sven@gimp.org>

	* gdk/directfb/gdkimage-directfb.c 
(_gdk_directfb_copy_to_image):
	applied patch from Denis Oliver Kropp <dok@directfb.org>.


svn path=/trunk/; revision=19448
2008-01-31 17:27:54 +00:00
Sven Neumann
9e528c18ad gdk/directfb/gdkdisplay-directfb.c gdk/directfb/gdkdrawable-directfb.c
2008-01-31  Sven Neumann  <sven@gimp.org>

	* gdk/directfb/gdkdisplay-directfb.c
	* gdk/directfb/gdkdrawable-directfb.c
	* gdk/directfb/gdkprivate-directfb.h
	* gdk/directfb/gdkwindow-directfb.c: applied patch from Denis
	Oliver Kropp <dok@directfb.org>. Fixes remaining warnings.


svn path=/trunk/; revision=19447
2008-01-31 17:25:19 +00:00
Richard Hult
0ca4891ee0 Another attempt at fixing focus issues with undecorated windows. Revert
2008-01-31  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.c: Another attempt at fixing focus
	issues with undecorated windows. Revert the change done on
	2008-01-25 and fix it by using the view's bounds instead. The
	bounds will always be up to date when setting up the tracking
	rect, so this should be more robust.

svn path=/trunk/; revision=19445
2008-01-31 14:05:47 +00:00
Sven Neumann
4586bc438a gdk/directfb/gdkdrawable-directfb.c gdk/directfb/gdkwindow-directfb.c
2008-01-30  Sven Neumann  <sven@gimp.org>

	* gdk/directfb/gdkdrawable-directfb.c
	* gdk/directfb/gdkwindow-directfb.c
	* gdk/directfb/gdkprivate-directfb.h: applied patch from Denis
	Oliver Kropp <dok@directfb.org>. Adds debug messages using
	DirectFB's debugging system


svn path=/trunk/; revision=19433
2008-01-30 19:51:30 +00:00
Sven Neumann
49049eb87b gdk/directfb/gdkdirectfb.h gdk/directfb/gdkdisplay-directfb.c
2008-01-30  Sven Neumann  <sven@gimp.org>

	* gdk/directfb/gdkdirectfb.h
	* gdk/directfb/gdkdisplay-directfb.c
	* gdk/directfb/gdkdrawable-directfb.c
	* gdk/directfb/gdkim-directfb.c
	* gdk/directfb/gdkimage-directfb.c
	* gdk/directfb/gdkinput-directfb.c
	* gdk/directfb/gdkmain-directfb.c
	* gdk/directfb/gdkpixmap-directfb.c
	* gdk/directfb/gdktestutils-directfb.c
	* gdk/directfb/gdkvisual-directfb.c
	* gdk/directfb/gdkwindow-directfb.c: applied patch from Denis
	Oliver Kropp <dok@directfb.org>. Fixes various warnings, some
	errors and has some cleanups.


svn path=/trunk/; revision=19432
2008-01-30 19:43:16 +00:00
Richard Hult
7b8050aff2 Don't recreate a tracking rect if it didn't change, fixes focus event
2008-01-25  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.c: Don't recreate a tracking rect if it
	didn't change, fixes focus event issues for undecorated windows.

svn path=/trunk/; revision=19402
2008-01-25 13:19:02 +00:00
Richard Hult
41e1be54e8 Fix compile warnings (add missing const and remove unused variables).
2008-01-25  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: Fix compile warnings (add missing
	const and remove unused variables).

svn path=/trunk/; revision=19401
2008-01-25 13:13:05 +00:00
Mathias Hasselmann
0a87107b3c Add gdk_app_launch_context_get_type() to gdk.symbols (#511308, Kazuki
IWAMOTO).

* gdk/gdk.symbols: Add gdk_app_launch_context_get_type().

svn path=/trunk/; revision=19393
2008-01-22 19:29:18 +00:00
Michael Natterer
8243e3d415 gdk/gdkdisplay.h gdk/gdkdrawable.h gdk/gdkevents.h gdk/gdkpango.h
2008-01-15  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkdisplay.h
	* gdk/gdkdrawable.h
	* gdk/gdkevents.h
	* gdk/gdkpango.h
	* gdk/gdkregion.h
	* gdk/gdkrgb.h
	* gdk/gdkwindow.h: made more struct pointer and array parameters
	const. GDK should now be constified as far as possible without
	breaking source compatibility. Includes some minor cleanup like
	indentation and s/nfoo/n_foo/ (bug #508544).

	* gdk/gdkdisplay.c
	* gdk/gdkdraw.c
	* gdk/gdkevents.c
	* gdk/gdkpango.c
	* gdk/gdkregion-generic.c
	* gdk/gdkrgb.c
	* gdk/directfb/gdkdisplay-directfb.c
	* gdk/directfb/gdkwindow-directfb.c
	* gdk/quartz/gdkdisplay-quartz.c
	* gdk/quartz/gdkwindow-quartz.c
	* gdk/win32/gdkdisplay-win32.c
	* gdk/win32/gdkwindow-win32.c
	* gdk/x11/gdkdisplay-x11.c
	* gdk/x11/gdkwindow-x11.c: changed accordingly.


svn path=/trunk/; revision=19372
2008-01-15 15:32:37 +00:00
Michael Natterer
bbaf1be625 cast the return value of gdk_screen_get_font_options() to gpointer to get
2008-01-14  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkscreen.c (gdk_screen_get_property): cast the return value
	of gdk_screen_get_font_options() to gpointer to get rid of const
	warning.


svn path=/trunk/; revision=19370
2008-01-14 15:00:57 +00:00
Michael Natterer
92f86e0496 gdk/gdk.h gdk/gdkcairo.h gdk/gdkcolor.h gdk/gdkgc.h gdk/gdkinternals.h
2008-01-14  Michael Natterer  <mitch@imendio.com>

	* gdk/gdk.h
	* gdk/gdkcairo.h
	* gdk/gdkcolor.h
	* gdk/gdkgc.h
	* gdk/gdkinternals.h
	* gdk/gdkregion.h
	* gdk/gdkwindow.h: made GdkRectangle*, GdkRegion* and GdkColor*
	parameters const.

	* gdk/gdkcairo.c
	* gdk/gdkgc.c
	* gdk/gdkwindow.c
	* gdk/gdkrectangle.c
	* gdk/gdkpolyreg-generic.c
	* gdk/gdkregion-generic.c
	* gdk/directfb/gdkcolor-directfb.c
	* gdk/directfb/gdkgc-directfb.c
	* gdk/directfb/gdkgeometry-directfb.c
	* gdk/directfb/gdkwindow-directfb.c
	* gdk/quartz/gdkcolor-quartz.c
	* gdk/quartz/gdkgc-quartz.c
	* gdk/quartz/gdkgeometry-quartz.c
	* gdk/quartz/gdkwindow-quartz.c
	* gdk/win32/gdkcolor-win32.c
	* gdk/win32/gdkgc-win32.c
	* gdk/win32/gdkgeometry-win32.c
	* gdk/win32/gdkprivate-win32.h
	* gdk/win32/gdkwindow-win32.c
	* gdk/x11/gdkcolor-x11.c
	* gdk/x11/gdkgc-x11.c
	* gdk/x11/gdkgeometry-x11.c
	* gdk/x11/gdkmain-x11.c
	* gdk/x11/gdkprivate-x11.h
	* gdk/x11/gdkwindow-x11.c: changed accordingly.

	* gdk/gdkpolyreg-generic.c: uncruftify to have proper function
	headers.


svn path=/trunk/; revision=19365
2008-01-14 14:02:12 +00:00
Tor Lillqvist
8dab0b9360 gdk/win32/gdkdisplay-win32.c gdk/win32/gdkglobals-win32.c
2008-01-10  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkdisplay-win32.c
	* gdk/win32/gdkglobals-win32.c
	* gdk/win32/gdkprivate-win32.h
	* gdk/win32/gdkscreen-win32.c
	* gdk/win32/gdkwindow-win32.c: Implement
	gdk_screen_get_monitor_width_mm(), gdk_screen_get_monitor_height_mm()
	and gdk_screen_get_monitor_plug_name(). Thanks to Kazuki
	Iwamoto. (#505753)


svn path=/trunk/; revision=19346
2008-01-10 21:40:48 +00:00
Cody Russell
4dc47ed700 Properly ref/unref windows and parents. (#506769)
2008-01-10  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkwindow-win32.c: (gdk_window_set_transient_for),
        Properly ref/unref windows and parents.  (#506769)


svn path=/trunk/; revision=19344
2008-01-10 20:58:40 +00:00
Richard Hult
adad4cf884 Move the tracking rect workaround from here...
2008-01-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (show_window_internal),
	(gdk_window_hide), (move_resize_window_internal): Move the
	tracking rect workaround from here...

	* gdk/quartz/GdkQuartzWindow.c:
	* gdk/quartz/GdkQuartzWindow.h: ...to here, and ignore window
	movements during showing/hiding operations. Fixes bug #508516.

svn path=/trunk/; revision=19342
2008-01-10 19:35:53 +00:00
Michael Natterer
d293166713 add these functions to make it build again.
2008-01-10  Michael Natterer  <mitch@imendio.com>

	* gdk/directfb/gdkscreen-directfb.c
	(gdk_screen_get_monitor_width_mm)
	(gdk_screen_get_monitor_height_mm)
	(gdk_screen_get_monitor_plug_name): add these functions to make
	it build again.


svn path=/trunk/; revision=19340
2008-01-10 17:04:45 +00:00
Michael Natterer
3db2d18042 don't forget to set the time in the returned GdkTimeCoords.
2008-01-04  Michael Natterer  <mitch@imendio.com>

	* gdk/x11/gdkinput-x11.c (_gdk_device_get_history): don't forget
	to set the time in the returned GdkTimeCoords.


svn path=/trunk/; revision=19304
2008-01-04 16:21:42 +00:00
Matthias Clasen
c30e1d8e00 Don't return NULL.
2007-12-28  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkwindow-x11.c (get_default_title): Don't return NULL.


svn path=/trunk/; revision=19274
2007-12-28 15:51:31 +00:00
Christian Persch
82568d02e0 Fir the patch from bug #504886 not to read unitialised memory.
2007-12-27  Christian Persch  <chpe@gnome.org>

	* gdk/x11/gdkscreen-x11.c: (init_randr12): Fir the patch from 
	bug #504886 not to read unitialised memory.

svn path=/trunk/; revision=19247
2007-12-27 12:09:06 +00:00
Matthias Clasen
0e8282a0a7 Remove unneeded includes. (#505411, Kazuki IWAMOTO)
2007-12-24  Matthias Clasen  <mclasen@redhat.com>

        * gdk/gdkapplaunchcontext.c: Remove unneeded includes. (#505411,
         Kazuki IWAMOTO)



svn path=/trunk/; revision=19235
2007-12-25 04:25:38 +00:00
Cody Russell
045db5be38 Check that the window is mapped before setting SW_RESTORE or SW_MINIMIZE.
2007-12-23  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c (show_window_recurse): Check that
        the window is mapped before setting SW_RESTORE or SW_MINIMIZE.
        Fixes a regression caused by #164537 patch where transient
        windows that are hidden get shown (incorrectly) when their
        parents are minimized. (#504984)


svn path=/trunk/; revision=19231
2007-12-23 21:14:09 +00:00
Christian Persch
102db3cc7d Plug mem leaks. Bug #504886.
2007-12-22  Christian Persch  <chpe@gnome.org>

	* gdk/x11/gdkscreen-x11.c: (init_randr12): Plug mem leaks. Bug #504886.

svn path=/trunk/; revision=19223
2007-12-22 21:03:40 +00:00
Richard Hult
a28c785bcd Plug leak of destroyed subviews, fixes bug #504753.
2007-12-21  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_destroy):
	Plug leak of destroyed subviews, fixes bug #504753.

svn path=/trunk/; revision=19218
2007-12-21 20:21:05 +00:00
Alexander Larsson
2003e0ffa0 Update for gio API changes
2007-12-20  Alexander Larsson  <alexl@redhat.com>

        * gdk/x11/gdkapplaunchcontext-x11.c:
	Update for gio API changes


svn path=/trunk/; revision=19208
2007-12-20 13:40:04 +00:00
Richard Hult
14ae647a37 Make manual resizing smoother by processing events after changing the
2007-12-20  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzWindow.c:
	* gdk/quartz/GdkQuartzWindow.h: Make manual resizing smoother by
	processing events after changing the size.

svn path=/trunk/; revision=19206
2007-12-20 13:25:37 +00:00
Matthias Clasen
f8a1be3a04 Add a gtk-im-module GTK setting
2007-12-17  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtksettings.c: Add a gtk-im-module GTK setting
        * gdk/win32/gdkproperty-win32.c:
        * gdk/x11/gdksettings.c: ...and back it by a Gtk/IMModule X setting.

        * gtk/gtkimmodule.[hc]:
        * gtk/gtkimmulticontext.[hc]: When determining the default context,
        look at the gtk-im-module setting, and listen for changes to the
        setting.  (#502446, Akira Tagoh)


svn path=/trunk/; revision=19195
2007-12-18 03:24:17 +00:00
Sebastian Dröge
33499debed Use u32 instead of __u32 and u8 instead of __u8 as the other types are
* gdk/directfb/gdkcursor-directfb.c: (gdk_cursor_new_for_display):
Use u32 instead of __u32 and u8 instead of __u8 as the other types
are deprecated since DirectFB 1.0.0. If compiling with an older
version define the new type name to the old types. Fixes bug #503190.

svn path=/trunk/; revision=19182
2007-12-15 05:01:30 +00:00
Michael Natterer
a84ac8e3d8 gdk/gdkinternals.h #include <gio/gio.h> instead of individual files.
2007-12-14  Michael Natterer  <mitch@imendio.com>

	* gdk/gdkinternals.h
	* gdk/gdkapplaunchcontext.h: #include <gio/gio.h> instead of
	individual files.

	* gdk/gdkapplaunchcontext.c
	* gdk/x11/gdkapplaunchcontext-x11.c: remove all gio includes, the
	header already includes everything now.


svn path=/trunk/; revision=19180
2007-12-14 11:20:10 +00:00
Søren Sandmann
053cbe6daf Add RandR 1.2 support
Thu Dec 13 13:14:50 2007  Søren Sandmann  <sandmann@redhat.com>

        * Add RandR 1.2 support

        - New monitors_changed signal - New API to get width/height of
          monitors, and the name of the plug



svn path=/trunk/; revision=19173
2007-12-13 18:27:05 +00:00
Michael Natterer
64c73a61b7 Remove all .cvsignore files.
svn path=/trunk/; revision=19169
2007-12-13 11:18:45 +00:00
Mathias Hasselmann
d22e4ed9ce Make the code compile again after the GdkAppLaunchContext changes.
* configure.in: Add gio-2.0 to GDK_PACKAGES.
* gdk/gdkinternals.h: Include <gio/gappinfo.h>.

svn path=/trunk/; revision=19168
2007-12-13 10:05:07 +00:00
Matthias Clasen
9bf93a6fc8 Add docs
svn path=/trunk/; revision=19167
2007-12-13 05:49:11 +00:00
Matthias Clasen
61666179b4 Forgotten file
svn path=/trunk/; revision=19166
2007-12-13 05:17:04 +00:00
Matthias Clasen
1397a9fd7d Implement GAppLaunchContext in gdk, providing startup notification.
2007-12-12  Matthias Clasen  <mclasen@redhat.com>

        * gdk/gdkapplaunchcontext.[hc]: Implement GAppLaunchContext
        in gdk, providing startup notification.  (#503203)

        * gdk/x11/gdkapplaunchcontext-x11.c:
        * gdk/win32/gdkapplaunchcontext-win32.c:
        * gdk/quartz/gdkapplaunchcontext-quartz.c:
        * gdk/directfb/gdkapplaunchcontext-directfb.c: Backend-specific
        parts. All but X11 are just empty stubs for now.

        * gdk/gdk.symbols:
        * gdk/gdkinternals.h:
        * gdk/Makefile.am:
        * gdk/x11/Makefile.am:
        * gdk/win32/Makefile.am:
        * gdk/quartz/Makefile.am:
        * gdk/directfb/Makefile.am: Necessary glue.



svn path=/trunk/; revision=19165
2007-12-13 05:16:33 +00:00
Attilio Fiandrotti
c907a97556 Applied a patch by Claudio Ciccani which adds testing functions to the
2007-12-11  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>

	* gdk/directfb/gdktestutils-directfb.c:
	* gdk/directfb/Makefile.am: Applied a patch by Claudio Ciccani
	which adds testing functions to the DirectFB backend.

svn path=/trunk/; revision=19163
2007-12-11 20:20:29 +00:00
Attilio Fiandrotti
15d6ae4003 Applied a patch by Claudio Ciccani which fixes the mixing of gdk and cairo
2007-12-11  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>

	* gdk/directfb/gdkdrawable-directfb.c: Applied a patch by Claudio
	Ciccani	which fixes the mixing of gdk and cairo rendering.

svn path=/trunk/; revision=19161
2007-12-11 20:09:01 +00:00
Richard Hult
8082fbc437 Install backend specific header (bug #405915). Also add a getter for the
2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/Makefile.am:
	* gdk/quartz/gdkquartz.h:
	* gdk/quartz/gdkwindow-quartz.c: Install backend specific
	header (bug #405915). Also add a getter for the toplevel nswindow.

svn path=/trunk/; revision=19151
2007-12-10 20:44:23 +00:00
Richard Hult
d7f3ab0569 Replace the autorelease pools used for each drawing context and in
2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkdrawable-quartz.c:
	(gdk_quartz_drawable_get_context),
	(gdk_quartz_drawable_release_context):
	* gdk/quartz/gdkeventloop-quartz.c: (gdk_event_prepare),
	(gdk_event_check), (gdk_event_dispatch), (poll_func):
	* gdk/quartz/gdkwindow-quartz.h: Replace the autorelease pools
	used for each drawing context and in prepare, dispatch and poll
	with one that exists across each main loop iteration. Fixes leaks
	on leopard and protects against future leaks introduce when the
	underlying system changes again (bug #492977).

svn path=/trunk/; revision=19149
2007-12-10 20:22:08 +00:00
Richard Hult
f4baa51f49 Fix the check for no changes to position and size.
2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (move_resize_window_internal):
	Fix the check for no changes to position and size.

svn path=/trunk/; revision=19147
2007-12-10 19:49:52 +00:00
Richard Hult
7639a61116 Ignore drawRect calls with zero sized areas at (0, 0), patch from Paul
2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzView.c: Ignore drawRect calls with zero
	sized areas at (0, 0), patch from Paul Davis.

svn path=/trunk/; revision=19145
2007-12-10 19:38:47 +00:00
Richard Hult
fd8c2c01a9 Fix a bug where we could end up trying to handle the same event more than
2007-12-10  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkprivate-quartz.h: 
	* gdk/quartz/gdkeventloop-quartz.c:
	(_gdk_quartz_event_loop_get_pending),
	(_gdk_quartz_event_loop_check_pending),
	(_gdk_quartz_event_loop_release_event), (gdk_event_prepare),
	(gdk_event_check), (gdk_event_dispatch):
	* gdk/quartz/gdkevents-quartz.c: (gdk_events_pending)
	(_gdk_events_queue): Fix a bug where we could end up trying to
	handle the same event more than once. Based on patch from Paul
	Davis.

svn path=/trunk/; revision=19143
2007-12-10 19:00:23 +00:00
Attilio Fiandrotti
494b0e4ca9 Minor fix for code added in r19132
svn path=/trunk/; revision=19137
2007-12-09 22:53:54 +00:00
Attilio Fiandrotti
2d20a49584 Committed several patches by Denis Oliver Knoppwhich are expected to improve the performance of the DirectFB backend
svn path=/trunk/; revision=19132
2007-12-09 10:03:30 +00:00
Tommi Komulainen
62315bd5d0 Remove trailing whitespace that can trigger false positives in abicheck.sh
2007-12-06  Tommi Komulainen  <tommi.komulainen@iki.fi>

	* gdk-pixbuf/gdk-pixbuf.symbols:
	* gdk/gdk.symbols:
	* gdk/gtk.symbols: Remove trailing whitespace that can trigger false
	positives in abicheck.sh

svn path=/trunk/; revision=19124
2007-12-06 20:14:17 +00:00
Attilio Fiandrotti
01f8212ad3 Committed a patch by DOK to fix GDK events generations in the DirectFB backend
svn path=/trunk/; revision=19122
2007-12-06 17:45:05 +00:00
Richard Hult
fd069852e0 Fix warning when switching spaces in leopard.
2007-12-06  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c:
	(synthesize_crossing_events_for_ns_event): Fix warning when
	switching spaces in leopard.

svn path=/trunk/; revision=19119
2007-12-06 12:39:01 +00:00
Richard Hult
4a82f84a28 Fully initialize the root window, fixes bug #501583.
2007-12-04  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_init):
	Fully initialize the root window, fixes bug #501583.

svn path=/trunk/; revision=19109
2007-12-04 19:08:11 +00:00
Richard Hult
4a1478d6d7 Don't crash when a parent relative bg pixmap is set, and no parent has a
2007-12-03  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c:
	(gdk_window_impl_quartz_begin_paint_region): Don't crash when a
	parent relative bg pixmap is set, and no parent has a bg
	pixmap. Fixes bug #500804.

svn path=/trunk/; revision=19100
2007-12-03 19:34:30 +00:00
Matthias Clasen
736f86b303 Use templates for glib-mkenums calls instead of complicated commandlines
2007-11-26  Matthias Clasen  <mclasen@redhat.com>

        Use templates for glib-mkenums calls instead of
        complicated commandlines in Makefiles.  (#429910)

        * gdk-pixbuf/Makefile.am:
        * gdk/Makefile.am:
        * gtk/Makefile.am:
        * perf/Makefile.am: Use templates for glib-mkenums

        * gdk-pixbuf/gdk-pixbuf-enum-types.[ch].template:
        * gdk/gdkenumtypes.[ch].template:
        * gtk/gtktypebuiltings.[ch].template:
        * perf/typebuiltins.[ch].template: The templates


svn path=/trunk/; revision=19053
2007-11-26 17:32:19 +00:00
Tor Lillqvist
19209e3a15 Use the monitor the window currently is on, not always the primary
2007-11-26  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkwindow-win32.c (gdk_window_fullscreen): Use the
	monitor the window currently is on, not always the primary
	monitor. (#463865, Tim Evans)


svn path=/trunk/; revision=19047
2007-11-25 22:59:50 +00:00
Tor Lillqvist
fa7b91a8f7 New file, dummy implementations.
2007-11-26  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdktestutils-win32.c: New file, dummy implementations.

	* gdk/win32/Makefile.am: Add it.


svn path=/trunk/; revision=19045
2007-11-25 22:25:18 +00:00
Matthias Clasen
4896e24bb1 Require gtk-doc 1.8
2007-11-25  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Require gtk-doc 1.8

        * */*.c: Use gtk-doc abbreviations for examples in docs.


svn path=/trunk/; revision=19041
2007-11-25 06:51:19 +00:00
15:39:40 Tim Janik
2dc08ada49 call g_test_init() from gtk_test_init().
2007-11-22 15:39:40  Tim Janik  <timj@imendio.com>

        * gtk/gtktestutils.c: call g_test_init() from gtk_test_init().

        * gtk/tests/testing.c: use g_test_add_func() to register tests and use
	g_test_run() to run the tests to integrate with the testing framework.

        * gtk/tests/Makefile.am: removed exemplary testing rules.

        * Makefile.am, gtk/tests/Makefile.am, gtk/Makefile.am:
        * gtk/xdgmime/Makefile.am, gtk/theme-bits/Makefile.am:
        * tests/Makefile.am, docs/reference/gdk-pixbuf/Makefile.am:
        * docs/reference/gdk/Makefile.am, docs/reference/gtk/Makefile.am:
        * docs/reference/Makefile.am, docs/tools/Makefile.am:
        * docs/tutorial/Makefile.am, docs/faq/Makefile.am, docs/Makefile.am:
        * gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/Makefile.am:
        * demos/gtk-demo/Makefile.am, demos/Makefile.am:
        * modules/input/Makefile.am, modules/printbackends/file/Makefile.am:
        * modules/printbackends/test/Makefile.am, modules/printbackends/Makefile.am:
        * modules/printbackends/cups/Makefile.am, modules/printbackends/lpr/Makefile.am:
        * modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am:
        * modules/engines/ms-windows/Theme/Makefile.am:
        * modules/engines/ms-windows/Makefile.am:
        * modules/engines/Makefile.am,  modules/engines/pixbuf/Makefile.am:
        * modules/Makefile.am, m4macros/Makefile.am, perf/Makefile.am:
        * contrib/Makefile.am, contrib/gdk-pixbuf-xlib/Makefile.am:
        * gdk/directfb/Makefile.am, gdk/linux-fb/Makefile.am:
        * gdk/quartz/Makefile.am, gdk/win32/rc/Makefile.am:
        * gdk/win32/Makefile.am, gdk/x11/Makefile.am, gdk/Makefile.am:
	include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments.



svn path=/trunk/; revision=19033
2007-11-22 14:38:26 +00:00
Richard Hult
0d81a39f5b * gdk/quartz/gdktestutils-quartz.c: Add stubs for the testing functions to
2007-11-21  Richard Hult  <richard@imendio.com>

	* gdk/quartz/Makefile.am: * gdk/quartz/gdktestutils-quartz.c: Add
	stubs for the testing functions to fix the build.

svn path=/trunk/; revision=19023
2007-11-21 11:29:03 +00:00
Ross Burton
866049c66b Add xsetting for gtk-scrolled-window-placement (#458103).
2007-11-21  Ross Burton  <ross@openedhand.com>

	* gdk/x11/gdksettings.c:
	Add xsetting for gtk-scrolled-window-placement (#458103).

svn path=/trunk/; revision=19021
2007-11-21 09:22:48 +00:00
Behdad Esfahbod
f4d4a6e6cb Add Gtk/EnableAccels and Gtk/EnableMnemonics xsettings for
2007-11-21  Behdad Esfahbod  <behdad@gnome.org>

        * gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): Add
        Gtk/EnableAccels and Gtk/EnableMnemonics xsettings for
        gtk-enable-accels and gtk-enable-mnemonics GtkSettings respectively.
        (#436536, Tommi Komulainen)


svn path=/trunk/; revision=19019
2007-11-21 09:12:59 +00:00
Tim Janik
40695ee368 Fixed copyright for newly submitted files.
svn path=/trunk/; revision=19014
2007-11-20 17:44:06 +00:00
Tim Janik
4f7a2da8e8 Moved Gdk test functions from Gtk+ to Gdk test utils.
* gdk/Makefile.am: added gdktestutils.h to public includes.

* gdk/gdk.h: added gdktestutils.h to public includes.

* gdk/gdk.symbols: added gdk_test_simulate_button, gdk_test_simulate_key,
gdk_test_render_sync.

* gdk/gdktestutils.h: new file, added prototypes for gdk_test_simulate_button,
gdk_test_simulate_key, gdk_test_render_sync.

* gdk/x11/Makefile.am: build gdktestutils-x11.c.

* gdk/x11/gdktestutils-x11.c: implemented gdk_test_simulate_button,
gdk_test_simulate_key, gdk_test_render_sync.

* gtk/gtktestutils.c:
* gtk/gtktestutils.h:
* gtk/gtk.symbols: removed gtk_test_simulate_button
gtk_test_simulate_key, gtk_test_xserver_render_sync.

* gtk/tests/testing.c: call gdk_test_render_sync.

svn path=/trunk/; revision=19012
2007-11-20 15:03:31 +00:00
Sven Herzberg
50f412114b Reviewed by Richard:
2007-11-12  Sven Herzberg  <herzi@imendio.com>

	Reviewed by Richard:

	* gdk/quartz/gdkquartz.h: include <gdk/gdkprivate.h> with angle
	brackets and not with quotation marks


svn path=/trunk/; revision=18987
2007-11-13 21:05:09 +00:00
Alexander Larsson
118e9f41e2 Avoid loading the ISO8859-1 iconv module. We're already doing all the
2007-11-12  Alexander Larsson  <alexl@redhat.com>

        * gdk/x11/gdkselection-x11.c:
	Avoid loading the ISO8859-1 iconv module.
	We're already doing all the required work anyway.
	This saves 4kb private dirty memory per gtk+ process



svn path=/trunk/; revision=18986
2007-11-12 15:51:55 +00:00
Kristian Rietveld
50a766c95f guard for windows with GDK_WINDOW_DESTROYED set. (Fixes #482531, reported
2007-11-09  Kristian Rietveld  <kris@imendio.com>

	* gdk/gdkwindow.c (gdk_window_process_all_updates): guard for
	windows with GDK_WINDOW_DESTROYED set.  (Fixes #482531, reported
	by Sebastien Bacher).


svn path=/trunk/; revision=18975
2007-11-09 22:44:31 +00:00
Richard Hult
821432ac4e Make shift tab work with unicode layouts (e.g. all Leopard layouts), fixes
2007-11-04  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkkeys-quartz.c: (maybe_update_keymap): Make shift
	tab work with unicode layouts (e.g. all Leopard layouts), fixes
	bug #493404.

svn path=/trunk/; revision=18967
2007-11-04 18:11:22 +00:00
Richard Hult
e518a8d6e8 Make the grab breaking on window move work on Leopard (as well as Tiger)
2007-11-03  Richard Hult  <richard@imendio.com>

	* gdk/quartz/GdkQuartzWindow.c:
	* gdk/quartz/GdkQuartzWindow.h: Make the grab breaking on window
	move work on Leopard (as well as Tiger) by ignoring which mouse
	button is pressed.

svn path=/trunk/; revision=18964
2007-11-03 09:52:34 +00:00
Richard Hult
01ce77f540 Calculate the frame rect correctly when resizing toplevels, fixes bug
2007-11-03  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (move_resize_window_internal):
	Calculate the frame rect correctly when resizing toplevels, fixes
	bug #492209.

svn path=/trunk/; revision=18963
2007-11-03 09:45:25 +00:00