Changeset 164352e for lib/events_glib.c

Timestamp:

2011-12-24T18:02:39Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• lib/events_glib.c (modified) (1 diff)

lib/events_glib.c

@@ -75 +75 @@
         b_input_condition gaim_cond = 0;
         gboolean st;
+        
+        if (condition & G_IO_NVAL)
+                return FALSE;
 
         if (condition & GAIM_READ_COND)