GtkBubbleWindow: rework how drawing is done

[~andy/gtk] / gtk / gtkfontchooserutils.c

diff --git a/gtk/gtkfontchooserutils.c b/gtk/gtkfontchooserutils.c
index 15bc77066d3c843069623255597701fe3b7a7fdf..53d76d8e6d1e3315c0ffc3864768ad7d4337a97d 100644 (file)
--- 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.
@@ -38,19 +36,19 @@ get_delegate (GtkFontChooser *receiver)
 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
@@ -114,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");