From 7aebf38bbbe79c3a82fc4723f3fa4b01e230b0f1 Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 26 Nov 2014 14:59:01 +0100 Subject: Gtk3: don't use deprecated gtk_widget_size_request MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Taken from gnome-panel commit: c05c6b07ec493d174062a06caf185d324fd6e0c4 From: Alberts Muktupāvels --- drivemount/drive-button.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'drivemount/drive-button.c') diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c index 2b27add8..54daa608 100644 --- a/drivemount/drive-button.c +++ b/drivemount/drive-button.c @@ -380,8 +380,13 @@ drive_button_update (gpointer user_data) g_free (display_name); /* base the icon size on the desired button size */ +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_get_preferred_size (GTK_WIDGET (self), NULL, &button_req); + gtk_widget_get_preferred_size (gtk_bin_get_child (GTK_BIN (self)), NULL, &image_req); +#else gtk_widget_size_request (GTK_WIDGET (self), &button_req); gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (self)), &image_req); +#endif width = self->icon_size - (button_req.width - image_req.width); height = self->icon_size - (button_req.height - image_req.height); @@ -414,7 +419,11 @@ drive_button_update (gpointer user_data) gtk_image_set_from_pixbuf (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (self))), pixbuf); g_object_unref (pixbuf); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_get_preferred_size (GTK_WIDGET (self), NULL, &button_req); +#else gtk_widget_size_request (GTK_WIDGET (self), &button_req); +#endif return FALSE; } -- cgit v1.2.1