[gimp/gimp-2-10] app: code cleanup in previous commits

[Ell <ell src gnome org>]

commit b16ea49ca1e57f65cd4eb67e47080f22696b5af2
Author: Ell <ell_se yahoo com>
Date:   Wed May 30 02:20:37 2018 -0400

    app: code cleanup in previous commits
    
    (cherry picked from commit c27316093ee62daf695290aa64d10b13b019df8b)

 app/core/gimp-gui.c                        |  6 +++---
 app/core/gimpasyncset.c                    |  4 ----
 app/core/gimpasyncset.h                    | 16 ++++++++--------
 app/core/gimptriviallycancelablewaitable.c |  6 ------
 app/core/gimpuncancelablewaitable.c        |  6 ------
 app/text/gimp-fonts.c                      |  4 ++--
 6 files changed, 13 insertions(+), 29 deletions(-)
---
diff --git a/app/core/gimp-gui.c b/app/core/gimp-gui.c
index b0cac69690..5039aa6d40 100644
--- a/app/core/gimp-gui.c
+++ b/app/core/gimp-gui.c
@@ -194,9 +194,9 @@ gimp_show_message (Gimp                *gimp,
 }
 
 void
-gimp_wait (Gimp           *gimp,
-           GimpWaitable   *waitable,
-           const gchar    *format,
+gimp_wait (Gimp         *gimp,
+           GimpWaitable *waitable,
+           const gchar  *format,
            ...)
 {
   va_list  args;
diff --git a/app/core/gimpasyncset.c b/app/core/gimpasyncset.c
index c0aa859db2..23b6fb31a0 100644
--- a/app/core/gimpasyncset.c
+++ b/app/core/gimpasyncset.c
@@ -131,10 +131,6 @@ gimp_async_set_init (GimpAsyncSet *async_set)
                                                  GimpAsyncSetPrivate);
 
   async_set->priv->asyncs = g_hash_table_new (NULL, NULL);
-
-#ifdef TIME_ASYNC_SET_OPS
-  async_set->priv->start_time = g_get_monotonic_time ();
-#endif
 }
 
 static void
diff --git a/app/core/gimpasyncset.h b/app/core/gimpasyncset.h
index ec2c7680de..f1a80fd370 100644
--- a/app/core/gimpasyncset.h
+++ b/app/core/gimpasyncset.h
@@ -46,16 +46,16 @@ struct _GimpAsyncSetClass
 };
 
 
-GType          gimp_async_set_get_type   (void) G_GNUC_CONST;
+GType          gimp_async_set_get_type (void) G_GNUC_CONST;
 
-GimpAsyncSet * gimp_async_set_new        (void);
+GimpAsyncSet * gimp_async_set_new      (void);
 
-void           gimp_async_set_add        (GimpAsyncSet *async_set,
-                                          GimpAsync    *async);
-void           gimp_async_set_remove     (GimpAsyncSet *async_set,
-                                          GimpAsync    *async);
-void           gimp_async_set_clear      (GimpAsyncSet *async_set);
-gboolean       gimp_async_set_is_empty   (GimpAsyncSet *async_set);
+void           gimp_async_set_add      (GimpAsyncSet *async_set,
+                                        GimpAsync    *async);
+void           gimp_async_set_remove   (GimpAsyncSet *async_set,
+                                        GimpAsync    *async);
+void           gimp_async_set_clear    (GimpAsyncSet *async_set);
+gboolean       gimp_async_set_is_empty (GimpAsyncSet *async_set);
 
 
 #endif /* __GIMP_ASYNC_SET_H__ */
diff --git a/app/core/gimptriviallycancelablewaitable.c b/app/core/gimptriviallycancelablewaitable.c
index 13abae9bc6..865def6aba 100644
--- a/app/core/gimptriviallycancelablewaitable.c
+++ b/app/core/gimptriviallycancelablewaitable.c
@@ -30,12 +30,6 @@
 #include "gimpwaitable.h"
 
 
-struct _GimpTriviallyCancelableWaitablePrivate
-{
-  GimpWaitable *waitable;
-};
-
-
 /*  local function prototypes  */
 
 static void   gimp_trivially_cancelable_waitable_cancelable_iface_init (GimpCancelableInterface *iface);
diff --git a/app/core/gimpuncancelablewaitable.c b/app/core/gimpuncancelablewaitable.c
index 03a3094105..dcbd6bbd4b 100644
--- a/app/core/gimpuncancelablewaitable.c
+++ b/app/core/gimpuncancelablewaitable.c
@@ -29,12 +29,6 @@
 #include "gimpwaitable.h"
 
 
-struct _GimpUncancelableWaitablePrivate
-{
-  GimpWaitable *waitable;
-};
-
-
 /*  local function prototypes  */
 
 static void       gimp_uncancelable_waitable_waitable_iface_init (GimpWaitableInterface   *iface);
diff --git a/app/text/gimp-fonts.c b/app/text/gimp-fonts.c
index 4108b31715..b9e1e20f99 100644
--- a/app/text/gimp-fonts.c
+++ b/app/text/gimp-fonts.c
@@ -135,7 +135,7 @@ gimp_fonts_load_async (GimpAsync *async,
 
 static void
 gimp_fonts_load_async_callback (GimpAsync *async,
-                                Gimp      *gimp)
+                                gpointer   data)
 {
   if (gimp_async_is_finished (async) && ! gimp_async_is_canceled (async))
     {
@@ -200,7 +200,7 @@ gimp_fonts_load (Gimp    *gimp,
 
   gimp_async_add_callback (async,
                            (GimpAsyncCallback) gimp_fonts_load_async_callback,
-                           gimp);
+                           NULL);
 
   gimp_async_set_add (gimp->fonts_async_set, async);