summaryrefslogtreecommitdiff
path: root/gtk/gtkfontbutton.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2011-09-12 00:17:58 +0200
committerChristian Persch <chpe@gnome.org>2011-09-13 12:55:33 +0200
commit6902813a118d973e7b5d098233abaa66becabd7f (patch)
tree7e62b1e69da63796d87923caf116cf8fddfb106c /gtk/gtkfontbutton.c
parentabd9242f3358aad1de4521bd6787643ac82b69db (diff)
downloadgtk+-6902813a118d973e7b5d098233abaa66becabd7f.tar.gz
Rename gtk_font_chooser_get_{family,face,size}
... to gtk_font_chooser_get_font_{family,face,size}, in order to avoid naming conflicts in bindings.
Diffstat (limited to 'gtk/gtkfontbutton.c')
-rw-r--r--gtk/gtkfontbutton.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 022b991122..800551f344 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -1012,17 +1012,17 @@ response_cb (GtkDialog *dialog,
if (priv->font_family)
g_object_unref (priv->font_family);
- priv->font_family = gtk_font_chooser_get_family (font_chooser);
+ priv->font_family = gtk_font_chooser_get_font_family (font_chooser);
if (priv->font_family)
g_object_ref (priv->font_family);
if (priv->font_face)
g_object_unref (priv->font_face);
- priv->font_face = gtk_font_chooser_get_face (font_chooser);
+ priv->font_face = gtk_font_chooser_get_font_face (font_chooser);
if (priv->font_face)
g_object_ref (priv->font_face);
- priv->font_size = gtk_font_chooser_get_size (font_chooser);
+ priv->font_size = gtk_font_chooser_get_font_size (font_chooser);
/* Set label font */
gtk_font_button_update_font_info (font_button);