From 208c5e9562c230fdc85a7e18986b52f08d9834b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 17 Jul 2019 17:20:08 +0200 Subject: [PATCH] shell: Don't use g_memmove() Glib stopped providing any fallback implementations on systems without memmove() all the way back in 2013. Since then, the symbol is a simple macro around memmove(); use that function directly now that glib added a deprecation warning. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/632 --- src/shell-secure-text-buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shell-secure-text-buffer.c b/src/shell-secure-text-buffer.c index 0f33a5df9..03af451ba 100644 --- a/src/shell-secure-text-buffer.c +++ b/src/shell-secure-text-buffer.c @@ -108,7 +108,7 @@ shell_secure_text_buffer_real_insert_text (ClutterTextBuffer *buffer, /* Actual text insertion */ at = g_utf8_offset_to_pointer (self->text, position) - self->text; - g_memmove (self->text + at + n_bytes, self->text + at, self->text_bytes - at); + memmove (self->text + at + n_bytes, self->text + at, self->text_bytes - at); memcpy (self->text + at, chars, n_bytes); /* Book keeping */ @@ -138,7 +138,7 @@ shell_secure_text_buffer_real_delete_text (ClutterTextBuffer *buffer, start = g_utf8_offset_to_pointer (self->text, position) - self->text; end = g_utf8_offset_to_pointer (self->text, position + n_chars) - self->text; - g_memmove (self->text + start, self->text + end, self->text_bytes + 1 - end); + memmove (self->text + start, self->text + end, self->text_bytes + 1 - end); self->text_chars -= n_chars; self->text_bytes -= (end - start);