diff options
| author | Havoc Pennington <hp@redhat.com> | 2002-12-19 20:18:54 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-12-19 20:18:54 +0000 |
| commit | 91641c2cf324b03da9e15cfbf13ebf90a318ddb3 (patch) | |
| tree | 682354a915ccb61f8cd42662b946297f006d5fed /src/display.c | |
| parent | 4045ee474d25db2aab40014368f4c9dc34af7e85 (diff) | |
| download | metacity-91641c2cf324b03da9e15cfbf13ebf90a318ddb3.tar.gz | |
select ColormapChangeMask on toplevel windows, maybe a partial fix for
2002-12-18 Havoc Pennington <hp@redhat.com>
* src/window.c (meta_window_new): select ColormapChangeMask
on toplevel windows, maybe a partial fix for #101478
2002-12-17 Havoc Pennington <hp@pobox.com>
* src/display.c (meta_display_begin_grab_op): don't use "(null)"
for null pointers, use "none", so I can distinguish
glibc-generated (null) which is a bug.
(key_event_description): ditto
(meta_display_begin_grab_op): ditto
* src/window.c (update_sm_hints): ditto
* src/keybindings.c (reload_modmap): ditto
(meta_display_process_key_event): ditto
Diffstat (limited to 'src/display.c')
| -rw-r--r-- | src/display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/display.c b/src/display.c index 2b20411d..4b8ac053 100644 --- a/src/display.c +++ b/src/display.c @@ -2082,7 +2082,7 @@ key_event_description (Display *xdisplay, str = XKeysymToString (keysym); return g_strdup_printf ("Key '%s' state 0x%x", - str ? str : "(null)", event->xkey.state); + str ? str : "none", event->xkey.state); } #endif /* WITH_VERBOSE_MODE */ @@ -2623,13 +2623,13 @@ meta_display_begin_grab_op (MetaDisplay *display, meta_topic (META_DEBUG_WINDOW_OPS, "Doing grab op %d on window %s button %d pointer already grabbed: %d\n", - op, window ? window->desc : "(null)", button, pointer_already_grabbed); + op, window ? window->desc : "none", button, pointer_already_grabbed); if (display->grab_op != META_GRAB_OP_NONE) { meta_warning ("Attempt to perform window operation %d on window %s when operation %d on %s already in effect\n", - op, window ? window->desc : "(null)", display->grab_op, - display->grab_window ? display->grab_window->desc : "(null)"); + op, window ? window->desc : "none", display->grab_op, + display->grab_window ? display->grab_window->desc : "none"); return FALSE; } |