diff options
-rw-r--r-- | libmetacity/meta-theme-gtk.c | 37 | ||||
-rw-r--r-- | libmetacity/meta-theme-impl-private.h | 2 | ||||
-rw-r--r-- | libmetacity/meta-theme-impl.c | 7 | ||||
-rw-r--r-- | libmetacity/meta-theme-metacity.c | 11 | ||||
-rw-r--r-- | libmetacity/meta-theme.c | 6 | ||||
-rw-r--r-- | libmetacity/meta-theme.h | 2 |
6 files changed, 1 insertions, 64 deletions
diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c index 810d2c9c..ac4373ec 100644 --- a/libmetacity/meta-theme-gtk.c +++ b/libmetacity/meta-theme-gtk.c @@ -28,40 +28,20 @@ struct _MetaThemeGtk { - MetaThemeImpl parent; - - gchar *name; + MetaThemeImpl parent; }; G_DEFINE_TYPE (MetaThemeGtk, meta_theme_gtk, META_TYPE_THEME_IMPL) -static void -meta_theme_gtk_finalize (GObject *object) -{ - MetaThemeGtk *gtk; - - gtk = META_THEME_GTK (object); - - g_free (gtk->name); - - G_OBJECT_CLASS (meta_theme_gtk_parent_class)->finalize (object); -} - static gboolean meta_theme_gtk_load (MetaThemeImpl *impl, const gchar *name, GError **error) { - MetaThemeGtk *gtk; MetaFrameType type; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - gtk = META_THEME_GTK (impl); - - g_free (gtk->name); - gtk->name = g_strdup (name); - for (type = 0; type < META_FRAME_TYPE_LAST; type++) { MetaFrameStyleSet *style_set; @@ -134,16 +114,6 @@ meta_theme_gtk_load (MetaThemeImpl *impl, return TRUE; } -static gchar * -meta_theme_gtk_get_name (MetaThemeImpl *impl) -{ - MetaThemeGtk *gtk; - - gtk = META_THEME_GTK (impl); - - return gtk->name; -} - static void get_margin (GtkStyleContext *style, GtkBorder *border) @@ -1022,16 +992,11 @@ meta_theme_gtk_draw_frame (MetaThemeImpl *impl, static void meta_theme_gtk_class_init (MetaThemeGtkClass *gtk_class) { - GObjectClass *object_class; MetaThemeImplClass *impl_class; - object_class = G_OBJECT_CLASS (gtk_class); impl_class = META_THEME_IMPL_CLASS (gtk_class); - object_class->finalize = meta_theme_gtk_finalize; - impl_class->load = meta_theme_gtk_load; - impl_class->get_name = meta_theme_gtk_get_name; impl_class->get_frame_borders = meta_theme_gtk_get_frame_borders; impl_class->calc_geometry = meta_theme_gtk_calc_geometry; impl_class->draw_frame = meta_theme_gtk_draw_frame; diff --git a/libmetacity/meta-theme-impl-private.h b/libmetacity/meta-theme-impl-private.h index 0e8e89dc..50bced50 100644 --- a/libmetacity/meta-theme-impl-private.h +++ b/libmetacity/meta-theme-impl-private.h @@ -40,8 +40,6 @@ struct _MetaThemeImplClass const gchar *name, GError **error); - gchar * (* get_name) (MetaThemeImpl *impl); - void (* get_frame_borders) (MetaThemeImpl *impl, MetaFrameLayout *layout, MetaStyleInfo *style_info, diff --git a/libmetacity/meta-theme-impl.c b/libmetacity/meta-theme-impl.c index a454f902..f9f70757 100644 --- a/libmetacity/meta-theme-impl.c +++ b/libmetacity/meta-theme-impl.c @@ -102,12 +102,6 @@ meta_theme_impl_real_load (MetaThemeImpl *impl, return FALSE; } -static gchar * -meta_theme_impl_real_get_name (MetaThemeImpl *impl) -{ - return NULL; -} - static void meta_theme_impl_class_init (MetaThemeImplClass *impl_class) { @@ -118,7 +112,6 @@ meta_theme_impl_class_init (MetaThemeImplClass *impl_class) object_class->dispose = meta_theme_impl_dispose; impl_class->load = meta_theme_impl_real_load; - impl_class->get_name = meta_theme_impl_real_get_name; } static void diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c index d2cdfd65..639ffefc 100644 --- a/libmetacity/meta-theme-metacity.c +++ b/libmetacity/meta-theme-metacity.c @@ -4598,16 +4598,6 @@ out: return retval; } -static gchar * -meta_theme_metacity_get_name (MetaThemeImpl *impl) -{ - MetaThemeMetacity *metacity; - - metacity = META_THEME_METACITY (impl); - - return g_strdup (metacity->name); -} - static void meta_theme_metacity_get_frame_borders (MetaThemeImpl *impl, MetaFrameLayout *layout, @@ -5504,7 +5494,6 @@ meta_theme_metacity_class_init (MetaThemeMetacityClass *metacity_class) object_class->finalize = meta_theme_metacity_finalize; impl_class->load = meta_theme_metacity_load; - impl_class->get_name = meta_theme_metacity_get_name; impl_class->get_frame_borders = meta_theme_metacity_get_frame_borders; impl_class->calc_geometry = meta_theme_metacity_calc_geometry; impl_class->draw_frame = meta_theme_metacity_draw_frame; diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c index 69d1afce..50adc840 100644 --- a/libmetacity/meta-theme.c +++ b/libmetacity/meta-theme.c @@ -282,12 +282,6 @@ meta_theme_set_titlebar_font (MetaTheme *theme, theme->titlebar_font = pango_font_description_copy (titlebar_font); } -gchar * -meta_theme_get_name (MetaTheme *theme) -{ - return META_THEME_IMPL_GET_CLASS (theme->impl)->get_name (theme->impl); -} - MetaFrameStyle * meta_theme_get_frame_style (MetaTheme *theme, MetaFrameType type, diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h index 110dd9e0..e149ceb6 100644 --- a/libmetacity/meta-theme.h +++ b/libmetacity/meta-theme.h @@ -161,8 +161,6 @@ void meta_theme_set_composited (MetaTheme void meta_theme_set_titlebar_font (MetaTheme *theme, const PangoFontDescription *titlebar_font); -gchar *meta_theme_get_name (MetaTheme *theme); - MetaFrameStyle *meta_theme_get_frame_style (MetaTheme *theme, MetaFrameType type, MetaFrameFlags flags); |