[metacity/gnome-3-20] libmetacity: merge needs_alpha into apply_alpha

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 43fe95c9a6b5c2f90dd2c640c2a0d2750ab2f6e5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Jul 7 20:00:09 2016 +0300

    libmetacity: merge needs_alpha into apply_alpha

 libmetacity/meta-gradient-spec-private.h |    3 ---
 libmetacity/meta-gradient-spec.c         |    8 +-------
 2 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/libmetacity/meta-gradient-spec-private.h b/libmetacity/meta-gradient-spec-private.h
index 31503dc..a07240f 100644
--- a/libmetacity/meta-gradient-spec-private.h
+++ b/libmetacity/meta-gradient-spec-private.h
@@ -69,9 +69,6 @@ guchar                 meta_alpha_gradient_spec_get_alpha   (MetaAlphaGradientSp
                                                              gint                     n_alpha);
 
 G_GNUC_INTERNAL
-gboolean               meta_alpha_gradient_spec_needs_alpha (MetaAlphaGradientSpec   *spec);
-
-G_GNUC_INTERNAL
 GdkPixbuf             *meta_alpha_gradient_spec_apply_alpha (MetaAlphaGradientSpec   *spec,
                                                              GdkPixbuf               *pixbuf,
                                                              gboolean                 force_copy);
diff --git a/libmetacity/meta-gradient-spec.c b/libmetacity/meta-gradient-spec.c
index 3bc6c1b..dd4b48e 100644
--- a/libmetacity/meta-gradient-spec.c
+++ b/libmetacity/meta-gradient-spec.c
@@ -220,12 +220,6 @@ meta_alpha_gradient_spec_get_alpha (MetaAlphaGradientSpec *spec,
   return spec->alphas[n_alpha];
 }
 
-gboolean
-meta_alpha_gradient_spec_needs_alpha (MetaAlphaGradientSpec *spec)
-{
-  return spec && (spec->n_alphas > 1 || spec->alphas[0] != 0xff);
-}
-
 GdkPixbuf *
 meta_alpha_gradient_spec_apply_alpha (MetaAlphaGradientSpec *spec,
                                       GdkPixbuf             *pixbuf,
@@ -236,7 +230,7 @@ meta_alpha_gradient_spec_apply_alpha (MetaAlphaGradientSpec *spec,
 
   g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
 
-  needs_alpha = meta_alpha_gradient_spec_needs_alpha (spec);
+  needs_alpha = spec && (spec->n_alphas > 1 || spec->alphas[0] != 0xff);
 
   if (!needs_alpha)
     return pixbuf;