summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-09-02 14:12:37 +0200
committerinfirit <[email protected]>2015-09-06 13:08:32 +0200
commitf63ce7c886a645dcdde4002c2c1727d3aea102d9 (patch)
treed8be997d525479fbd34ba334ec8d09f3a690023e /src
parentc4903b39269fc9c8a4524a5eeddbf872e41dba08 (diff)
downloadeom-f63ce7c886a645dcdde4002c2c1727d3aea102d9.tar.bz2
eom-f63ce7c886a645dcdde4002c2c1727d3aea102d9.tar.xz
Gtk3 EogWindow: Drop deprecated GtkStyle usage
The call to gtk_widget_set_style was actually useless since previous commit. taken from: https://git.gnome.org/browse/eog/commit/?id=bbe4a87
Diffstat (limited to 'src')
-rw-r--r--src/eom-window.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/eom-window.c b/src/eom-window.c
index 6560d81..fd9c3ac 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -1988,6 +1988,9 @@ update_ui_visibility (EomWindow *window)
static void
eom_window_run_fullscreen (EomWindow *window, gboolean slideshow)
{
+#if GTK_CHECK_VERSION (3, 0, 0)
+ static const GdkRGBA black = { 0., 0., 0., 1.};
+#endif
EomWindowPrivate *priv;
GtkWidget *menubar;
gboolean upscale;
@@ -2063,7 +2066,11 @@ eom_window_run_fullscreen (EomWindow *window, gboolean slideshow)
gtk_widget_grab_focus (priv->view);
eom_scroll_view_override_bg_color (EOM_SCROLL_VIEW (window->priv->view),
+#if GTK_CHECK_VERSION (3, 0, 0)
+ &black);
+#else
&(gtk_widget_get_style (GTK_WIDGET (window))->black));
+#endif
#if !GTK_CHECK_VERSION (3, 0, 0)
{
@@ -2141,7 +2148,9 @@ eom_window_stop_fullscreen (EomWindow *window, gboolean slideshow)
eom_scroll_view_override_bg_color (EOM_SCROLL_VIEW (window->priv->view),
NULL);
+#if !GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_style (gtk_widget_get_parent (window->priv->view), NULL);
+#endif
gtk_window_unfullscreen (GTK_WINDOW (window));
if (slideshow) {