Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
da055616 by André Apitzsch at 2018-12-02T12:38:52Z
Idlequeue: Restore by mistake removed flags
- - - - -
5c6c045a by Philipp Hörist at 2018-12-02T13:33:57Z
Merge branch 'idlequeue' into 'master'
Idlequeue: Restore by mistake removed flags
See merge request gajim/python-nbxmpp!24
- - - - -
1 changed file:
- nbxmpp/idlequeue.py
Changes:
=====================================
nbxmpp/idlequeue.py
=====================================
@@ -37,15 +37,25 @@ if os.name == 'nt':
elif os.name == 'posix':
import fcntl
-FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP
-FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \
- GLib.IOCondition.HUP
-FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \
- GLib.IOCondition.PRI | GLib.IOCondition.HUP
-FLAG_CLOSE = GLib.IOCondition.HUP
-PENDING_READ = GLib.IOCondition.IN # There is data to read.
-PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without blocking.
-IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken)
+if HAVE_GLIB:
+ FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP
+ FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \
+ GLib.IOCondition.HUP
+ FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \
+ GLib.IOCondition.PRI | GLib.IOCondition.HUP
+ FLAG_CLOSE = GLib.IOCondition.HUP
+ PENDING_READ = GLib.IOCondition.IN # There is data to read.
+ PENDING_WRITE = GLib.IOCondition.OUT # Data CAN be written without
blocking.
+ IS_CLOSED = GLib.IOCondition.HUP # Hung up (connection broken)
+else:
+ FLAG_WRITE = 20 # write only 10100
+ FLAG_READ = 19 # read only 10011
+ FLAG_READ_WRITE = 23 # read and write 10111
+ FLAG_CLOSE = 16 # wait for close 10000
+ PENDING_READ = 3 # waiting read event 11
+ PENDING_WRITE = 4 # waiting write event 100
+ IS_CLOSED = 16 # channel closed 10000
+
def get_idlequeue():
"""
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/compare/073553215d153ff1f3991a2234f2db51c8ff1210...5c6c045a204444ae258179d52f270613f52ceadb
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/compare/073553215d153ff1f3991a2234f2db51c8ff1210...5c6c045a204444ae258179d52f270613f52ceadb
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
