From 7f887e614812ccb86f5d784e2db58bede8daa712 Mon Sep 17 00:00:00 2001 From: ZenWalker Date: Tue, 8 Aug 2017 02:14:01 +0200 Subject: avoid deprecated gdk_screen_get_width/height --- plugins/background/msd-background-manager.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'plugins/background') diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index de1ff34..eed9302 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -183,10 +183,14 @@ static void real_draw_bg (MsdBackgroundManager *manager, GdkScreen *screen) { + gint width; + gint height; + MsdBackgroundManagerPrivate *p = manager->priv; GdkWindow *window = gdk_screen_get_root_window (screen); - gint width = gdk_screen_get_width (screen); - gint height = gdk_screen_get_height (screen); + + gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL, + &width, &height); free_bg_surface (manager); p->surface = mate_bg_create_surface (p->bg, window, width, height, TRUE); @@ -250,15 +254,19 @@ static void on_screen_size_changed (GdkScreen *screen, MsdBackgroundManager *manager) { + gint sc_width, sc_height; + MsdBackgroundManagerPrivate *p = manager->priv; + gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL, + &sc_width, &sc_height); + if (!p->msd_can_draw || p->draw_in_progress || caja_is_drawing_bg (manager)) return; gint scr_num = gdk_x11_screen_get_screen_number (screen); gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num); - gchar *new_size = g_strdup_printf ("%dx%d", gdk_screen_get_width (screen), - gdk_screen_get_height (screen)); + gchar *new_size = g_strdup_printf ("%dx%d", sc_width, sc_height); if (g_strcmp0 (old_size, new_size) != 0) { g_debug ("Screen%d size changed: %s -> %s", scr_num, old_size, new_size); -- cgit v1.2.1