diff options
| author | Christian Persch <chpe@gnome.org> | 2011-09-05 13:26:49 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2011-09-13 12:55:21 +0200 |
| commit | eb9efc9fd2f23217cb4f1053737d27c8b0e22f6a (patch) | |
| tree | 6fe1a48522a6edf94f85c4012c4fa2bbc2088aaf /gtk/gtkfontchooser.c | |
| parent | 5452525143ce10628080ceabf19cb1f68d5708a9 (diff) | |
| download | gtk+-eb9efc9fd2f23217cb4f1053737d27c8b0e22f6a.tar.gz | |
Rename GtkFontChooser:font-name to :font
GtkFontButton already has a property named "font-name" which may
conflict / be an ABI break when moving GtkFontButton to implement
GtkFontChooser. Also, this is more in line with how other parts in
gtk (e.g. GtkCellRendererText) call a font string property.
Diffstat (limited to 'gtk/gtkfontchooser.c')
| -rw-r--r-- | gtk/gtkfontchooser.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c index 66944dc1a3..d041787e74 100644 --- a/gtk/gtkfontchooser.c +++ b/gtk/gtkfontchooser.c @@ -61,8 +61,8 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface) { g_object_interface_install_property (iface, - g_param_spec_string ("font-name", - P_("Font name"), + g_param_spec_string ("font", + P_("Font"), P_("The string that represents this font"), DEFAULT_FONT_NAME, GTK_PARAM_READWRITE)); @@ -166,7 +166,7 @@ gtk_font_chooser_get_size (GtkFontChooser *fontchooser) } /** - * gtk_font_chooser_get_font_name: + * gtk_font_chooser_get_font: * @fontchooser: a #GtkFontChooser * * Gets the currently-selected font name. @@ -187,15 +187,15 @@ gtk_font_chooser_get_size (GtkFontChooser *fontchooser) * Since: 3.2 */ gchar * -gtk_font_chooser_get_font_name (GtkFontChooser *fontchooser) +gtk_font_chooser_get_font (GtkFontChooser *fontchooser) { g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL); - return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->get_font_name (fontchooser); + return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->get_font (fontchooser); } /** - * gtk_font_chooser_set_font_name: + * gtk_font_chooser_set_font: * @fontchooser: a #GtkFontChooser * @fontname: a font name like "Helvetica 12" or "Times Bold 18" * @@ -208,14 +208,14 @@ gtk_font_chooser_get_font_name (GtkFontChooser *fontchooser) * Since: 3.2 */ gboolean -gtk_font_chooser_set_font_name (GtkFontChooser *fontchooser, - const gchar *fontname) +gtk_font_chooser_set_font (GtkFontChooser *fontchooser, + const gchar *fontname) { g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), FALSE); g_return_val_if_fail (fontname != NULL, FALSE); - return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->set_font_name (fontchooser, - fontname); + return GTK_FONT_CHOOSER_GET_IFACE (fontchooser)->set_font (fontchooser, + fontname); } /** |