diff options
| -rw-r--r-- | ChangeLog | 33 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | PKG-INFO | 4 | ||||
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gi/overrides/Gdk.py | 18 |
6 files changed, 65 insertions, 20 deletions
@@ -1,3 +1,36 @@ +commit 7291cb1f841c384f1a18cc744c8d9c6be20c48e2 +Author: Simon Feltman <sfeltman@src.gnome.org> +Date: Mon Apr 13 19:33:40 2015 -0700 + + overrides: Conditionalize touch override support in Gdk + + Conditionalize Gdk.EventTouch union discrimination. This fixes the + Gdk overrides to continue working with versions of Gdk less than 3.4. + + https://bugzilla.gnome.org/show_bug.cgi?id=747717 + + gi/overrides/Gdk.py | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit c5952495351b551b5295afc36643e3d10004225e +Author: Simon Feltman <sfeltman@src.gnome.org> +Date: Sun Mar 29 16:29:35 2015 -0700 + + configure.ac: post release version bump to 3.16.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46f463a3a3ff45eb8eba67fbb59ecc861b1e1d73 +Author: Simon Feltman <sfeltman@src.gnome.org> +Date: Tue Mar 24 01:25:25 2015 -0700 + + release 3.16.0 + + NEWS | 2 ++ + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + commit bf802599f5d0d13cc4b69f1716400561a16a2443 Author: Simon Feltman <sfeltman@src.gnome.org> Date: Thu Mar 5 01:09:12 2015 -0800 @@ -1,3 +1,7 @@ +3.16.1 13-Apr-2015 + - overrides: Conditionalize touch override support in Gdk + (Simon Feltman) (#747717) + 3.16.0 24-Mar-2015 3.15.91 05-Mar-2015 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.16.0 +Version: 3.16.1 Summary: Python bindings for GObject Home-page: http://www.pygtk.org/ Author: James Henstridge @@ -8,7 +8,7 @@ Author-email: james@daa.com.au Maintainer: Simon Feltman Maintainer-email: sfeltman@src.gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.16/pygobject-3.16.0.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.16/pygobject-3.16.1.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pygobject 3.16.0. +# Generated by GNU Autoconf 2.69 for pygobject 3.16.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.16.0' -PACKAGE_STRING='pygobject 3.16.0' +PACKAGE_VERSION='3.16.1' +PACKAGE_STRING='pygobject 3.16.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='https://wiki.gnome.org/Projects/PyGObject/' @@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pygobject 3.16.0 to adapt to many kinds of systems. +\`configure' configures pygobject 3.16.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1465,7 +1465,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.16.0:";; + short | recursive ) echo "Configuration of pygobject 3.16.1:";; esac cat <<\_ACEOF @@ -1603,7 +1603,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.16.0 +pygobject configure 3.16.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1881,7 +1881,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pygobject $as_me 3.16.0, which was +It was created by pygobject $as_me 3.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2245,9 +2245,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 16" >>confdefs.h PYGOBJECT_MINOR_VERSION=16 -$as_echo "#define PYGOBJECT_MICRO_VERSION 0" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h -PYGOBJECT_MICRO_VERSION=0 +PYGOBJECT_MICRO_VERSION=1 ac_config_headers="$ac_config_headers config.h" @@ -2767,7 +2767,7 @@ fi # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.16.0' + VERSION='3.16.1' cat >>confdefs.h <<_ACEOF @@ -15377,7 +15377,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pygobject $as_me 3.16.0, which was +This file was extended by pygobject $as_me 3.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15444,7 +15444,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pygobject config.status 3.16.0 +pygobject config.status 3.16.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6968b77..b7697cf 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ m4_define(python3_min_ver, 3.1) dnl the pygobject version number m4_define(pygobject_major_version, 3) m4_define(pygobject_minor_version, 16) -m4_define(pygobject_micro_version, 0) +m4_define(pygobject_micro_version, 1) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff --git a/gi/overrides/Gdk.py b/gi/overrides/Gdk.py index c127550..15f2a0a 100644 --- a/gi/overrides/Gdk.py +++ b/gi/overrides/Gdk.py @@ -190,15 +190,20 @@ class Event(Gdk.Event): Gdk.EventType.DROP_FINISHED: 'dnd', Gdk.EventType.CLIENT_EVENT: 'client', Gdk.EventType.VISIBILITY_NOTIFY: 'visibility', - Gdk.EventType.TOUCH_BEGIN: 'touch', - Gdk.EventType.TOUCH_UPDATE: 'touch', - Gdk.EventType.TOUCH_END: 'touch', - Gdk.EventType.TOUCH_CANCEL: 'touch', } if Gdk._version == '2.0': _UNION_MEMBERS[Gdk.EventType.NO_EXPOSE] = 'no_expose' + if hasattr(Gdk.EventType, 'TOUCH_BEGIN'): + _UNION_MEMBERS.update( + { + Gdk.EventType.TOUCH_BEGIN: 'touch', + Gdk.EventType.TOUCH_UPDATE: 'touch', + Gdk.EventType.TOUCH_END: 'touch', + Gdk.EventType.TOUCH_CANCEL: 'touch', + }) + def __getattr__(self, name): real_event = getattr(self, '_UNION_MEMBERS').get(self.type) if real_event: @@ -232,7 +237,6 @@ event_member_classes = ['EventAny', 'EventVisibility', 'EventMotion', 'EventButton', - 'EventTouch', 'EventScroll', 'EventKey', 'EventCrossing', @@ -250,6 +254,10 @@ event_member_classes = ['EventAny', if Gdk._version == '2.0': event_member_classes.append('EventNoExpose') +if hasattr(Gdk, 'EventTouch'): + event_member_classes.append('EventTouch') + + # whitelist all methods that have a success return we want to mask gsuccess_mask_funcs = ['get_state', 'get_axis', |