To: vim_dev@googlegroups.com Subject: Patch 7.4.1749 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1749 Problem: When using GTK 3.20 there are a few warnings. Solution: Use new functions when available. (Kazunobu Kuriyama) Files: src/gui_beval,c src/gui_gtk_x11.c *** ../vim-7.4.1748/src/gui_beval.c 2016-02-23 17:13:56.877032330 +0100 --- src/gui_beval.c 2016-04-17 20:47:44.399079056 +0200 *************** *** 557,564 **** --- 557,569 ---- { GdkWindow * const win = gtk_widget_get_window(widget); GdkDisplay * const dpy = gdk_window_get_display(win); + # if GTK_CHECK_VERSION(3,20,0) + GdkSeat * const seat = gdk_display_get_default_seat(dpy); + GdkDevice * const dev = gdk_seat_get_pointer(seat); + # else GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy); GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr); + # endif gdk_window_get_device_position(win, dev , &x, &y, &state); } # else *** ../vim-7.4.1748/src/gui_gtk_x11.c 2016-04-05 21:56:03.101715603 +0200 --- src/gui_gtk_x11.c 2016-04-17 20:47:44.403079015 +0200 *************** *** 1842,1849 **** --- 1842,1854 ---- { GdkWindow * const win = gtk_widget_get_window(widget); GdkDisplay * const dpy = gdk_window_get_display(win); + # if GTK_CHECK_VERSION(3,20,0) + GdkSeat * const seat = gdk_display_get_default_seat(dpy); + return gdk_seat_get_pointer(seat); + # else GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy); return gdk_device_manager_get_client_pointer(mngr); + # endif } static GdkWindow * *** ../vim-7.4.1748/src/version.c 2016-04-16 09:13:31.538407268 +0200 --- src/version.c 2016-04-17 20:49:21.458074740 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1749, /**/ -- FATHER: One day, lad, all this will be yours ... PRINCE: What - the curtains? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///