Commit 9db7f039 authored by Christian Persch's avatar Christian Persch

widget: Remove deprecated vte_terminal_set_font_full

https://bugzilla.gnome.org/show_bug.cgi?id=561366
parent e8ab62cf
......@@ -55,7 +55,6 @@ vte_terminal_set_scrollback_lines
vte_terminal_set_font
vte_terminal_set_font_from_string
vte_terminal_set_font_from_string_full
vte_terminal_set_font_full
vte_terminal_get_font
vte_terminal_get_has_selection
vte_terminal_set_word_chars
......
......@@ -132,8 +132,6 @@ static void add_update_timeout (VteTerminal *terminal);
static void remove_update_timeout (VteTerminal *terminal);
static void reset_update_regions (VteTerminal *terminal);
static void vte_terminal_set_cursor_blinks_internal(VteTerminal *terminal, gboolean blink);
static void vte_terminal_set_font_full_internal(VteTerminal *terminal,
const PangoFontDescription *font_desc);
static void _vte_check_cursor_blink(VteTerminal *terminal);
static gboolean process_timeout (gpointer data);
......@@ -4612,7 +4610,7 @@ vte_terminal_style_updated (GtkWidget *widget)
if (style_updated)
style_updated (widget);
vte_terminal_set_font_full_internal(terminal, terminal->pvt->fontdesc);
vte_terminal_set_font(terminal, terminal->pvt->fontdesc);
vte_terminal_set_inner_border(terminal);
gtk_widget_style_get(widget, "cursor-aspect-ratio", &aspect, NULL);
......@@ -7409,7 +7407,7 @@ vte_terminal_ensure_font (VteTerminal *terminal)
if (terminal->pvt->draw != NULL) {
/* Load default fonts, if no fonts have been loaded. */
if (!terminal->pvt->has_fonts) {
vte_terminal_set_font_full_internal(terminal,
vte_terminal_set_font(terminal,
terminal->pvt->fontdesc);
}
if (terminal->pvt->fontdirty) {
......@@ -7425,34 +7423,20 @@ vte_terminal_ensure_font (VteTerminal *terminal)
}
}
/**
* vte_terminal_set_font_full:
* vte_terminal_set_font:
* @terminal: a #VteTerminal
* @font_desc: The #PangoFontDescription of the desired font, or %NULL
* @antialias: Specify if anti aliasing of the fonts is to be used or not.
* @font_desc: (allow-none): a #PangoFontDescription for the desired font, or %NULL
*
* Sets the font used for rendering all text displayed by the terminal,
* overriding any fonts set using gtk_widget_modify_font(). The terminal
* will immediately attempt to load the desired font, retrieve its
* metrics, and attempt to resize itself to keep the same number of rows
* and columns.
*
* Since: 0.11.11
*
* Deprecated: 0.20: Use vte_terminal_set_font()
*/
void
vte_terminal_set_font_full(VteTerminal *terminal,
const PangoFontDescription *font_desc,
VteTerminalAntiAlias antialias)
{
vte_terminal_set_font_full_internal(terminal, font_desc);
}
static void
vte_terminal_set_font_full_internal(VteTerminal *terminal,
const PangoFontDescription *font_desc)
vte_terminal_set_font(VteTerminal *terminal,
const PangoFontDescription *font_desc)
{
GObject *object;
GtkStyle *style;
......@@ -7514,25 +7498,6 @@ vte_terminal_set_font_full_internal(VteTerminal *terminal,
g_object_thaw_notify(object);
}
/**
* vte_terminal_set_font:
* @terminal: a #VteTerminal
* @font_desc: (allow-none): a #PangoFontDescription for the desired font, or %NULL
*
* Sets the font used for rendering all text displayed by the terminal,
* overriding any fonts set using gtk_widget_modify_font(). The terminal
* will immediately attempt to load the desired font, retrieve its
* metrics, and attempt to resize itself to keep the same number of rows
* and columns.
*/
void
vte_terminal_set_font(VteTerminal *terminal,
const PangoFontDescription *font_desc)
{
g_return_if_fail(VTE_IS_TERMINAL(terminal));
vte_terminal_set_font_full_internal(terminal, font_desc);
}
static void
vte_terminal_set_font_from_string_full_internal(VteTerminal *terminal,
const char *name,
......@@ -7543,7 +7508,7 @@ vte_terminal_set_font_from_string_full_internal(VteTerminal *terminal,
if (name)
font_desc = pango_font_description_from_string(name);
vte_terminal_set_font_full_internal(terminal, font_desc);
vte_terminal_set_font(terminal, font_desc);
pango_font_description_free(font_desc);
}
......@@ -10969,7 +10934,7 @@ vte_terminal_set_property (GObject *object,
vte_terminal_set_encoding (terminal, g_value_get_string (value));
break;
case PROP_FONT_DESC:
vte_terminal_set_font_full_internal (terminal, g_value_get_boxed (value));
vte_terminal_set_font (terminal, g_value_get_boxed (value));
break;
case PROP_MOUSE_POINTER_AUTOHIDE:
vte_terminal_set_mouse_autohide (terminal, g_value_get_boolean (value));
......
......@@ -45,9 +45,6 @@ typedef enum {
VTE_ANTI_ALIAS_FORCE_DISABLE
} VteTerminalAntiAlias;
void vte_terminal_set_font_full(VteTerminal *terminal,
const PangoFontDescription *font_desc,
VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
void vte_terminal_set_font_from_string_full(VteTerminal *terminal,
const char *name,
VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment