2018-03-10 22:44:34 +01:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
|
|
|
|
@@ -84,9 +84,9 @@ YELP_HELP_INIT
|
|
|
|
|
# MATE Libs
|
|
|
|
|
# **********
|
|
|
|
|
|
|
|
|
|
-GLIB_REQUIRED=2.50.0
|
|
|
|
|
-GIO_REQUIRED=2.50.0
|
|
|
|
|
-GTK_REQUIRED=3.22.0
|
|
|
|
|
+GLIB_REQUIRED=2.48.0
|
|
|
|
|
+GIO_REQUIRED=2.48.0
|
|
|
|
|
+GTK_REQUIRED=3.20.0
|
|
|
|
|
MATE_DESKTOP_REQUIRED=1.17.0
|
|
|
|
|
GDKPIXBUF_REQUIRED=2.30.0
|
|
|
|
|
SHARED_MIME_INFO_REQUIRED=0.20
|
|
|
|
|
--- a/src/eom-scroll-view.c
|
|
|
|
|
+++ b/src/eom-scroll-view.c
|
|
|
|
|
@@ -2146,8 +2146,14 @@ view_on_button_press_event_cb (GtkWidget
|
|
|
|
|
/* Ignore double-clicks and triple-clicks */
|
|
|
|
|
if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
|
|
|
|
|
{
|
|
|
|
|
+#if GTK_CHECK_VERSION (3, 22, 0)
|
|
|
|
|
gtk_menu_popup_at_pointer (GTK_MENU (view->priv->menu),
|
|
|
|
|
(const GdkEvent*) event);
|
|
|
|
|
+#else
|
|
|
|
|
+ gtk_menu_popup (GTK_MENU (view->priv->menu),
|
|
|
|
|
+ NULL, NULL, NULL, NULL,
|
|
|
|
|
+ event->button, event->time);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
--- a/src/eom-thumb-view.c
|
|
|
|
|
+++ b/src/eom-thumb-view.c
|
|
|
|
|
@@ -1063,6 +1063,12 @@ eom_thumb_view_popup_menu (EomThumbView
|
|
|
|
|
{
|
|
|
|
|
g_return_if_fail (event != NULL);
|
|
|
|
|
|
|
|
|
|
+#if GTK_CHECK_VERSION (3, 22, 0)
|
|
|
|
|
gtk_menu_popup_at_pointer (GTK_MENU (thumbview->priv->menu),
|
|
|
|
|
(const GdkEvent*) event);
|
|
|
|
|
+#else
|
|
|
|
|
+ gtk_menu_popup (GTK_MENU (thumbview->priv->menu),
|
|
|
|
|
+ NULL, NULL, NULL, NULL,
|
|
|
|
|
+ event->button, event->time);
|
|
|
|
|
+#endif
|
|
|
|
|
}
|
|
|
|
|
--- a/src/eom-util.c
|
|
|
|
|
+++ b/src/eom-util.c
|
|
|
|
|
@@ -53,7 +53,11 @@ eom_util_show_help (const gchar *section
|
|
|
|
|
if (section)
|
|
|
|
|
uri = g_strdup_printf ("help:eom/%s", section);
|
|
|
|
|
|
|
|
|
|
+#if GTK_CHECK_VERSION (3, 22, 0)
|
|
|
|
|
gtk_show_uri_on_window (parent, ((uri != NULL) ? uri : "help:eom"),
|
|
|
|
|
+#else
|
|
|
|
|
+ gtk_show_uri (NULL, ((uri != NULL) ? uri : "help:eom"),
|
|
|
|
|
+#endif
|
|
|
|
|
gtk_get_current_event_time (), &error);
|
|
|
|
|
|
|
|
|
|
g_free (uri);
|
|
|
|
|
--- a/src/eom-window.c
|
|
|
|
|
+++ b/src/eom-window.c
|
|
|
|
|
@@ -1198,9 +1198,16 @@ eom_window_obtain_desired_size (EomImage
|
|
|
|
|
screen = gtk_window_get_screen (GTK_WINDOW (window));
|
|
|
|
|
display = gdk_screen_get_display (screen);
|
|
|
|
|
|
|
|
|
|
+#if GTK_CHECK_VERSION (3, 22, 0)
|
|
|
|
|
gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
|
|
|
|
|
gtk_widget_get_window (GTK_WIDGET (window))),
|
|
|
|
|
&monitor);
|
|
|
|
|
+#else
|
|
|
|
|
+ gdk_screen_get_monitor_geometry (screen,
|
|
|
|
|
+ gdk_screen_get_monitor_at_window (screen,
|
2018-03-14 01:12:52 +01:00
|
|
|
+ gtk_widget_get_window (GTK_WIDGET (window))),
|
2018-03-10 22:44:34 +01:00
|
|
|
+ &monitor);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
screen_width = monitor.width;
|
|
|
|
|
screen_height = monitor.height;
|
|
|
|
|
@@ -1649,9 +1656,16 @@ eom_window_update_fullscreen_popup (EomW
|
|
|
|
|
screen = gtk_widget_get_screen (GTK_WIDGET (window));
|
|
|
|
|
display = gdk_screen_get_display (screen);
|
|
|
|
|
|
|
|
|
|
+#if GTK_CHECK_VERSION (3, 22, 0)
|
|
|
|
|
gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
|
|
|
|
|
gtk_widget_get_window (GTK_WIDGET (window))),
|
|
|
|
|
&screen_rect);
|
|
|
|
|
+#else
|
|
|
|
|
+ gdk_screen_get_monitor_geometry (screen,
|
|
|
|
|
+ gdk_screen_get_monitor_at_window(screen,
|
|
|
|
|
+ gtk_widget_get_window (GTK_WIDGET (window))),
|
|
|
|
|
+ &screen_rect);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
gtk_widget_set_size_request (popup,
|
|
|
|
|
screen_rect.width,
|
