summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2016-02-07 22:32:14 +0200
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2016-02-07 22:32:14 +0200
commit7c2c303d082faa1c010de83deb967992c008985e (patch)
tree751065aba32cc48a2e92bd2cbf12115abac6b47b /src
parentc6b586dc2906a2d5e8ed1962ba5a654921670395 (diff)
downloadmetacity-7c2c303d082faa1c010de83deb967992c008985e.tar.gz
libmetacity: don't expose MetaStyleInfo
Diffstat (limited to 'src')
-rw-r--r--src/ui/frames.c4
-rw-r--r--src/ui/ui.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c
index d3c74d5f..e202804d 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -465,7 +465,6 @@ meta_frames_ensure_layout (MetaFrames *frames,
{
gpointer key, value;
MetaTheme *current;
- MetaStyleInfo *style_info;
PangoFontDescription *font_desc;
int size;
@@ -476,9 +475,8 @@ meta_frames_ensure_layout (MetaFrames *frames,
pango_layout_set_single_paragraph_mode (frame->text_layout, TRUE);
current = meta_theme_get_current ();
- style_info = meta_theme_get_style_info (current, frame->theme_variant);
- font_desc = meta_style_info_create_font_desc (current, style_info);
+ font_desc = meta_style_info_create_font_desc (current, frame->theme_variant);
meta_frame_style_apply_scale (style, font_desc);
size = pango_font_description_get_size (font_desc);
diff --git a/src/ui/ui.c b/src/ui/ui.c
index feb91d60..b2924bc3 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -671,13 +671,11 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
if (meta_ui_have_a_theme ())
{
- MetaStyleInfo *style_info;
MetaTheme *current;
current = meta_theme_get_current ();
- style_info = meta_theme_get_style_info (current, NULL);
- font_desc = meta_style_info_create_font_desc (current, style_info);
+ font_desc = meta_style_info_create_font_desc (current, NULL);
context = gtk_widget_get_pango_context (GTK_WIDGET (ui->frames));
text_height = meta_pango_font_desc_get_text_height (font_desc, context);