summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-12-10 20:38:45 +0100
committerWolfgang Ulbrich <[email protected]>2015-12-10 20:38:45 +0100
commit1ddc241afa5cff81bac8876869974cb43f9cbf2e (patch)
tree84ef92e2e002ac5e47300bb07ffcacfb91ffc8cd
parent7b6b7b641c8a33703692333bfeccd87238ae1c73 (diff)
downloadmate-screensaver-1ddc241afa5cff81bac8876869974cb43f9cbf2e.tar.bz2
mate-screensaver-1ddc241afa5cff81bac8876869974cb43f9cbf2e.tar.xz
GTK3: don't use deprecated gtk_widget_size_request
-rw-r--r--savers/gs-theme-window.c4
-rw-r--r--src/gs-window-x11.c4
-rw-r--r--src/mate-screensaver-preferences.c4
3 files changed, 12 insertions, 0 deletions
diff --git a/savers/gs-theme-window.c b/savers/gs-theme-window.c
index 089a7f2..70ac063 100644
--- a/savers/gs-theme-window.c
+++ b/savers/gs-theme-window.c
@@ -200,7 +200,11 @@ gs_theme_window_real_realize (GtkWidget *widget)
exit (1);
}
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_widget_get_preferred_size (widget, &requisition, NULL);
+#else
gtk_widget_size_request (widget, &requisition);
+#endif
allocation.x = x;
allocation.y = y;
allocation.width = width;
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index ee7b197..20acf82 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -2460,7 +2460,11 @@ gs_window_real_size_request (GtkWidget *widget,
if (child && gtk_widget_get_visible (child))
{
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_widget_get_preferred_size (child, requisition, NULL);
+#else
gtk_widget_size_request (child, requisition);
+#endif
}
old_geometry = window->priv->geometry;
diff --git a/src/mate-screensaver-preferences.c b/src/mate-screensaver-preferences.c
index b719f38..19db7d5 100644
--- a/src/mate-screensaver-preferences.c
+++ b/src/mate-screensaver-preferences.c
@@ -1212,7 +1212,11 @@ constrain_list_size (GtkWidget *widget,
/* constrain height to be the tree height up to a max */
max_height = (gdk_screen_get_height (gtk_widget_get_screen (widget))) / 4;
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_widget_get_preferred_size (to_size, &req, NULL);
+#else
gtk_widget_size_request (to_size, &req);
+#endif
requisition->height = MIN (req.height, max_height);
}