From 2be32a55532fbb010f83472064435aae49e36270 Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 28 Jan 2018 22:42:47 +0300 Subject: require GTK+ 3.22 and GLib 2.50 --- capplets/common/capplet-util.c | 14 -------------- capplets/common/file-transfer-dialog.c | 4 ---- 2 files changed, 18 deletions(-) (limited to 'capplets/common') diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index 3f9e4b53..d2458d9b 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -71,26 +71,12 @@ capplet_help (GtkWindow *parent, char const *section) { GError *error = NULL; char *uri; -#if !GTK_CHECK_VERSION (3, 22, 0) - GdkScreen *screen; -#endif g_return_if_fail (section != NULL); -#if !GTK_CHECK_VERSION (3, 22, 0) - if (!parent) - screen = gdk_screen_get_default (); - else - screen = gtk_widget_get_screen (GTK_WIDGET (parent)); -#endif - uri = g_strdup_printf ("help:mate-user-guide/%s", section); -#if GTK_CHECK_VERSION (3, 22, 0) if (!gtk_show_uri_on_window (parent , uri, gtk_get_current_event_time (), &error)) { -#else - if (!gtk_show_uri (screen, uri, gtk_get_current_event_time (), &error)) { -#endif capplet_error_dialog ( parent, _("There was an error displaying help: %s"), diff --git a/capplets/common/file-transfer-dialog.c b/capplets/common/file-transfer-dialog.c index 03747935..8d2c2ec4 100644 --- a/capplets/common/file-transfer-dialog.c +++ b/capplets/common/file-transfer-dialog.c @@ -313,12 +313,8 @@ file_transfer_dialog_init (FileTransferDialog *dlg) gtk_label_set_markup (GTK_LABEL (dlg->priv->status), markup); g_free (markup); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (dlg->priv->status), 0.0); gtk_label_set_yalign (GTK_LABEL (dlg->priv->status), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dlg->priv->status), 0.0, 0.0); -#endif gtk_box_pack_start (GTK_BOX (vbox), dlg->priv->status, FALSE, FALSE, 0); -- cgit v1.2.1