diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-12-21 11:37:53 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-12-21 12:18:53 -0500 |
| commit | 1c3f343baf81afa4abec3c0dc3ea6b1fd25f6c6e (patch) | |
| tree | d864a016424118d973afaf9f9fbbc02a01efcc48 /gtk | |
| parent | 559a2bf033da1a375fc289dc5d994c88a82a5611 (diff) | |
| download | gtk+-1c3f343baf81afa4abec3c0dc3ea6b1fd25f6c6e.tar.gz | |
Remove font-name leftovers
There were still a few places where the font-name
property was used internally.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkfontbutton.c | 6 | ||||
| -rw-r--r-- | gtk/inspector/visual.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index ae1db4606e..0394b4789a 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -383,7 +383,6 @@ gtk_font_button_take_font_desc (GtkFontButton *font_button, g_object_notify (G_OBJECT (font_button), "font"); g_object_notify (G_OBJECT (font_button), "font-desc"); - g_object_notify (G_OBJECT (font_button), "font-name"); g_object_thaw_notify (object); } @@ -587,7 +586,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass) * * Note that this signal is only emitted when the user * changes the font. If you need to react to programmatic font changes - * as well, use the notify::font-name signal. + * as well, use the notify::font signal. * * Since: 2.4 */ @@ -787,7 +786,7 @@ gtk_font_button_new (void) GtkWidget * gtk_font_button_new_with_font (const gchar *fontname) { - return g_object_new (GTK_TYPE_FONT_BUTTON, "font-name", fontname, NULL); + return g_object_new (GTK_TYPE_FONT_BUTTON, "font", fontname, NULL); } /** @@ -1147,7 +1146,6 @@ response_cb (GtkDialog *dialog, g_object_notify (G_OBJECT (font_button), "font"); g_object_notify (G_OBJECT (font_button), "font-desc"); - g_object_notify (G_OBJECT (font_button), "font-name"); g_object_thaw_notify (object); diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index 48140cf9cf..03d4a947b1 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -559,7 +559,7 @@ static void init_font (GtkInspectorVisual *vis) { g_object_bind_property (gtk_settings_get_default (), "gtk-font-name", - vis->priv->font_button, "font-name", + vis->priv->font_button, "font", G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE); } |