From 91ab1cd3f86b5eea08f040df8ff53981a7bbe665 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 8 Jan 2017 15:53:29 +0100 Subject: [PATCH 1/3] force X11 --- shell/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/main.c b/shell/main.c index eb2df017..d9dd361e 100644 --- a/shell/main.c +++ b/shell/main.c @@ -234,6 +234,8 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif + gdk_set_allowed_backends ("x11"); + context = g_option_context_new (N_("MATE Document Viewer")); g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); From 004fe59d2319cc55711772a32a976f8956587432 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 28 Jan 2017 07:41:42 +0100 Subject: [PATCH 2/3] use GTK_CHECK_VERSION for previous commit --- shell/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/main.c b/shell/main.c index d9dd361e..49a1f568 100644 --- a/shell/main.c +++ b/shell/main.c @@ -234,7 +234,9 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif +#if GTK_CHECK_VERSION (3, 0, 0) gdk_set_allowed_backends ("x11"); +#endif context = g_option_context_new (N_("MATE Document Viewer")); g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); From a956cb1559c6fb654236f59f2d9ab9b32435a465 Mon Sep 17 00:00:00 2001 From: monsta Date: Thu, 13 Apr 2017 15:07:28 +0300 Subject: [PATCH 3/3] libview: use GtkObject where it has to be in GTK+2 build fix build warnings caused by some mistakes made in 3de4956ee790ad32f268134a25474b63e64a4682 --- libview/ev-view-presentation.c | 8 ++++++++ libview/ev-view.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index dadd0c6b..f6158854 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -1179,7 +1179,11 @@ ev_view_presentation_key_press_event (GtkWidget *widget, EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); if (pview->state == EV_PRESENTATION_END) +#if GTK_CHECK_VERSION (3, 0, 0) return gtk_bindings_activate_event (G_OBJECT (widget), event); +#else + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); +#endif switch (event->keyval) { case GDK_KEY_b: @@ -1239,7 +1243,11 @@ ev_view_presentation_key_press_event (GtkWidget *widget, return TRUE; } +#if GTK_CHECK_VERSION (3, 0, 0) return gtk_bindings_activate_event (G_OBJECT (widget), event); +#else + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); +#endif } static gboolean diff --git a/libview/ev-view.c b/libview/ev-view.c index 42c51184..150fb0a4 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -4427,7 +4427,11 @@ ev_view_key_press_event (GtkWidget *widget, return FALSE; } +#if GTK_CHECK_VERSION (3, 0, 0) return gtk_bindings_activate_event (G_OBJECT (widget), event); +#else + return gtk_bindings_activate_event (GTK_OBJECT (widget), event); +#endif } static gint