Work around recent GTK+ deprecations.

5 files changed, 24 insertions, 0 deletions

diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 8461faf0c9..88198438b7 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -322,7 +322,11 @@ mail_attachment_bar_size_request (GtkWidget *widget,
 	 *     get a sizable gap between the headers and body when this
 	 *     widget is invisible.  Once we finally move to WebKit,
 	 *     remove this. */
+#if GTK_CHECK_VERSION(2,19,7)
+	if (!gtk_widget_get_visible (widget)) {
+#else
 	if (!GTK_WIDGET_VISIBLE (widget)) {
+#endif
 		requisition->width = 0;
 		requisition->height = 0;
 		return;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 27d00f3516..ad316e1177 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1872,7 +1872,11 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader)
 
 		widget = GTK_WIDGET (EM_FORMAT_HTML (html_display)->html);
 
+#if GTK_CHECK_VERSION(2,19,7)
+		html_display_visible = gtk_widget_get_mapped (widget);
+#else
 		html_display_visible = GTK_WIDGET_MAPPED (widget);
+#endif
 		selected_uid_changed = g_strcmp0 (cursor_uid, format_uid);
 
 		if (html_display_visible && selected_uid_changed) {
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index fd0fe783fd..a0ed73e34a 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -953,7 +953,11 @@ efhd_optional_button_show (GtkWidget *widget, GtkWidget *w)
 {
 	GtkWidget *label = g_object_get_data (G_OBJECT (widget), "text-label");
 
+#if GTK_CHECK_VERSION(2,19,7)
+	if (gtk_widget_get_visible (w)) {
+#else
 	if (GTK_WIDGET_VISIBLE (w)) {
+#endif
 		gtk_widget_hide (w);
 		gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("View _Unformatted"));
 	} else {
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 1f2ee35a84..d66f2ab508 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -977,7 +977,11 @@ mail_send_receive (GtkWindow *parent)
 	GList *scan;
 
 	if (send_recv_dialog != NULL) {
+#if GTK_CHECK_VERSION(2,19,7)
+		if (parent != NULL && gtk_widget_get_realized (send_recv_dialog)) {
+#else
 		if (parent != NULL && GTK_WIDGET_REALIZED (send_recv_dialog)) {
+#endif
 			gdk_window_show (send_recv_dialog->window);
 			gdk_window_raise (send_recv_dialog->window);
 		}
diff --git a/mail/message-list.c b/mail/message-list.c
index 277b116019..652695065f 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4715,7 +4715,11 @@ regen_list_done (struct _regen_list_msg *m)
 		}
 	}
 
+#if GTK_CHECK_VERSION(2,19,7)
+	if (gtk_widget_get_visible (GTK_WIDGET (m->ml))) {
+#else
 	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (m->ml))) {
+#endif
 		if (message_list_length (m->ml) <= 0) {
 			/* space is used to indicate no search too */
 			if (m->ml->search && *m->ml->search && strcmp (m->ml->search, " ") != 0)
@@ -4882,7 +4886,11 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
 	}
 
 	if (message_list_length (ml) <= 0) {
+#if GTK_CHECK_VERSION(2,19,7)
+		if (gtk_widget_get_visible (GTK_WIDGET (ml))) {
+#else
 		if (GTK_WIDGET_VISIBLE (GTK_WIDGET (ml))) {
+#endif
 			/* there is some info why the message list is empty, let it be something useful */
 			gchar *txt = g_strconcat (_("Generating message list"), "..." , NULL);