[vte] widget: Remove deprecated vte_terminal_set_font_from_string_full
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] widget: Remove deprecated vte_terminal_set_font_from_string_full
- Date: Mon, 24 Mar 2014 21:10:15 +0000 (UTC)
commit c341b8898e53cc3e21958dc95eba5994594fe3e9
Author: Christian Persch <chpe gnome org>
Date: Mon May 2 21:41:00 2011 +0200
widget: Remove deprecated vte_terminal_set_font_from_string_full
https://bugzilla.gnome.org/show_bug.cgi?id=561366
Conflicts:
src/vtedeprecated.h
doc/reference/vte-sections.txt | 1 -
src/vte.c | 47 +++++++--------------------------------
src/vtedeprecated.h | 4 ---
3 files changed, 9 insertions(+), 43 deletions(-)
---
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index f03667f..7bc2a3b 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -54,7 +54,6 @@ vte_terminal_set_cursor_blink_mode
vte_terminal_set_scrollback_lines
vte_terminal_set_font
vte_terminal_set_font_from_string
-vte_terminal_set_font_from_string_full
vte_terminal_get_font
vte_terminal_get_has_selection
vte_terminal_set_word_chars
diff --git a/src/vte.c b/src/vte.c
index 09b85b1..34588e7 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -7498,40 +7498,6 @@ vte_terminal_set_font(VteTerminal *terminal,
g_object_thaw_notify(object);
}
-static void
-vte_terminal_set_font_from_string_full_internal(VteTerminal *terminal,
- const char *name,
- VteTerminalAntiAlias antialias)
-{
- PangoFontDescription *font_desc = NULL;
- g_return_if_fail(VTE_IS_TERMINAL(terminal));
-
- if (name)
- font_desc = pango_font_description_from_string(name);
- vte_terminal_set_font(terminal, font_desc);
- pango_font_description_free(font_desc);
-}
-
-/**
- * vte_terminal_set_font_from_string_full:
- * @terminal: a #VteTerminal
- * @name: A string describing the font.
- * @antialias: Whether or not to antialias the font (if possible).
- *
- * A convenience function which converts @name into a #PangoFontDescription and
- * passes it to vte_terminal_set_font_full().
- *
- * Since: 0.11.11
- *
- * Deprecated: 0.20: Use vte_terminal_set_font()
- */
-void
-vte_terminal_set_font_from_string_full(VteTerminal *terminal, const char *name,
- VteTerminalAntiAlias antialias)
-{
- vte_terminal_set_font_from_string_full_internal(terminal, name, antialias);
-}
-
/**
* vte_terminal_set_font_from_string:
* @terminal: a #VteTerminal
@@ -7541,12 +7507,17 @@ vte_terminal_set_font_from_string_full(VteTerminal *terminal, const char *name,
* passes it to vte_terminal_set_font().
*/
void
-vte_terminal_set_font_from_string(VteTerminal *terminal, const char *name)
+vte_terminal_set_font_from_string(VteTerminal *terminal,
+ const char *name)
{
+ PangoFontDescription *font_desc = NULL;
g_return_if_fail(VTE_IS_TERMINAL(terminal));
- g_return_if_fail(name != NULL);
- vte_terminal_set_font_from_string_full_internal(terminal, name,
- VTE_ANTI_ALIAS_USE_DEFAULT);
+ g_return_if_fail(name != NULL);
+
+ if (name)
+ font_desc = pango_font_description_from_string(name);
+ vte_terminal_set_font(terminal, font_desc);
+ pango_font_description_free(font_desc);
}
/**
diff --git a/src/vtedeprecated.h b/src/vtedeprecated.h
index 24b0d1e..327d177 100644
--- a/src/vtedeprecated.h
+++ b/src/vtedeprecated.h
@@ -45,10 +45,6 @@ typedef enum {
VTE_ANTI_ALIAS_FORCE_DISABLE
} VteTerminalAntiAlias;
-void vte_terminal_set_font_from_string_full(VteTerminal *terminal,
- const char *name,
- VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
-
void vte_terminal_im_append_menuitems(VteTerminal *terminal,
GtkMenuShell *menushell) G_GNUC_DEPRECATED;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]