[gtk+] Rename gtk_font_chooser_get_{family,face,size}

[Christian Persch <chpe src gnome org>]

commit 6902813a118d973e7b5d098233abaa66becabd7f
Author: Christian Persch <chpe gnome org>
Date:   Mon Sep 12 00:17:58 2011 +0200

    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.

 docs/reference/gtk/gtk3-sections.txt |    6 +++---
 gtk/gtk.symbols                      |    6 +++---
 gtk/gtkfontbutton.c                  |    6 +++---
 gtk/gtkfontchooser.c                 |   12 ++++++------
 gtk/gtkfontchooser.h                 |    6 +++---
 gtk/gtkfontchooserutils.c            |    6 +++---
 tests/testfontchooser.c              |    4 ++--
 tests/testfontchooserdialog.c        |    4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index ee5fb84..db85fed 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1480,9 +1480,9 @@ gtk_font_selection_dialog_get_type
 <FILE>gtkfontchooser</FILE>
 <TITLE>GtkFontChooser</TITLE>
 GtkFontChooser
-gtk_font_chooser_get_family
-gtk_font_chooser_get_face
-gtk_font_chooser_get_size
+gtk_font_chooser_get_font_family
+gtk_font_chooser_get_font_face
+gtk_font_chooser_get_font_size
 gtk_font_chooser_get_font
 gtk_font_chooser_set_font
 gtk_font_chooser_get_font_desc
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 0ef3c46..b7baf79 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1049,13 +1049,13 @@ gtk_font_button_set_use_font
 gtk_font_button_set_use_size
 gtk_font_chooser_dialog_get_type
 gtk_font_chooser_dialog_new
-gtk_font_chooser_get_face
-gtk_font_chooser_get_family
+gtk_font_chooser_get_font_face
+gtk_font_chooser_get_font_family
 gtk_font_chooser_get_font
 gtk_font_chooser_get_font_desc
 gtk_font_chooser_get_preview_text
 gtk_font_chooser_get_show_preview_entry
-gtk_font_chooser_get_size
+gtk_font_chooser_get_font_size
 gtk_font_chooser_get_type
 gtk_font_chooser_set_filter_func
 gtk_font_chooser_set_font
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 022b991..800551f 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);
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 1c42427..ed60f43 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -130,7 +130,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
 }
 
 /**
- * gtk_font_chooser_get_family:
+ * gtk_font_chooser_get_font_family:
  * @fontchooser: a #GtkFontChooser
  *
  * Gets the #PangoFontFamily representing the selected font family.
@@ -143,7 +143,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
  * Since: 3.2
  */
 PangoFontFamily *
-gtk_font_chooser_get_family (GtkFontChooser *fontchooser)
+gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
 
@@ -151,7 +151,7 @@ gtk_font_chooser_get_family (GtkFontChooser *fontchooser)
 }
 
 /**
- * gtk_font_chooser_get_face:
+ * gtk_font_chooser_get_font_face:
  * @fontchooser: a #GtkFontChooser
  *
  * Gets the #PangoFontFace representing the selected font group
@@ -164,7 +164,7 @@ gtk_font_chooser_get_family (GtkFontChooser *fontchooser)
  * Since: 3.2
  */
 PangoFontFace *
-gtk_font_chooser_get_face (GtkFontChooser *fontchooser)
+gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
 
@@ -172,7 +172,7 @@ gtk_font_chooser_get_face (GtkFontChooser *fontchooser)
 }
 
 /**
- * gtk_font_chooser_get_size:
+ * gtk_font_chooser_get_font_size:
  * @fontchooser: a #GtkFontChooser
  *
  * The selected font size.
@@ -183,7 +183,7 @@ gtk_font_chooser_get_face (GtkFontChooser *fontchooser)
  * Since: 3.2
  */
 gint
-gtk_font_chooser_get_size (GtkFontChooser *fontchooser)
+gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), -1);
 
diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index b47b65c..5adb237 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -78,9 +78,9 @@ struct _GtkFontChooserIface
 
 GType            gtk_font_chooser_get_type                 (void) G_GNUC_CONST;
 
-PangoFontFamily *gtk_font_chooser_get_family               (GtkFontChooser   *fontchooser);
-PangoFontFace   *gtk_font_chooser_get_face                 (GtkFontChooser   *fontchooser);
-gint             gtk_font_chooser_get_size                 (GtkFontChooser   *fontchooser);
+PangoFontFamily *gtk_font_chooser_get_font_family          (GtkFontChooser   *fontchooser);
+PangoFontFace   *gtk_font_chooser_get_font_face            (GtkFontChooser   *fontchooser);
+gint             gtk_font_chooser_get_font_size            (GtkFontChooser   *fontchooser);
 
 PangoFontDescription *
                  gtk_font_chooser_get_font_desc            (GtkFontChooser             *fontchooser);
diff --git a/gtk/gtkfontchooserutils.c b/gtk/gtkfontchooserutils.c
index c82b8bf..8cf3660 100644
--- a/gtk/gtkfontchooserutils.c
+++ b/gtk/gtkfontchooserutils.c
@@ -38,19 +38,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
diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
index be81e1b..c014687 100644
--- a/tests/testfontchooser.c
+++ b/tests/testfontchooser.c
@@ -28,8 +28,8 @@ notify_font_cb (GtkFontChooser *fontchooser, GParamSpec *pspec, gpointer data)
 
   g_debug ("Changed font name %s", gtk_font_chooser_get_font (fontchooser));
 
-  family = gtk_font_chooser_get_family (fontchooser);
-  face = gtk_font_chooser_get_face (fontchooser);
+  family = gtk_font_chooser_get_font_family (fontchooser);
+  face = gtk_font_chooser_get_font_face (fontchooser);
   if (family)
     {
        g_debug ("  Family: %s is-monospace:%s",
diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index 1c58f12..cc8a5cc 100644
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -28,8 +28,8 @@ notify_font_cb (GtkFontChooser *fontchooser, GParamSpec *pspec, gpointer data)
 
   g_debug ("Changed font name %s", gtk_font_chooser_get_font (fontchooser));
 
-  family = gtk_font_chooser_get_family (fontchooser);
-  face = gtk_font_chooser_get_face (fontchooser);
+  family = gtk_font_chooser_get_font_family (fontchooser);
+  face = gtk_font_chooser_get_font_face (fontchooser);
   if (family)
     {
        g_debug ("  Family: %s is-monospace:%s",