diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-02-07 22:35:11 +0200 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-02-07 22:35:11 +0200 |
| commit | 56a8c70f39609f495ca651d5aac1176a1e145d93 (patch) | |
| tree | fa0c02a2b02b098c3c95eb80d22ed1879edb92ed | |
| parent | 7c2c303d082faa1c010de83deb967992c008985e (diff) | |
| download | metacity-56a8c70f39609f495ca651d5aac1176a1e145d93.tar.gz | |
libmetacity: rename meta_style_info_create_font_desc
| -rw-r--r-- | libmetacity/meta-theme.c | 4 | ||||
| -rw-r--r-- | libmetacity/meta-theme.h | 2 | ||||
| -rw-r--r-- | src/ui/frames.c | 2 | ||||
| -rw-r--r-- | src/ui/ui.c | 2 | ||||
| -rw-r--r-- | theme-viewer/theme-viewer-window.c | 4 |
5 files changed, 6 insertions, 8 deletions
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c index 0778ac89..f3d24710 100644 --- a/libmetacity/meta-theme.c +++ b/libmetacity/meta-theme.c @@ -385,8 +385,8 @@ meta_theme_get_frame_style (MetaTheme *theme, } PangoFontDescription* -meta_style_info_create_font_desc (MetaTheme *theme, - const gchar *variant) +meta_theme_create_font_desc (MetaTheme *theme, + const gchar *variant) { MetaStyleInfo *style_info; GtkStyleContext *context; diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h index e3587c47..cb708205 100644 --- a/libmetacity/meta-theme.h +++ b/libmetacity/meta-theme.h @@ -171,7 +171,7 @@ MetaFrameStyle *meta_theme_get_frame_style (MetaTheme MetaFrameType type, MetaFrameFlags flags); -PangoFontDescription *meta_style_info_create_font_desc (MetaTheme *theme, +PangoFontDescription *meta_theme_create_font_desc (MetaTheme *theme, const gchar *variant); gint meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc, diff --git a/src/ui/frames.c b/src/ui/frames.c index e202804d..2162ed92 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -476,7 +476,7 @@ meta_frames_ensure_layout (MetaFrames *frames, current = meta_theme_get_current (); - font_desc = meta_style_info_create_font_desc (current, frame->theme_variant); + font_desc = meta_theme_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 b2924bc3..cffb1f6b 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -675,7 +675,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, current = meta_theme_get_current (); - font_desc = meta_style_info_create_font_desc (current, NULL); + font_desc = meta_theme_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); diff --git a/theme-viewer/theme-viewer-window.c b/theme-viewer/theme-viewer-window.c index c38d56a9..321fd5fa 100644 --- a/theme-viewer/theme-viewer-window.c +++ b/theme-viewer/theme-viewer-window.c @@ -214,9 +214,7 @@ update_title_layout (ThemeViewerWindow *window) widget = GTK_WIDGET (window); layout = gtk_widget_create_pango_layout (widget, "Metacity Theme Viewer"); - - font_desc = meta_style_info_create_font_desc (window->theme, - window->theme_variant); + font_desc = meta_theme_create_font_desc (window->theme, window->theme_variant); type = window->frame_type; flags = window->frame_flags; |