brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove misplaced line break in g_* logging functions

Browse Source 
They resulted in empty lines in the log.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1466
This commit is contained in:
Jonas Ådahl 2020-10-02 17:54:56 +02:00
parent 7266e516a1
commit 2c95e08998
16 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-cursor-sprite-xcursor.c
View File

@ -199,7 +199,7 @@ load_from_current_xcursor_image (MetaCursorSpriteXcursor *sprite_xcursor)
&error);
if (!texture)
{
g_warning ("Failed to allocate cursor texture: %s\n", error->message);
g_warning ("Failed to allocate cursor texture: %s", error->message);
g_error_free (error);
}

4
src/backends/meta-monitor-config-store.c
View File

@ -1333,7 +1333,7 @@ saved_cb (GObject *object,
{
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
g_warning ("Saving monitor configuration failed: %s\n", error->message);
g_warning ("Saving monitor configuration failed: %s", error->message);
g_clear_object (&data->config_store->save_cancellable);
}
@ -1372,7 +1372,7 @@ meta_monitor_config_store_save_sync (MetaMonitorConfigStore *config_store)
NULL,
&error))
{
g_warning ("Saving monitor configuration failed: %s\n",
g_warning ("Saving monitor configuration failed: %s",
error->message);
g_error_free (error);
}

4
src/backends/meta-profiler.c
View File

@ -145,7 +145,7 @@ on_bus_acquired_cb (GObject *source,
if (error)
{
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("Failed to get session bus: %s\n", error->message);
g_warning ("Failed to get session bus: %s", error->message);
return;
}
@ -157,7 +157,7 @@ on_bus_acquired_cb (GObject *source,
META_SYSPROF_PROFILER_DBUS_PATH,
&error))
{
g_warning ("Failed to export profiler object: %s\n", error->message);
g_warning ("Failed to export profiler object: %s", error->message);
return;
}

6
src/backends/meta-remote-desktop.c
View File

@ -207,7 +207,7 @@ on_bus_acquired (GDBusConnection *connection,
connection,
META_REMOTE_DESKTOP_DBUS_PATH,
&error))
g_warning ("Failed to export remote desktop object: %s\n", error->message);
g_warning ("Failed to export remote desktop object: %s", error->message);
}
static void
@ -215,7 +215,7 @@ on_name_acquired (GDBusConnection *connection,
const char *name,
gpointer user_data)
{
g_info ("Acquired name %s\n", name);
g_info ("Acquired name %s", name);
}
static void
@ -223,7 +223,7 @@ on_name_lost (GDBusConnection *connection,
const char *name,
gpointer user_data)
{
g_warning ("Lost or failed to acquire name %s\n", name);
g_warning ("Lost or failed to acquire name %s", name);
}
static void

6
src/backends/meta-screen-cast.c
View File

@ -280,7 +280,7 @@ on_bus_acquired (GDBusConnection *connection,
connection,
META_SCREEN_CAST_DBUS_PATH,
&error))
g_warning ("Failed to export remote desktop object: %s\n", error->message);
g_warning ("Failed to export remote desktop object: %s", error->message);
}
static void
@ -288,7 +288,7 @@ on_name_acquired (GDBusConnection *connection,
const char *name,
gpointer user_data)
{
g_info ("Acquired name %s\n", name);
g_info ("Acquired name %s", name);
}
static void
@ -296,7 +296,7 @@ on_name_lost (GDBusConnection *connection,
const char *name,
gpointer user_data)
{
g_warning ("Lost or failed to acquire name %s\n", name);
g_warning ("Lost or failed to acquire name %s", name);
}
static void

2
src/backends/native/meta-backend-native.c
View File

@ -816,7 +816,7 @@ meta_activate_session (void)
if (!meta_launcher_activate_session (native->launcher, &error))
{
g_warning ("Could not activate session: %s\n", error->message);
g_warning ("Could not activate session: %s", error->message);
g_error_free (error);
return FALSE;
}

6
src/backends/native/meta-virtual-input-device-native.c
View File

@ -276,7 +276,7 @@ meta_virtual_input_device_native_notify_key (ClutterVirtualInputDevice *virtual_
if (get_button_type (key) != EVDEV_BUTTON_TYPE_KEY)
{
g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", key);
g_warning ("Unknown/invalid virtual device key 0x%x pressed", key);
return;
}
@ -373,7 +373,7 @@ apply_level_modifiers (ClutterVirtualInputDevice *virtual_device,
}
else
{
g_warning ("Unhandled level: %d\n", level);
g_warning ("Unhandled level: %d", level);
return;
}
@ -425,7 +425,7 @@ meta_virtual_input_device_native_notify_keyval (ClutterVirtualInputDevice *virtu
if (get_button_type (evcode) != EVDEV_BUTTON_TYPE_KEY)
{
g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", evcode);
g_warning ("Unknown/invalid virtual device key 0x%x pressed", evcode);
return;
}

4
src/backends/x11/meta-input-settings-x11.c
View File

@ -191,7 +191,7 @@ meta_input_settings_x11_set_send_events (MetaInputSettings *settings,
}
if ((values[0] && !available[0]) || (values[1] && !available[1]))
g_warning ("Device '%s' does not support sendevents mode %d\n",
g_warning ("Device '%s' does not support sendevents mode %d",
clutter_input_device_get_device_name (device), mode);
else
change_property (device, "libinput Send Events Mode Enabled",
@ -419,7 +419,7 @@ meta_input_settings_x11_set_click_method (MetaInputSettings *settings,
}
if ((values[0] && !available[0]) || (values[1] && !available[1]))
g_warning ("Device '%s' does not support click method %d\n",
g_warning ("Device '%s' does not support click method %d",
clutter_input_device_get_device_name (device), mode);
else
change_property (device, "libinput Click Method Enabled",

2
src/compositor/meta-surface-actor-x11.c
View File

@ -132,7 +132,7 @@ set_pixmap (MetaSurfaceActorX11 *self,
g_error_free (error);
}
else if (G_UNLIKELY (!cogl_texture_pixmap_x11_is_using_tfp_extension (COGL_TEXTURE_PIXMAP_X11 (texture))))
g_warning ("NOTE: Not using GLX TFP!\n");
g_warning ("NOTE: Not using GLX TFP!");
self->texture = texture;
meta_shaped_texture_set_texture (stex, texture);

10
src/core/boxes.c
View File

@ -435,7 +435,7 @@ merge_spanning_rects_in_region (GList *region)
if (region == NULL)
{
g_warning ("Region to merge was empty! Either you have a some "
"pathological STRUT list or there's a bug somewhere!\n");
"pathological STRUT list or there's a bug somewhere!");
return NULL;
}
@ -955,7 +955,7 @@ meta_rectangle_clamp_to_fit_into_region (const GList *spanning_rects,
/* Clamp rect appropriately */
if (best_rect == NULL)
{
g_warning ("No rect whose size to clamp to found!\n");
g_warning ("No rect whose size to clamp to found!");
/* If it doesn't fit, at least make it no bigger than it has to be */
if (!(fixed_directions & FIXED_DIRECTION_X))
@ -1019,7 +1019,7 @@ meta_rectangle_clip_to_region (const GList *spanning_rects,
/* Clip rect appropriately */
if (best_rect == NULL)
{
g_warning ("No rect to clip to found!\n");
g_warning ("No rect to clip to found!");
}
else
{
@ -1117,7 +1117,7 @@ meta_rectangle_shove_into_region (const GList *spanning_rects,
/* Shove rect appropriately */
if (best_rect == NULL)
{
g_warning ("No rect to shove into found!\n");
g_warning ("No rect to shove into found!");
}
else
{
@ -1439,7 +1439,7 @@ meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b)
}
}
else
g_assert ("Some idiot wanted to sort sides of different types.\n");
g_assert ("Some idiot wanted to sort sides of different types.");
return a_compare - b_compare; /* positive value denotes a > b ... */
}

2
src/core/constraints.c
View File

@ -371,7 +371,7 @@ setup_constraint_info (ConstraintInfo *info,
info->action_type = ACTION_MOVE;
else
g_error ("BAD, BAD developer! No treat for you! (Fix your calls to "
"meta_window_move_resize_internal()).\n");
"meta_window_move_resize_internal()).");
info->is_user_action = (flags & META_MOVE_RESIZE_USER_ACTION);

2
src/core/stack.c
View File

@ -97,7 +97,7 @@ on_stack_changed (MetaStack *stack)
if (w->unmanaging)
continue;
meta_topic (META_DEBUG_STACK, "%u:%d - %s ",
meta_topic (META_DEBUG_STACK, " %u:%d - %s ",
w->layer, w->stack_position, w->desc);
if (w->frame)

2
src/wayland/meta-xwayland-dnd.c
View File

@ -362,7 +362,7 @@ transfer_cb (MetaSelection *selection,
if (!meta_selection_transfer_finish (selection, res, &error))
{
g_warning ("Could not transfer DnD selection: %s\n", error->message);
g_warning ("Could not transfer DnD selection: %s", error->message);
g_error_free (error);
}

4
src/wayland/meta-xwayland.c
View File

@ -255,7 +255,7 @@ bind_to_unix_socket (int display)
unlink (addr.sun_path);
if (bind (fd, (struct sockaddr *) &addr, size) < 0)
{
g_warning ("failed to bind to %s: %m\n", addr.sun_path);
g_warning ("failed to bind to %s: %m", addr.sun_path);
close (fd);
return -1;
}
@ -501,7 +501,7 @@ on_init_x11_cb (MetaDisplay *display,
g_autoptr (GError) error = NULL;
if (!meta_display_init_x11_finish (display, result, &error))
g_warning ("Failed to initialize X11 display: %s\n", error->message);
g_warning ("Failed to initialize X11 display: %s", error->message);
}
static gboolean

2
src/x11/group-props.c
View File

@ -199,7 +199,7 @@ meta_x11_display_init_group_prop_hooks (MetaX11Display *x11_display)
if (i != N_HOOKS)
{
g_error ("Initialized %d group hooks should have been %d\n", i, N_HOOKS);
g_error ("Initialized %d group hooks should have been %d", i, N_HOOKS);
}
}

2
src/x11/meta-x11-selection.c
View File

@ -156,7 +156,7 @@ write_mimetypes_cb (GOutputStream *stream,
if (error)
{
g_warning ("Could not fetch selection mimetypes: %s\n", error->message);
g_warning ("Could not fetch selection mimetypes: %s", error->message);
g_error_free (error);
}
}