vte r2271 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Mon Dec  1 14:56:33 2008
New Revision: 2271
URL: http://svn.gnome.org/viewvc/vte?rev=2271&view=rev

Log:
	* src/vte.c: (vte_terminal_set_font_full_internal),
	(vte_terminal_class_init): Rename font property to "font-desc" to be
	more in line with other properties of this type in gtk.

Modified:
   trunk/ChangeLog
   trunk/src/vte.c

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Mon Dec  1 14:56:33 2008
@@ -150,7 +150,7 @@
         PROP_DELETE_BINDING,
         PROP_EMULATION,
         PROP_ENCODING,
-        PROP_FONT,
+        PROP_FONT_DESC,
         PROP_ICON_TITLE,
         PROP_MOUSE_POINTER_AUTOHIDE,
         PROP_PTY,
@@ -7484,7 +7484,7 @@
 	pvt->has_fonts = TRUE;
 
         if (!same_desc)
-                g_object_notify(object, "font");
+                g_object_notify(object, "font-desc");
 
 	/* Set the drawing font. */
 	if (GTK_WIDGET_REALIZED(terminal)) {
@@ -11072,7 +11072,7 @@
                 case PROP_ENCODING:
                         g_value_set_string (value, vte_terminal_get_encoding (terminal));
                         break;
-                case PROP_FONT:
+                case PROP_FONT_DESC:
                         g_value_set_boxed (value, vte_terminal_get_font (terminal));
                         break;
                 case PROP_ICON_TITLE:
@@ -11165,7 +11165,7 @@
                 case PROP_ENCODING:
                         vte_terminal_set_encoding (terminal, g_value_get_string (value));
                         break;
-                case PROP_FONT:
+                case PROP_FONT_DESC:
                         vte_terminal_set_font_full_internal (terminal, g_value_get_boxed (value), pvt->fontantialias);
                         break;
                 case PROP_MOUSE_POINTER_AUTOHIDE:
@@ -11845,7 +11845,7 @@
                                       G_PARAM_READWRITE | STATIC_PARAMS));
      
         /**
-         * VteTerminal:font:
+         * VteTerminal:font-desc:
          *
          * Specifies the font used for rendering all text displayed by the terminal,
          * overriding any fonts set using gtk_widget_modify_font().  The terminal
@@ -11857,8 +11857,8 @@
          */
         g_object_class_install_property
                 (gobject_class,
-                 PROP_FONT,
-                 g_param_spec_boxed ("font", NULL, NULL,
+                 PROP_FONT_DESC,
+                 g_param_spec_boxed ("font-desc", NULL, NULL,
                                      PANGO_TYPE_FONT_DESCRIPTION,
                                      G_PARAM_READWRITE | STATIC_PARAMS));