[gtk+] wayland: Avoid compiler warnings
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: Avoid compiler warnings
- Date: Tue, 2 Jun 2015 13:09:49 +0000 (UTC)
commit 393df9f7e104f452f0ad686fd80959b76c825524
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 30 21:15:33 2015 -0400
wayland: Avoid compiler warnings
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
gdk/wayland/gdkselection-wayland.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
index 12a2d30..5fc2c21 100644
--- a/gdk/wayland/gdkselection-wayland.c
+++ b/gdk/wayland/gdkselection-wayland.c
@@ -912,7 +912,7 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
{
GInputStream *stream = NULL;
int pipe_fd[2], natoms = 0;
- GdkAtom *atoms = NULL;
+ GdkAtom *targets = NULL;
if (target == gdk_atom_intern_static_string ("TARGETS"))
{
@@ -920,10 +920,10 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
GList *l;
natoms = g_list_length (wayland_selection->targets);
- atoms = g_new0 (GdkAtom, natoms);
+ targets = g_new0 (GdkAtom, natoms);
for (l = wayland_selection->targets; l; l = l->next)
- atoms[i++] = l->data;
+ targets[i++] = l->data;
}
else
{
@@ -941,11 +941,11 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
if (stream)
g_object_unref (stream);
- if (atoms)
+ if (targets)
{
/* Store directly the local atoms */
- selection_buffer_append_data (buffer_data, atoms, natoms * sizeof (GdkAtom));
- g_free (atoms);
+ selection_buffer_append_data (buffer_data, targets, natoms * sizeof (GdkAtom));
+ g_free (targets);
}
g_hash_table_insert (wayland_selection->selection_buffers,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]