diff options
| author | Pablo Barciela <[email protected]> | 2018-05-05 20:52:06 +0200 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2018-05-05 21:52:40 +0200 |
| commit | e88c26a010b0e3b06317680cdce397ef77c137d4 (patch) | |
| tree | 215c12eb159cc5a4ab5d4ce5d1c5656a601ec446 /src | |
| parent | df750ae2c2def80ff24b989c7f43e64a43f635aa (diff) | |
| download | caja-e88c26a010b0e3b06317680cdce397ef77c137d4.tar.bz2 caja-e88c26a010b0e3b06317680cdce397ef77c137d4.tar.xz | |
avoid deprecated 'gtk_style_context_get_background_color'
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-location-bar.c | 9 | ||||
| -rw-r--r-- | src/caja-sidebar-title.c | 20 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 9 |
3 files changed, 33 insertions, 5 deletions
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c index 89d095a9..9de909b3 100644 --- a/src/caja-location-bar.c +++ b/src/caja-location-bar.c @@ -605,9 +605,16 @@ caja_location_bar_set_active(CajaLocationBar *location_bar, gboolean is_active) { GtkStyleContext *style; GdkRGBA color; + GdkRGBA *c; style = gtk_widget_get_style_context (GTK_WIDGET (location_bar->details->entry)); - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_INSENSITIVE, &color); + + gtk_style_context_get (style, GTK_STATE_FLAG_INSENSITIVE, + GTK_STYLE_PROPERTY_BACKGROUND_COLOR, + &c, NULL); + color = *c; + gdk_rgba_free (c); + gtk_widget_override_background_color (GTK_WIDGET (location_bar->details->entry), GTK_STATE_FLAG_ACTIVE, &color); } } diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c index 2c2cebe1..516a58e4 100644 --- a/src/caja-sidebar-title.c +++ b/src/caja-sidebar-title.c @@ -244,6 +244,7 @@ caja_sidebar_title_select_text_color (CajaSidebarTitle *sidebar_title, GdkRGBA *light_info_color, *dark_info_color; GtkStyleContext *style; GdkRGBA color; + GdkRGBA *c; g_assert (CAJA_IS_SIDEBAR_TITLE (sidebar_title)); g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (sidebar_title))); @@ -276,11 +277,19 @@ caja_sidebar_title_select_text_color (CajaSidebarTitle *sidebar_title, gtk_style_context_get_color (style, GTK_STATE_FLAG_PRELIGHT, &color); setup_gc_with_fg (sidebar_title, LABEL_COLOR_PRELIGHT, &color); - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED, &color); + gtk_style_context_get (style, GTK_STATE_FLAG_SELECTED, + GTK_STYLE_PROPERTY_BACKGROUND_COLOR, + &c, NULL); + color = *c; + setup_gc_with_fg (sidebar_title, LABEL_INFO_COLOR_HIGHLIGHT, eel_gdk_rgba_is_dark (&color) ? light_info_color : dark_info_color); - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_ACTIVE, &color); + gtk_style_context_get (style, GTK_STATE_FLAG_ACTIVE, + GTK_STYLE_PROPERTY_BACKGROUND_COLOR, + &c, NULL); + color = *c; + setup_gc_with_fg (sidebar_title, LABEL_INFO_COLOR_ACTIVE, eel_gdk_rgba_is_dark (&color) ? light_info_color : dark_info_color); @@ -293,7 +302,11 @@ caja_sidebar_title_select_text_color (CajaSidebarTitle *sidebar_title, gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &color); setup_gc_with_fg (sidebar_title, LABEL_COLOR, &color); - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &color); + gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, + GTK_STYLE_PROPERTY_BACKGROUND_COLOR, + &color, NULL); + color = *c; + setup_gc_with_fg (sidebar_title, LABEL_INFO_COLOR, eel_gdk_rgba_is_dark (&color) ? light_info_color : dark_info_color); @@ -315,6 +328,7 @@ caja_sidebar_title_select_text_color (CajaSidebarTitle *sidebar_title, setup_gc_with_fg (sidebar_title, LABEL_INFO_COLOR, dark_info_color); } + gdk_rgba_free (c); gdk_rgba_free (dark_info_color); gdk_rgba_free (light_info_color); } diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index d2ef57f6..fe16fe44 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -3276,6 +3276,7 @@ real_set_is_active (FMDirectoryView *view, GtkWidget *tree_view; GtkStyleContext *style; GdkRGBA color; + GdkRGBA *c; tree_view = GTK_WIDGET (fm_list_view_get_tree_view (FM_LIST_VIEW (view))); @@ -3286,7 +3287,13 @@ real_set_is_active (FMDirectoryView *view, else { style = gtk_widget_get_style_context (tree_view); - gtk_style_context_get_background_color (style, GTK_STATE_FLAG_INSENSITIVE, &color); + + gtk_style_context_get (style, GTK_STATE_FLAG_INSENSITIVE, + GTK_STYLE_PROPERTY_BACKGROUND_COLOR, + &c, NULL); + color = *c; + gdk_rgba_free (c); + gtk_widget_override_background_color (tree_view, GTK_STATE_FLAG_NORMAL, &color); } |