[gtk/wip/chergert/quartz4u: 109/116] macos: cleanup



commit 534bfe4c85a513d57f58511e9d67f8b476ff0b95
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jun 23 11:23:42 2020 -0700

    macos: cleanup

 gdk/macos/gdkdisplaylinksource.c      | 4 ++--
 gdk/macos/gdkmacosdisplay-translate.c | 2 +-
 gdk/macos/gdkmacoseventsource.c       | 2 +-
 gdk/macos/gdkmacossurface.c           | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gdk/macos/gdkdisplaylinksource.c b/gdk/macos/gdkdisplaylinksource.c
index 7840a362fb..ba8731de5a 100644
--- a/gdk/macos/gdkdisplaylinksource.c
+++ b/gdk/macos/gdkdisplaylinksource.c
@@ -118,7 +118,7 @@ gdk_display_link_source_frame_cb (CVDisplayLinkRef   display_link,
   impl->needs_dispatch = TRUE;
 
   if (needs_wakeup)
-     {
+    {
       NSEvent *event;
 
       /* Post a message so we'll break out of the message loop.
@@ -139,7 +139,7 @@ gdk_display_link_source_frame_cb (CVDisplayLinkRef   display_link,
                                     data2: 0];
 
       [NSApp postEvent:event atStart:YES];
-     }
+    }
 
   return kCVReturnSuccess;
 }
diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c
index 4e86556499..8e86459987 100644
--- a/gdk/macos/gdkmacosdisplay-translate.c
+++ b/gdk/macos/gdkmacosdisplay-translate.c
@@ -734,7 +734,7 @@ find_surface_under_pointer (GdkMacosDisplay *self,
                                         gdk_seat_get_pointer (seat));
   surface = info->surface_under_pointer;
 
-  if (!surface)
+  if (surface == NULL)
     {
       GdkMacosSurface *found;
 
diff --git a/gdk/macos/gdkmacoseventsource.c b/gdk/macos/gdkmacoseventsource.c
index c9c416b136..f173433de4 100644
--- a/gdk/macos/gdkmacoseventsource.c
+++ b/gdk/macos/gdkmacoseventsource.c
@@ -352,7 +352,7 @@ select_thread_start (void)
   while (TRUE)
     {
       if (pthread_create (&select_thread, NULL, select_thread_func, NULL) == 0)
-          break;
+        break;
 
       g_warning ("Failed to create select thread, sleeping and trying again");
       sleep (1);
diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index ee99b6bdba..1e1e1b5be8 100644
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -319,13 +319,12 @@ gdk_macos_surface_drag_begin (GdkSurface         *surface,
                        "content", content,
                        "actions", actions,
                        NULL);
+  g_clear_object (&drag_surface);
 
   cursor = gdk_drag_get_cursor (GDK_DRAG (drag),
                                 gdk_drag_get_selected_action (GDK_DRAG (drag)));
   gdk_drag_set_cursor (GDK_DRAG (drag), cursor);
 
-  g_clear_object (&drag_surface);
-
   if (!_gdk_macos_drag_begin (drag))
     {
       g_object_unref (drag);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]