From c26d4228e6314fa7886dde04eb66cd0fc1c02068 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Tue, 26 Feb 2013 10:01:48 -0800
Subject: [PATCH] Bug 843913: Set DBus watch function to null on event loop
 exit; r=tzimmermann

---
 ipc/dbus/DBusThread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipc/dbus/DBusThread.cpp b/ipc/dbus/DBusThread.cpp
index 602fe460eb0..37d5368938a 100644
--- a/ipc/dbus/DBusThread.cpp
+++ b/ipc/dbus/DBusThread.cpp
@@ -69,8 +69,6 @@
 // Functions for converting between unix events in the poll struct,
 // and their dbus definitions
 
-// TODO Add Wakeup to this list once we've moved to ics
-
 enum {
   DBUS_EVENT_LOOP_EXIT = 1,
   DBUS_EVENT_LOOP_ADD = 2,
@@ -367,6 +365,8 @@ DBusThread::EventLoop()
 #endif
             dbus_connection_set_watch_functions(mConnection,
                                                 NULL, NULL, NULL, NULL, NULL);
+            dbus_connection_set_wakeup_main_function(mConnection, NULL, NULL,
+                                                     NULL);
             return;
           case DBUS_EVENT_LOOP_ADD:
             HandleWatchAdd(this);