callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Avoid compiler warnings

Browse Source 
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
This commit is contained in:
Matthias Clasen
2015-05-30 21:15:33 -04:00
parent 73693381b2
commit 393df9f7e1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/wayland/gdkselection-wayland.c
View File

@ -912,7 +912,7 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
{ {
GInputStream *stream = NULL; GInputStream *stream = NULL;
int pipe_fd[2], natoms = 0; int pipe_fd[2], natoms = 0;
GdkAtom *atoms = NULL; GdkAtom *targets = NULL;
if (target == gdk_atom_intern_static_string ("TARGETS")) if (target == gdk_atom_intern_static_string ("TARGETS"))
{ {
@ -920,10 +920,10 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
GList *l; GList *l;
natoms = g_list_length (wayland_selection->targets); 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) for (l = wayland_selection->targets; l; l = l->next)
atoms[i++] = l->data; targets[i++] = l->data;
} }
else else
{ {
@ -941,11 +941,11 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
if (stream) if (stream)
g_object_unref (stream); g_object_unref (stream);
if (atoms) if (targets)
{ {
/* Store directly the local atoms */ /* Store directly the local atoms */
selection_buffer_append_data (buffer_data, atoms, natoms * sizeof (GdkAtom)); selection_buffer_append_data (buffer_data, targets, natoms * sizeof (GdkAtom));
g_free (atoms); g_free (targets);
} }
g_hash_table_insert (wayland_selection->selection_buffers, g_hash_table_insert (wayland_selection->selection_buffers,