gnucash maint: Bug 797170 - gnucash-3.5 fails to compile with GTK+3-3.20.x

John Ralls jralls at code.gnucash.org
Tue Apr 2 20:29:21 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/df80796a (commit)
	from  https://github.com/Gnucash/gnucash/commit/b14cb64d (commit)



commit df80796afe60d628741d03daad2b1b6f529328a3
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 2 17:27:41 2019 -0700

    Bug 797170 - gnucash-3.5 fails to compile with GTK+3-3.20.x
    
    Because of mismatched Gtk version macros in gcrp_grab_on_window.

diff --git a/gnucash/gnome-utils/gnc-cell-renderer-popup.c b/gnucash/gnome-utils/gnc-cell-renderer-popup.c
index 04bcf060b..7ba11429c 100644
--- a/gnucash/gnome-utils/gnc-cell-renderer-popup.c
+++ b/gnucash/gnome-utils/gnc-cell-renderer-popup.c
@@ -223,7 +223,7 @@ gcrp_grab_on_window (GdkWindow *window,
     GdkDevice *device;
 #endif
 
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3,20,0)
     GdkEvent *event = gtk_get_current_event ();
 #endif
 
@@ -234,7 +234,7 @@ gcrp_grab_on_window (GdkWindow *window,
     device = gdk_device_manager_get_client_pointer (device_manager);
 #endif
 
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3,20,0)
     if ((gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_POINTER, TRUE, NULL,
                         event, NULL, NULL) == GDK_GRAB_SUCCESS )) {
         if (gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_KEYBOARD, TRUE, NULL,
@@ -251,7 +251,7 @@ gcrp_grab_on_window (GdkWindow *window,
 #endif
             return TRUE;
         else {
-#if GTK_CHECK_VERSION(3,22,0)
+#if GTK_CHECK_VERSION(3,20,0)
             gdk_seat_ungrab (seat);
 #else
             gdk_device_ungrab (device, activate_time);



Summary of changes:
 gnucash/gnome-utils/gnc-cell-renderer-popup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list