X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfontchooserutils.c;h=53d76d8e6d1e3315c0ffc3864768ad7d4337a97d;hb=935d458fa1b72b8f1b0a36566b7c40c06870bb9f;hp=5cef3a0747e25ec8a9230119bbf1a23795bdd32b;hpb=eb9efc9fd2f23217cb4f1053737d27c8b0e22f6a;p=~andy%2Fgtk

diff --git a/gtk/gtkfontchooserutils.c b/gtk/gtkfontchooserutils.c
index 5cef3a074..53d76d8e6 100644
--- a/gtk/gtkfontchooserutils.c
+++ b/gtk/gtkfontchooserutils.c
@@ -16,9 +16,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Based on gtkfilechooserutils.c:
  *	Copyright (C) 2003 Red Hat, Inc.
@@ -35,35 +33,22 @@ get_delegate (GtkFontChooser *receiver)
                              GTK_FONT_CHOOSER_DELEGATE_QUARK);
 }
 
-static gchar *
-delegate_get_font (GtkFontChooser *chooser)
-{
-  return gtk_font_chooser_get_font (get_delegate (chooser));
-}
-
-static gboolean
-delegate_set_font (GtkFontChooser *chooser,
-                        const gchar    *fontname)
-{
-  return gtk_font_chooser_set_font (get_delegate (chooser), fontname);
-}
-
 static PangoFontFamily *
 delegate_get_font_family (GtkFontChooser *chooser)
 {
-  return gtk_font_chooser_get_family (get_delegate (chooser));
+  return gtk_font_chooser_get_font_family (get_delegate (chooser));
 }
 
 static PangoFontFace *
 delegate_get_font_face (GtkFontChooser *chooser)
 {
-  return gtk_font_chooser_get_face (get_delegate (chooser));
+  return gtk_font_chooser_get_font_face (get_delegate (chooser));
 }
 
 static int
 delegate_get_font_size (GtkFontChooser *chooser)
 {
-  return gtk_font_chooser_get_size (get_delegate (chooser));
+  return gtk_font_chooser_get_font_size (get_delegate (chooser));
 }
 
 static void
@@ -127,6 +112,9 @@ _gtk_font_chooser_install_properties (GObjectClass *klass)
   g_object_class_override_property (klass,
                                     GTK_FONT_CHOOSER_PROP_FONT,
                                     "font");
+  g_object_class_override_property (klass,
+                                    GTK_FONT_CHOOSER_PROP_FONT_DESC,
+                                    "font-desc");
   g_object_class_override_property (klass,
                                     GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT,
                                     "preview-text");
@@ -149,8 +137,6 @@ _gtk_font_chooser_install_properties (GObjectClass *klass)
 void
 _gtk_font_chooser_delegate_iface_init (GtkFontChooserIface *iface)
 {
-  iface->get_font = delegate_get_font;
-  iface->set_font = delegate_set_font;
   iface->get_font_family = delegate_get_font_family;
   iface->get_font_face = delegate_get_font_face;
   iface->get_font_size = delegate_get_font_size;