vte r2181 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 22 14:01:03 2008
New Revision: 2181
URL: http://svn.gnome.org/viewvc/vte?rev=2181&view=rev

Log:
	Bug 560766 â Deprecate and remove vte_terminal_get_using_xft()

	* src/vte.c: (vte_terminal_get_using_xft):
	* src/vte.h:
	* src/vtedraw.c: (_vte_draw_text):
	* src/vtedraw.h:
	* src/vtepangocairo.c: Deprecate vte_terminal_get_using_xft() as preparation for
	bug #560766. Remove the internal vtedraw method already.

Modified:
   trunk/ChangeLog
   trunk/src/vte.c
   trunk/src/vte.h
   trunk/src/vtedraw.c
   trunk/src/vtedraw.h
   trunk/src/vtepangocairo.c

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Sat Nov 22 14:01:03 2008
@@ -12662,14 +12662,15 @@
  * fontconfig to find fonts.  This setting cannot be changed by the caller,
  * but in practice usually matches the behavior of GTK+ itself.
  *
- * Returns: %TRUE if the terminal is using fontconfig to find fonts, %FALSE if
- * the terminal is using PangoX.
+ * Returns: %TRUE
+ *
+ * Deprecated: 0.17.5
  */
 gboolean
 vte_terminal_get_using_xft(VteTerminal *terminal)
 {
-	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-	return _vte_draw_get_using_fontconfig(terminal->pvt->draw);
+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), TRUE);
+	return TRUE;
 }
 
 static void

Modified: trunk/src/vte.h
==============================================================================
--- trunk/src/vte.h	(original)
+++ trunk/src/vte.h	Sat Nov 22 14:01:03 2008
@@ -329,7 +329,9 @@
 					    const char *name,
 					    VteTerminalAntiAlias antialias);
 const PangoFontDescription *vte_terminal_get_font(VteTerminal *terminal);
-gboolean vte_terminal_get_using_xft(VteTerminal *terminal);
+#ifndef VTE_DISABLE_DEPRECATED
+gboolean vte_terminal_get_using_xft(VteTerminal *terminal) G_GNUC_DEPRECATED;
+#endif
 void vte_terminal_set_allow_bold(VteTerminal *terminal, gboolean allow_bold);
 gboolean vte_terminal_get_allow_bold(VteTerminal *terminal);
 

Modified: trunk/src/vtedraw.c
==============================================================================
--- trunk/src/vtedraw.c	(original)
+++ trunk/src/vtedraw.c	Sat Nov 22 14:01:03 2008
@@ -327,17 +327,6 @@
 	return width;
 }
 
-gboolean
-_vte_draw_get_using_fontconfig (struct _vte_draw *draw)
-{
-	gboolean using_fontconfig = TRUE;
-
-	if (draw->impl->get_using_fontconfig)
-		using_fontconfig = draw->impl->get_using_fontconfig (draw);
-
-	return using_fontconfig;
-}
-
 void
 _vte_draw_text (struct _vte_draw *draw,
 	       struct _vte_draw_text_request *requests, gsize n_requests,

Modified: trunk/src/vtedraw.h
==============================================================================
--- trunk/src/vtedraw.h	(original)
+++ trunk/src/vtedraw.h	Sat Nov 22 14:01:03 2008
@@ -76,7 +76,6 @@
 			      VteTerminalAntiAlias);
 	void (*get_text_metrics)(struct _vte_draw *, gint *, gint *, gint *);
 	int (*get_char_width)(struct _vte_draw *, gunichar c, int columns);
-	gboolean (*get_using_fontconfig)(struct _vte_draw *);
 	void (*draw_text)(struct _vte_draw *,
 			  struct _vte_draw_text_request *, gsize,
 			  GdkColor *, guchar);
@@ -149,7 +148,6 @@
 void _vte_draw_get_text_metrics(struct _vte_draw *draw,
 				gint *width, gint *height, gint *ascent);
 int _vte_draw_get_char_width(struct _vte_draw *draw, gunichar c, int columns);
-gboolean _vte_draw_get_using_fontconfig(struct _vte_draw *draw);
 
 /* Draw text or rectangles. */
 void _vte_draw_text(struct _vte_draw *draw,

Modified: trunk/src/vtepangocairo.c
==============================================================================
--- trunk/src/vtepangocairo.c	(original)
+++ trunk/src/vtepangocairo.c	Sat Nov 22 14:01:03 2008
@@ -913,7 +913,6 @@
 	_vte_pangocairo_set_text_font,
 	_vte_pangocairo_get_text_metrics,
 	_vte_pangocairo_get_char_width,
-	NULL, /* get_using_fontconfig */
 	_vte_pangocairo_draw_text,
 	_vte_pangocairo_draw_has_char,
 	_vte_pangocairo_draw_rectangle,