[pygobject] Gdk overrides: Unbreak for Gdk-2.0
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] Gdk overrides: Unbreak for Gdk-2.0
- Date: Wed, 19 Oct 2011 12:37:00 +0000 (UTC)
commit 8deaec6b9abd87f02060c9feec773d4693e89028
Author: Martin Pitt <martin pitt ubuntu com>
Date: Wed Oct 19 14:35:11 2011 +0200
Gdk overrides: Unbreak for Gdk-2.0
Fix regression from commit 31db3ed: Gdk 2.0 did not yet have atom_intern(), so
only do this for Gdk >= 3.0.
https://launchpad.net/bugs/875399
gi/overrides/Gdk.py | 95 ++++++++++++++++++++++++++-------------------------
1 files changed, 48 insertions(+), 47 deletions(-)
---
diff --git a/gi/overrides/Gdk.py b/gi/overrides/Gdk.py
index d94201e..c48a242 100644
--- a/gi/overrides/Gdk.py
+++ b/gi/overrides/Gdk.py
@@ -293,53 +293,54 @@ def color_parse(color):
return color
# constants
-SELECTION_PRIMARY = Gdk.atom_intern('PRIMARY', True)
-__all__.append('SELECTION_PRIMARY')
-
-SELECTION_SECONDARY = Gdk.atom_intern('SECONDARY', True)
-__all__.append('SELECTION_SECONDARY')
-
-SELECTION_CLIPBOARD = Gdk.atom_intern('CLIPBOARD', True)
-__all__.append('SELECTION_CLIPBOARD')
-
-TARGET_BITMAP = Gdk.atom_intern('BITMAP', True)
-__all__.append('TARGET_BITMAP')
-
-TARGET_COLORMAP = Gdk.atom_intern('COLORMAP', True)
-__all__.append('TARGET_COLORMAP')
-
-TARGET_DRAWABLE = Gdk.atom_intern('DRAWABLE', True)
-__all__.append('TARGET_DRAWABLE')
-
-TARGET_PIXMAP = Gdk.atom_intern('PIXMAP', True)
-__all__.append('TARGET_PIXMAP')
-
-TARGET_STRING = Gdk.atom_intern('STRING', True)
-__all__.append('TARGET_STRING')
-
-SELECTION_TYPE_ATOM = Gdk.atom_intern('ATOM', True)
-__all__.append('SELECTION_TYPE_ATOM')
-
-SELECTION_TYPE_BITMAP = Gdk.atom_intern('BITMAP', True)
-__all__.append('SELECTION_TYPE_BITMAP')
-
-SELECTION_TYPE_COLORMAP = Gdk.atom_intern('COLORMAP', True)
-__all__.append('SELECTION_TYPE_COLORMAP')
-
-SELECTION_TYPE_DRAWABLE = Gdk.atom_intern('DRAWABLE', True)
-__all__.append('SELECTION_TYPE_DRAWABLE')
-
-SELECTION_TYPE_INTEGER = Gdk.atom_intern('INTEGER', True)
-__all__.append('SELECTION_TYPE_INTEGER')
-
-SELECTION_TYPE_PIXMAP = Gdk.atom_intern('PIXMAP', True)
-__all__.append('SELECTION_TYPE_PIXMAP')
-
-SELECTION_TYPE_WINDOW = Gdk.atom_intern('WINDOW', True)
-__all__.append('SELECTION_TYPE_WINDOW')
-
-SELECTION_TYPE_STRING = Gdk.atom_intern('STRING', True)
-__all__.append('SELECTION_TYPE_STRING')
+if Gdk._version >= '3.0':
+ SELECTION_PRIMARY = Gdk.atom_intern('PRIMARY', True)
+ __all__.append('SELECTION_PRIMARY')
+
+ SELECTION_SECONDARY = Gdk.atom_intern('SECONDARY', True)
+ __all__.append('SELECTION_SECONDARY')
+
+ SELECTION_CLIPBOARD = Gdk.atom_intern('CLIPBOARD', True)
+ __all__.append('SELECTION_CLIPBOARD')
+
+ TARGET_BITMAP = Gdk.atom_intern('BITMAP', True)
+ __all__.append('TARGET_BITMAP')
+
+ TARGET_COLORMAP = Gdk.atom_intern('COLORMAP', True)
+ __all__.append('TARGET_COLORMAP')
+
+ TARGET_DRAWABLE = Gdk.atom_intern('DRAWABLE', True)
+ __all__.append('TARGET_DRAWABLE')
+
+ TARGET_PIXMAP = Gdk.atom_intern('PIXMAP', True)
+ __all__.append('TARGET_PIXMAP')
+
+ TARGET_STRING = Gdk.atom_intern('STRING', True)
+ __all__.append('TARGET_STRING')
+
+ SELECTION_TYPE_ATOM = Gdk.atom_intern('ATOM', True)
+ __all__.append('SELECTION_TYPE_ATOM')
+
+ SELECTION_TYPE_BITMAP = Gdk.atom_intern('BITMAP', True)
+ __all__.append('SELECTION_TYPE_BITMAP')
+
+ SELECTION_TYPE_COLORMAP = Gdk.atom_intern('COLORMAP', True)
+ __all__.append('SELECTION_TYPE_COLORMAP')
+
+ SELECTION_TYPE_DRAWABLE = Gdk.atom_intern('DRAWABLE', True)
+ __all__.append('SELECTION_TYPE_DRAWABLE')
+
+ SELECTION_TYPE_INTEGER = Gdk.atom_intern('INTEGER', True)
+ __all__.append('SELECTION_TYPE_INTEGER')
+
+ SELECTION_TYPE_PIXMAP = Gdk.atom_intern('PIXMAP', True)
+ __all__.append('SELECTION_TYPE_PIXMAP')
+
+ SELECTION_TYPE_WINDOW = Gdk.atom_intern('WINDOW', True)
+ __all__.append('SELECTION_TYPE_WINDOW')
+
+ SELECTION_TYPE_STRING = Gdk.atom_intern('STRING', True)
+ __all__.append('SELECTION_TYPE_STRING')
import sys
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]