Merge branch 'socket-set-33337'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337

diff --cc bus/activation.c
Simple merge

diff --cc bus/bus.c
Simple merge

diff --cc bus/connection.c
Simple merge

diff --cc bus/test.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dbus/Makefile.am
Simple merge

diff --cc dbus/dbus-mainloop.c
index 1a046a1,e63019f..579614d
--- 1/dbus/dbus-mainloop.c
--- 2/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@@ -65,40 -67,14 +67,13 @@@ struct DBusLoo
    int timeout_count;
    int depth; /**< number of recursive runs */
    DBusList *need_dispatch;
+   /** TRUE if we will skip a watch next time because it was OOM; becomes
+    * FALSE between polling, and dealing with the results of the poll */
+   unsigned oom_watch_pending : 1;
  };
  
- static short
- watch_flags_to_poll_events (unsigned int flags)
- {
-   short events = 0;
- 
-   if (flags & DBUS_WATCH_READABLE)
-     events |= _DBUS_POLLIN;
-   if (flags & DBUS_WATCH_WRITABLE)
-     events |= _DBUS_POLLOUT;
- 
-   return events;
- }
- 
- static unsigned int
- watch_flags_from_poll_revents (short revents)
- {
-   unsigned int condition = 0;
- 
-   if (revents & _DBUS_POLLIN)
-     condition |= DBUS_WATCH_READABLE;
-   if (revents & _DBUS_POLLOUT)
-     condition |= DBUS_WATCH_WRITABLE;
-   if (revents & _DBUS_POLLHUP)
-     condition |= DBUS_WATCH_HANGUP;
-   if (revents & _DBUS_POLLERR)
-     condition |= DBUS_WATCH_ERROR;
- 
-   return condition;
- }
- 
  typedef struct
  {
 -  int refcount;
    DBusTimeout *timeout;
    unsigned long last_tv_sec;
    unsigned long last_tv_usec;