[gnome-settings-daemon] media-keys: Fold in helper function

[Bastien Nocera <hadess src gnome org>]

commit 2b6698814780e6d1413212a9400f8d8285f967ed
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Apr 16 17:34:43 2012 +0100

    media-keys: Fold in helper function

 plugins/media-keys/gsd-osd-window.c |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/plugins/media-keys/gsd-osd-window.c b/plugins/media-keys/gsd-osd-window.c
index d07f65d..dd8d7fa 100644
--- a/plugins/media-keys/gsd-osd-window.c
+++ b/plugins/media-keys/gsd-osd-window.c
@@ -397,12 +397,9 @@ gsd_osd_window_color_reverse (GdkRGBA *a)
         a->blue = blue;
 }
 
-/* This is our draw handler when the window is in a compositing manager.
- * We draw everything by hand, using Cairo, so that we can have a nice
- * transparent/rounded look.
- */
-static void
-draw_when_composited (GtkWidget *widget, cairo_t *orig_cr)
+static gboolean
+gsd_osd_window_draw (GtkWidget *widget,
+                     cairo_t   *orig_cr)
 {
         GsdOsdWindow    *window;
         cairo_t         *cr;
@@ -461,13 +458,6 @@ draw_when_composited (GtkWidget *widget, cairo_t *orig_cr)
         if (surface != NULL) {
                 cairo_surface_destroy (surface);
         }
-}
-
-static gboolean
-gsd_osd_window_draw (GtkWidget *widget,
-                     cairo_t   *cr)
-{
-        draw_when_composited (widget, cr);
 
         return FALSE;
 }