[Xfce4-commits] [apps/ristretto] 01/01: Resolve GdkScreen-related deprecation warnings

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/ristretto.

commit 3ab5363f079c257acf0adb9a35e086dd628e8db3
Author: Igor <f2404 at yandex.ru>
Date:   Tue Jul 30 13:00:02 2019 -0400

    Resolve GdkScreen-related deprecation warnings
---
 configure.ac.in               |  2 +-
 src/gnome_wallpaper_manager.c | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 42ae4d4..b6c5ce5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -52,7 +52,7 @@ dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 
 XDT_CHECK_PACKAGE([LIBEXIF], [libexif], [0.6.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.42.0])
diff --git a/src/gnome_wallpaper_manager.c b/src/gnome_wallpaper_manager.c
index b25b04a..660363c 100644
--- a/src/gnome_wallpaper_manager.c
+++ b/src/gnome_wallpaper_manager.c
@@ -71,8 +71,7 @@ cb_style_combo_changed (
         RsttoGnomeWallpaperManager *manager);
 
 static void
-configure_monitor_chooser_pixbuf (
-    RsttoGnomeWallpaperManager *manager );
+configure_monitor_chooser_pixbuf (RsttoGnomeWallpaperManager *manager);
 
 static GObjectClass *parent_class = NULL;
 
@@ -81,7 +80,7 @@ static RsttoWallpaperManager *gnome_wallpaper_manager_object = NULL;
 struct _RsttoGnomeWallpaperManagerPriv
 {
     gint screen;
-    gint    monitor;
+    gint monitor;
     enum MonitorStyle style;
 
     RsttoFile *file;
@@ -114,7 +113,7 @@ rstto_gnome_wallpaper_manager_configure_dialog_run (
     }
 
     manager->priv->pixbuf = gdk_pixbuf_new_from_file_at_size (
-            rstto_file_get_path(file),
+            rstto_file_get_path (file),
             500,
             500,
             NULL);
@@ -220,11 +219,11 @@ rstto_gnome_wallpaper_manager_init (GObject *object)
 {
     RsttoGnomeWallpaperManager *manager = RSTTO_GNOME_WALLPAPER_MANAGER (object);
     GtkWidget *image_prop_grid = gtk_grid_new ();
-    GtkWidget *style_label = gtk_label_new( _("Style:"));
+    GtkWidget *style_label = gtk_label_new (_("Style:"));
     GtkWidget *vbox;
 
-    GdkScreen *screen = gdk_screen_get_default ();
-    gint n_monitors = gdk_screen_get_n_monitors (screen);
+    GdkDisplay *display = gdk_display_get_default ();
+    gint n_monitors = gdk_display_get_n_monitors (display);
     GdkRectangle monitor_geometry;
     gint i;
 
@@ -242,16 +241,15 @@ rstto_gnome_wallpaper_manager_init (GObject *object)
             GTK_RESPONSE_OK,
             NULL);
 
-    vbox = gtk_dialog_get_content_area ( GTK_DIALOG (manager->priv->dialog));
+    vbox = gtk_dialog_get_content_area (GTK_DIALOG (manager->priv->dialog));
 
     manager->priv->monitor_chooser = rstto_monitor_chooser_new ();
     manager->priv->style_combo = gtk_combo_box_text_new ();
 
     for (i = 0; i < n_monitors; ++i)
     {
-        gdk_screen_get_monitor_geometry (
-                screen,
-                i,
+        gdk_monitor_get_geometry (
+                gdk_display_get_monitor (display, i),
                 &monitor_geometry);
         rstto_monitor_chooser_add (
                 RSTTO_MONITOR_CHOOSER (manager->priv->monitor_chooser),
@@ -295,7 +293,8 @@ rstto_gnome_wallpaper_manager_init (GObject *object)
             GTK_COMBO_BOX (manager->priv->style_combo),
             0);
 
-    manager->priv->screen = gdk_screen_get_number (screen);
+    // there's only one screen in GTK3
+    manager->priv->screen = 0;
 
     gtk_window_set_resizable (GTK_WINDOW (manager->priv->dialog), FALSE);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.