Commit 6902813a authored by Christian Persch's avatar Christian Persch

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.
parent abd9242f
......@@ -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
......
......@@ -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
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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
......
......@@ -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",
......
......@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment