gnome-terminal r2937 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Fri Jun 27 19:05:56 2008
New Revision: 2937
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2937&view=rev

Log:
Vte now takes care not to enable antialiasing if Xrender isn't present, so our workaround code can be disabled on vte >= 0.16.15.

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	Fri Jun 27 19:05:56 2008
@@ -1272,7 +1272,9 @@
   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	Fri Jun 27 19:05:56 2008
@@ -1069,7 +1069,9 @@
   TerminalScreenPrivate *priv = screen->priv;
   TerminalProfile *profile;
   PangoFontDescription *desc;
+#if !VTE_CHECK_VERSION (0, 16, 15)
   gboolean no_aa_without_render;
+#endif
 
   profile = priv->profile;
   
@@ -1083,6 +1085,9 @@
 				   priv->font_scale *
 				   pango_font_description_get_size (desc));
 
+#if VTE_CHECK_VERSION (0, 16, 15)
+  vte_terminal_set_font (VTE_TERMINAL (screen), desc);
+#else
   no_aa_without_render = terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_NO_AA_WITHOUT_RENDER);
   if (!no_aa_without_render)
     {
@@ -1106,6 +1111,7 @@
 				    desc,
 				    VTE_ANTI_ALIAS_FORCE_DISABLE);
     }
+#endif /* VTE 0.16.15 */
 
   pango_font_description_free (desc);
 }