gnome-terminal r2997 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sat Aug 23 19:17:20 2008
New Revision: 2997
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2997&view=rev

Log:
Also follow the no-aa-without-render pref when running on vte >= 0.17. Bug #399744.

Modified:
   trunk/src/terminal-profile.c
   trunk/src/terminal-screen.c

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Sat Aug 23 19:17:20 2008
@@ -1273,9 +1273,7 @@
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (ALLOW_BOLD, DEFAULT_ALLOW_BOLD, KEY_ALLOW_BOLD);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (DEFAULT_SHOW_MENUBAR, DEFAULT_DEFAULT_SHOW_MENUBAR, KEY_DEFAULT_SHOW_MENUBAR);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (LOGIN_SHELL, DEFAULT_LOGIN_SHELL, KEY_LOGIN_SHELL);
-#if !VTE_CHECK_VERSION (0, 16, 15)
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (NO_AA_WITHOUT_RENDER, DEFAULT_NO_AA_WITHOUT_RENDER, KEY_NO_AA_WITHOUT_RENDER);
-#endif
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_BACKGROUND, DEFAULT_SCROLL_BACKGROUND, KEY_SCROLL_BACKGROUND);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_KEYSTROKE, DEFAULT_SCROLL_ON_KEYSTROKE, KEY_SCROLL_ON_KEYSTROKE);
   TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_OUTPUT, DEFAULT_SCROLL_ON_OUTPUT, KEY_SCROLL_ON_OUTPUT);

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Sat Aug 23 19:17:20 2008
@@ -1069,9 +1069,7 @@
   TerminalScreenPrivate *priv = screen->priv;
   TerminalProfile *profile;
   PangoFontDescription *desc;
-#if !VTE_CHECK_VERSION (0, 16, 15)
   gboolean no_aa_without_render;
-#endif
 
   profile = priv->profile;
   
@@ -1085,10 +1083,11 @@
 				   priv->font_scale *
 				   pango_font_description_get_size (desc));
 
+  no_aa_without_render = terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_NO_AA_WITHOUT_RENDER);
 #if VTE_CHECK_VERSION (0, 16, 15)
-  vte_terminal_set_font (VTE_TERMINAL (screen), desc);
+  vte_terminal_set_font_full (VTE_TERMINAL (screen), desc,
+                              no_aa_without_render ? VTE_ANTI_ALIAS_USE_DEFAULT : VTE_ANTI_ALIAS_FORCE_ENABLE);
 #else
-  no_aa_without_render = terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_NO_AA_WITHOUT_RENDER);
   if (!no_aa_without_render)
     {
       vte_terminal_set_font (VTE_TERMINAL (screen), desc);