[mutter/wip/cb2eb3: 48/55] theme: Scrap meta_theme_draw_frame

[Jasper St. Pierre <jstpierre src gnome org>]

commit 25815473e6c464aa32bb6a84246e0fe9cda1e96a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sat May 5 00:00:47 2012 -0300

    theme: Scrap meta_theme_draw_frame
    
    The more public symbols we remove, the closer we get to
    not supporting the legacy theme API at all...

 src/ui/preview-widget.c |   23 ++++++++++++-----------
 src/ui/theme-private.h  |   13 -------------
 src/ui/theme-viewer.c   |   22 +++++++++++-----------
 src/ui/theme.c          |   22 ----------------------
 4 files changed, 23 insertions(+), 57 deletions(-)
---
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 5747f94..dad470e 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -177,17 +177,18 @@ meta_preview_draw (GtkWidget *widget,
       if (client_height < 0)
         client_height = 1;  
       
-      meta_theme_draw_frame (preview->theme,
-                             widget,
-                             cr,
-                             preview->type,
-                             preview->flags,
-                             client_width, client_height,
-                             preview->layout,
-                             &preview->button_layout,
-                             button_states,
-                             meta_preview_get_mini_icon (),
-                             meta_preview_get_icon ());
+      meta_theme_draw_frame_with_style (preview->theme,
+                                        gtk_widget_get_style_context (widget),
+                                        cr,
+                                        preview->type,
+                                        preview->flags,
+                                        client_width,
+                                        client_height,
+                                        preview->layout,
+                                        &preview->button_layout,
+                                        button_states,
+                                        meta_preview_get_mini_icon (),
+                                        meta_preview_get_icon ());
 
       cairo_restore (cr);
     }
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index e4cabd1..7de8a00 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -1007,19 +1007,6 @@ void meta_theme_render_background (GtkStyleContext *style,
                                    const MetaFrameGeometry *fgeom,
                                    PangoLayout     *title_layout);
 
-void meta_theme_draw_frame (MetaTheme              *theme,
-                            GtkWidget              *widget,
-                            cairo_t                *cr,
-                            MetaFrameType           type,
-                            MetaFrameFlags          flags,
-                            int                     client_width,
-                            int                     client_height,
-                            PangoLayout            *title_layout,
-                            const MetaButtonLayout *button_layout,
-                            MetaButtonState         button_states[META_BUTTON_TYPE_LAST],
-                            GdkPixbuf              *mini_icon,
-                            GdkPixbuf              *icon);
-
 void meta_theme_draw_frame_with_style (MetaTheme              *theme,
                                        GtkStyleContext        *style_gtk,
                                        cairo_t                *cr,
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index fb1f8d6..c767cf2 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -1006,17 +1006,17 @@ run_theme_benchmark (void)
 
       cr = cairo_create (pixmap);
 
-      meta_theme_draw_frame (global_theme,
-                             widget,
-                             cr,
-                             META_FRAME_TYPE_NORMAL,
-                             get_flags (widget),
-                             client_width, client_height,
-                             layout,
-                             &button_layout,
-                             button_states,
-                             meta_preview_get_mini_icon (),
-                             meta_preview_get_icon ());
+      meta_theme_draw_frame_with_style (global_theme,
+                                        gtk_widget_get_style_context (widget),
+                                        cr,
+                                        META_FRAME_TYPE_NORMAL,
+                                        get_flags (widget),
+                                        client_width, client_height,
+                                        layout,
+                                        &button_layout,
+                                        button_states,
+                                        meta_preview_get_mini_icon (),
+                                        meta_preview_get_icon ());
 
       cairo_destroy (cr);
       cairo_surface_destroy (pixmap);
diff --git a/src/ui/theme.c b/src/ui/theme.c
index f7785ce..8b36eeb 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -5055,28 +5055,6 @@ meta_theme_draw_frame_with_style (MetaTheme              *theme,
 }
 
 void
-meta_theme_draw_frame (MetaTheme              *theme,
-                       GtkWidget              *widget,
-                       cairo_t                *cr,
-                       MetaFrameType           type,
-                       MetaFrameFlags          flags,
-                       int                     client_width,
-                       int                     client_height,
-                       PangoLayout            *title_layout,
-                       const MetaButtonLayout *button_layout,
-                       MetaButtonState         button_states[META_BUTTON_TYPE_LAST],
-                       GdkPixbuf              *mini_icon,
-                       GdkPixbuf              *icon)
-{
-  meta_theme_draw_frame_with_style (theme, gtk_widget_get_style_context (widget),
-                                    cr, type,flags,
-                                    client_width, client_height,
-                                    title_layout,
-                                    button_layout, button_states,
-                                    mini_icon, icon);
-}
-
-void
 meta_theme_get_frame_borders (MetaTheme        *theme,
                               GtkStyleContext  *style_context,
                               MetaFrameType     type,