Trivial formatting fixes

gdk/wayland/gdkdevice-wayland.c

@@ -205,7 +205,9 @@ gdk_wayland_device_set_window_cursor (GdkDevice *device,
 {
   GdkWaylandDeviceData *wd = GDK_WAYLAND_DEVICE (device)->device;
 
-  /* Setting the cursor to NULL means that we should use the default cursor */
+  /* Setting the cursor to NULL means that we should use
+   * the default cursor
+   */
   if (!cursor)
     {
       /* FIXME: Is this the best sensible default ? */
@@ -300,10 +302,10 @@ gdk_wayland_device_grab (GdkDevice    *device,
       wayland_device->pointer_grab_window = window;
       wayland_device->pointer_grab_time = time_;
 
-      /* FIXME: This probably breaks if you end up with multiple grabs on the
+      /* FIXME: This probably breaks if you end up with multiple grabs
-       * same window - but we need to know the input device for when we are
+       * on the same window - but we need to know the input device for
-       * asked to map a popup window so that the grab can be managed by the
+       * when we are asked to map a popup window so that the grab can
-       * compositor.
+       * be managed by the compositor.
        */
       _gdk_wayland_window_set_device_grabbed (window,
                                               device,
@@ -566,8 +568,8 @@ data_device_selection (void                  *data,
       device->selection_offer = NULL;
     }
 
-  /* Retrieve the DataOffer associated with with the wl_data_offer - this
+  /* Retrieve the DataOffer associated with with the wl_data_offer -
-   * association is made when the listener is attached.
+   * this association is made when the listener is attached.
    */
   g_assert (device->selection_offer == NULL);
   device->selection_offer = wl_data_offer_get_user_data (offer);
@@ -1012,7 +1014,9 @@ get_key_repeat (GdkWaylandDeviceData *device,
 
 static gboolean
 deliver_key_event (GdkWaylandDeviceData *device,
-                  uint32_t time, uint32_t key, uint32_t state)
+                   uint32_t              time_,
+                   uint32_t              key,
+                   uint32_t              state)
 {
   GdkEvent *event;
   struct xkb_state *xkb_state;
@@ -1027,13 +1031,13 @@ deliver_key_event(GdkWaylandDeviceData *device,
 
   sym = xkb_state_key_get_one_sym (xkb_state, key);
 
-  device->time = time;
+  device->time = time_;
   device->modifiers = gdk_keymap_get_modifier_state (keymap);
 
   event = gdk_event_new (state ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
   event->key.window = device->keyboard_focus ? g_object_ref (device->keyboard_focus) : NULL;
   gdk_event_set_device (event, device->keyboard);
-  event->button.time = time;
+  event->button.time = time_;
   event->key.state = device->modifiers;
   event->key.group = 0;
   event->key.hardware_keycode = key;
@@ -1160,7 +1164,8 @@ static const struct wl_keyboard_listener keyboard_listener = {
 };
 
 static void
-seat_handle_capabilities(void *data, struct wl_seat *seat,
+seat_handle_capabilities (void                    *data,
+                          struct wl_seat          *seat,
                           enum wl_seat_capability  caps)
 {
   GdkWaylandDeviceData *device = data;
@@ -1171,8 +1176,7 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
     {
       device->wl_pointer = wl_seat_get_pointer (seat);
       wl_pointer_set_user_data (device->wl_pointer, device);
-      wl_pointer_add_listener(device->wl_pointer, &pointer_listener,
+      wl_pointer_add_listener (device->wl_pointer, &pointer_listener, device);
-                              device);
 
       device->pointer = g_object_new (GDK_TYPE_WAYLAND_DEVICE,
                                       "name", "Core Pointer",
@@ -1207,8 +1211,7 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
     {
       device->wl_keyboard = wl_seat_get_keyboard (seat);
       wl_keyboard_set_user_data (device->wl_keyboard, device);
-      wl_keyboard_add_listener(device->wl_keyboard, &keyboard_listener,
+      wl_keyboard_add_listener (device->wl_keyboard, &keyboard_listener, device);
-                               device);
 
       device->keyboard = g_object_new (GDK_TYPE_WAYLAND_DEVICE,
                                        "name", "Core Keyboard",
@@ -1464,14 +1467,11 @@ _request_content_io_func (GIOChannel *channel,
   gsize len = 0;
   GError *error = NULL;
 
-  /* FIXME: We probably want to do something better than this to avoid
+  /* FIXME: We probably want to do something better than this
-   * blocking on the transfer of large pieces of data: call the callback
+   * to avoid blocking on the transfer of large pieces of data:
-   * multiple times I should think.
+   * call the callback multiple times I should think.
    */
-  if (g_io_channel_read_to_end (channel,
+  if (g_io_channel_read_to_end (channel, &data, &len, &error) != G_IO_STATUS_NORMAL)
-                                &data,
-                                &len,
-                                &error) != G_IO_STATUS_NORMAL)
     {
       g_warning (G_STRLOC ": Error reading content from pipe: %s", error->message);
       g_clear_error (&error);
@@ -1657,10 +1657,7 @@ gdk_wayland_device_offer_selection_content (GdkDevice
   offer->device = device;
 
   for (i = 0; i < nr_mime_types; i++)
-    {
+    wl_data_source_offer (offer->source, mime_types[i]);
-      wl_data_source_offer (offer->source,
-                            mime_types[i]);
-    }
 
   wl_data_source_add_listener (offer->source,
                                &data_source_listener,