Merge lp:~dobey/ubuntu/raring/twisted/lp1098127 into lp:ubuntu/raring/twisted

[dobey]

* debian/patches/lp1098127.diff:
  - Use new io_add_watch api on new versions of pygobject. (LP: #1098127)

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-23 12:19:06 +0000
+++ debian/changelog	2013-03-14 21:45:26 +0000
@@ -1,3 +1,10 @@
+twisted (12.3.0-1ubuntu5) raring; urgency=low
+
+  * debian/patches/lp1098127.diff:
+    - Use new io_add_watch api on new versions of pygobject. (LP: #1098127)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 14 Mar 2013 17:24:59 -0400
+
 twisted (12.3.0-1ubuntu4) raring; urgency=low
 
   * debian/patches/lp1102685.diff:

=== added file 'debian/patches/lp1098127.diff'
--- debian/patches/lp1098127.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1098127.diff	2013-03-14 21:45:26 +0000
@@ -0,0 +1,29 @@
+Description: Use new io_add_watch api on new versions of pygobject.
+Bug: https://twistedmatrix.com/trac/ticket/6369
+Author: Rodney Dawes <[e-mail]>
+
+=== modified file 'twisted/internet/_glibbase.py'
+--- old/twisted/internet/_glibbase.py	2013-01-16 17:44:26 +0000
++++ new/twisted/internet/_glibbase.py	2013-03-14 21:14:30 +0000
+@@ -158,9 +158,17 @@ class GlibReactorBase(posixbase.PosixRea
+         else:
+             fileno = source
+             wrapper = callback
+-        return self._glib.io_add_watch(
+-            fileno, condition, wrapper,
+-            priority=self._glib.PRIORITY_DEFAULT_IDLE)
++        try:
++            from gi import version_info as gi_version
++        except ImportError:
++            gi_version = (2, 32, 0)
++        if gi_version < (3, 7, 3):
++            return self._glib.io_add_watch(
++                fileno, condition, wrapper,
++                priority=self._glib.PRIORITY_DEFAULT_IDLE)
++        else:
++            return self._glib.io_add_watch(
++                fileno, self._glib.PRIORITY_DEFAULT, condition, wrapper)
+ 
+ 
+     def _ioEventCallback(self, source, condition):
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-23 12:19:06 +0000
+++ debian/patches/series	2013-03-14 21:45:26 +0000
@@ -3,3 +3,4 @@
 python3.diff
 python3_modules.diff
 lp1102685.diff
+lp1098127.diff