diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index d9969ed5c..463e3c7a0 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -2587,7 +2587,8 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) vertical_layout = TRUE; break; default: - meta_warning ("Someone set a weird orientation in _NET_DESKTOP_LAYOUT"); + meta_topic (META_DEBUG_X11, + "Someone set a weird orientation in _NET_DESKTOP_LAYOUT"); break; } @@ -2596,7 +2597,9 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) if (rows <= 0 && cols <= 0) { - meta_warning ("Columns = %d rows = %d in _NET_DESKTOP_LAYOUT makes no sense", rows, cols); + meta_topic (META_DEBUG_X11, + "Columns = %d rows = %d in _NET_DESKTOP_LAYOUT makes no sense", + rows, cols); } else { @@ -2628,15 +2631,17 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) starting_corner = META_DISPLAY_BOTTOMLEFT; break; default: - meta_warning ("Someone set a weird starting corner in _NET_DESKTOP_LAYOUT"); + meta_topic (META_DEBUG_X11, + "Someone set a weird starting corner in _NET_DESKTOP_LAYOUT"); break; } } } else { - meta_warning ("Someone set _NET_DESKTOP_LAYOUT to %d integers instead of 4 " - "(3 is accepted for backwards compat)", n_items); + meta_topic (META_DEBUG_X11, + "Someone set _NET_DESKTOP_LAYOUT to %d integers instead of 4 " + "(3 is accepted for backwards compat)", n_items); } g_free (list); diff --git a/src/x11/window-props.c b/src/x11/window-props.c index d6b73d2e7..db3d43d3c 100644 --- a/src/x11/window-props.c +++ b/src/x11/window-props.c @@ -1083,7 +1083,7 @@ reload_update_counter (MetaWindow *window, if (value->v.xcounter_list.n_counters == 0) { - meta_warning ("_NET_WM_SYNC_REQUEST_COUNTER is empty"); + meta_topic (META_DEBUG_X11, "_NET_WM_SYNC_REQUEST_COUNTER is empty"); meta_sync_counter_set_counter (sync_counter, None, FALSE); return; } @@ -1464,8 +1464,9 @@ reload_transient_for (MetaWindow *window, transient_for); if (!parent) { - meta_warning ("Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.", - transient_for, window->desc); + meta_topic (META_DEBUG_X11, + "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.", + transient_for, window->desc); transient_for = None; } else if (parent->override_redirect) @@ -1478,12 +1479,13 @@ reload_transient_for (MetaWindow *window, /* We don't have to go through the parents, as per this code it is * not possible that a window has the WM_TRANSIENT_FOR set to an * override-redirect window anyways */ - meta_warning ("WM_TRANSIENT_FOR window %s for %s window %s is an " - "override-redirect window and this is not correct " - "according to the standard, so we'll fallback to " - "the first non-override-redirect window 0x%lx.", - parent->desc, window->desc, window_kind, - parent_xtransient_for); + meta_topic (META_DEBUG_X11, + "WM_TRANSIENT_FOR window %s for %s window %s is an " + "override-redirect window and this is not correct " + "according to the standard, so we'll fallback to " + "the first non-override-redirect window 0x%lx.", + parent->desc, window->desc, window_kind, + parent_xtransient_for); transient_for = parent_xtransient_for; parent = meta_x11_display_lookup_x_window (parent->display->x11_display, @@ -1491,11 +1493,12 @@ reload_transient_for (MetaWindow *window, } else { - meta_warning ("WM_TRANSIENT_FOR window %s for %s window %s is an " - "override-redirect window and this is not correct " - "according to the standard, so we'll fallback to " - "the root window.", parent->desc, window_kind, - window->desc); + meta_topic (META_DEBUG_X11, + "WM_TRANSIENT_FOR window %s for %s window %s is an " + "override-redirect window and this is not correct " + "according to the standard, so we'll fallback to " + "the root window.", + parent->desc, window_kind, window->desc); transient_for = parent->display->x11_display->xroot; parent = NULL; } @@ -1504,8 +1507,9 @@ reload_transient_for (MetaWindow *window, /* Make sure there is not a loop */ if (check_xtransient_for_loop (window, parent)) { - meta_warning ("WM_TRANSIENT_FOR window 0x%lx for %s would create a " - "loop.", transient_for, window->desc); + meta_topic (META_DEBUG_X11, + "WM_TRANSIENT_FOR window 0x%lx for %s would create a loop.", + transient_for, window->desc); transient_for = None; } } diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 7b3c7e454..efe8118ce 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -3015,13 +3015,10 @@ meta_window_move_resize_request (MetaWindow *window, window->has_fullscreen_func && !meta_window_is_fullscreen (window)) { - /* meta_topic (META_DEBUG_GEOMETRY, - */ - meta_warning ( - "Treating resize request of legacy application %s as a " - "fullscreen request", - window->desc); + "Treating resize request of legacy application %s as a " + "fullscreen request", + window->desc); meta_window_make_fullscreen_internal (window); } } @@ -3375,10 +3372,10 @@ meta_window_x11_client_message (MetaWindow *window, timestamp = event->xclient.data.l[0]; else { - meta_warning ("Receiving a NET_CLOSE_WINDOW message for %s without " - "a timestamp! This means some buggy (outdated) " - "application is on the loose!", - window->desc); + meta_topic (META_DEBUG_X11, + "Receiving a NET_CLOSE_WINDOW message for %s without " + "an expected timestamp.", + window->desc); timestamp = meta_display_get_current_time (window->display); } @@ -3805,9 +3802,10 @@ meta_window_x11_client_message (MetaWindow *window, if (timestamp == 0) { /* Client using older EWMH _NET_ACTIVE_WINDOW without a timestamp */ - meta_warning ("Buggy client sent a _NET_ACTIVE_WINDOW message with a " - "timestamp of 0 for %s", - window->desc); + meta_topic (META_DEBUG_X11, + "Client sent a _NET_ACTIVE_WINDOW message with an invalid" + "timestamp of 0 for %s", + window->desc); timestamp = meta_display_get_current_time (display); } @@ -4399,7 +4397,10 @@ meta_window_x11_configure_notify (MetaWindow *window, meta_display_queue_check_fullscreen (window->display); if (!event->override_redirect && !event->send_event) - meta_warning ("Unhandled change of windows override redirect status"); + { + meta_topic (META_DEBUG_X11, + "Unhandled change of windows override redirect status"); + } meta_compositor_sync_window_geometry (window->display->compositor, window, FALSE); }