diff options
| author | Benjamin Otte <otte@redhat.com> | 2016-10-08 05:07:23 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-10-16 18:18:58 +0200 |
| commit | 1518fe0a8f0a973f013e21c185f38111d69d6ac7 (patch) | |
| tree | f3fe2e9fcf10181b91a2d1627a086ca8fd81c485 /gtk/gtkaboutdialog.c | |
| parent | 7ae008421aaf94d0b6968bcbf71fc3e1271181d8 (diff) | |
| download | gtk+-1518fe0a8f0a973f013e21c185f38111d69d6ac7.tar.gz | |
API: stylecontext: Remove state argument from getters
The argument must always be the current state.
Diffstat (limited to 'gtk/gtkaboutdialog.c')
| -rw-r--r-- | gtk/gtkaboutdialog.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 45ac2899ed..8a53711268 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1912,12 +1912,10 @@ follow_if_link (GtkAboutDialog *about, if (uri && !g_slist_find_custom (priv->visited_links, uri, (GCompareFunc)strcmp)) { GdkRGBA visited_link_color; - GtkStateFlags state; GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (about)); gtk_style_context_save (context); - state = gtk_style_context_get_state (context) | GTK_STATE_FLAG_VISITED; - gtk_style_context_set_state (context, state); - gtk_style_context_get_color (context, state, &visited_link_color); + gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_VISITED); + gtk_style_context_get_color (context, &visited_link_color); gtk_style_context_restore (context); g_object_set (G_OBJECT (tag), "foreground-rgba", &visited_link_color, NULL); @@ -2065,8 +2063,12 @@ text_buffer_new (GtkAboutDialog *about, GtkStateFlags state = gtk_widget_get_state_flags (GTK_WIDGET (about)); GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (about)); - gtk_style_context_get_color (context, state | GTK_STATE_FLAG_LINK, &link_color); - gtk_style_context_get_color (context, state | GTK_STATE_FLAG_VISITED, &visited_link_color); + gtk_style_context_save (context); + gtk_style_context_set_state (context, state | GTK_STATE_FLAG_LINK); + gtk_style_context_get_color (context, &link_color); + gtk_style_context_set_state (context, state | GTK_STATE_FLAG_VISITED); + gtk_style_context_get_color (context, &visited_link_color); + gtk_style_context_restore (context); buffer = gtk_text_buffer_new (NULL); for (p = strings; *p; p++) |