Add GtkBubbleWindow

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

diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 1c4242754ebdf97b02c2213f68c3c32b8fc4dedb..6f16b13a5f6594b2c1902cc7f687bb54be4a066d 100644 (file)
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 #include "config.h"
@@ -77,7 +75,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
   g_object_interface_install_property
      (iface,
       g_param_spec_boxed ("font-desc",
-                          P_("Font"),
+                          P_("Font description"),
                           P_("Font description as a PangoFontDescription struct"),
                           PANGO_TYPE_FONT_DESCRIPTION,
                           GTK_PARAM_READWRITE));
@@ -130,20 +128,22 @@ 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.
  * Font families are a collection of font faces.
  *
+ * If the selected font is not installed, returns %NULL.
+ *
  * Return value: (transfer none): A #PangoFontFamily representing the
- *     selected font family. The returned object is owned by @fontchooser
+ *     selected font family, or %NULL. The returned object is owned by @fontchooser
  *     and must not be modified or freed.
  *
  * 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,20 +151,22 @@ 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
  * details (i.e. family, slant, weight, width, etc).
  *
+ * If the selected font is not installed, returns %NULL.
+ *
  * Return value: (transfer none): A #PangoFontFace representing the
- *     selected font group details. The returned object is owned by
+ *     selected font group details, or %NULL. The returned object is owned by
  *     @fontchooser and must not be modified or freed.
  *
  * 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 +174,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 +185,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);